From c0d300fb622d5828d509c403a626351cdacc8997 Mon Sep 17 00:00:00 2001 From: mzr Date: Tue, 1 Apr 2025 19:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=A4=87=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=BD=AC=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/QueryPickmFor4455Action.java | 4 +- .../OutboundTransferVoServiceImpl1.java | 6 +-- .../m422x/query/Abstract422XRefQueryBP1.java | 12 ++--- .../m422x/ic/m4455/Query422XFor4455Impl.java | 4 +- .../pu/m422x/ic/m4455/IQuery422XFor4455.java | 5 +- .../nc/vo/pu/m422x/entity/PickmAppVOMeta.java | 21 -------- .../nc/vo/pu/m422x/entity/PickmReqAppVO.java | 48 ------------------- 7 files changed, 16 insertions(+), 84 deletions(-) delete mode 100644 pu/src/public/nc/vo/pu/m422x/entity/PickmAppVOMeta.java delete mode 100644 pu/src/public/nc/vo/pu/m422x/entity/PickmReqAppVO.java diff --git a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java index ea03788..5327b58 100644 --- a/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java +++ b/ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java @@ -5,7 +5,7 @@ import nc.pubitf.pu.m422x.ic.m4455.IQuery422XFor4455; import nc.ui.querytemplate.querytree.IQueryScheme; import nc.vo.ic.pub.util.StringUtil; import nc.vo.ic.pub.util.ValueCheckUtil; -import nc.vo.pu.m422x.entity.PickmReqAppVO; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.pub.BusinessException; import nc.vo.scmpub.res.billtype.ICBillType; import nccloud.dto.scmpub.page.entity.SCMQueryTreeFormatVO; @@ -48,7 +48,7 @@ public class QueryPickmFor4455Action implements ICommonAction { scheme = schemeservice.appendOrgPermission(scheme); - PickmReqAppVO[] vos = null; + AggPickmVO[] vos = null; IQuery422XFor4455 queryService = (IQuery422XFor4455) ServiceLocator.find(IQuery422XFor4455.class); try { diff --git a/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java b/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java index 373de2a..3a74593 100644 --- a/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java +++ b/ic/src/private/nccloud/pubimpl/ic/outbound/service/OutboundTransferVoServiceImpl1.java @@ -29,9 +29,9 @@ import nc.vo.ic.pub.util.ValueCheckUtil; import nc.vo.ic.warehouse.WarehouseInfoQuery; import nc.vo.ml.LanguageVO; import nc.vo.ml.NCLangRes4VoTransl; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.mmpac.pickm.entity.PickmItemVO; -import nc.vo.pu.m422x.entity.PickmReqAppVO; import nc.vo.pub.AggregatedValueObject; import nc.vo.pub.BusinessException; import nc.vo.pub.CircularlyAccessibleValueObject; @@ -99,10 +99,10 @@ public class OutboundTransferVoServiceImpl1 implements IOutboundTransferVoServic PickmHeadVO[] hvos = (PickmHeadVO[]) query.query(info.getInfo()[0].getHids()); VOQuery queryb = new VOQuery(PickmItemVO.class); PickmItemVO[] bvos = (PickmItemVO[]) queryb.query(info.getInfo()[0].getBids()); - PickmReqAppVO[] volist = new PickmReqAppVO[hvos.length]; + AggPickmVO[] volist = new AggPickmVO[hvos.length]; for (int i = 0; i < hvos.length; ++i) { - PickmReqAppVO vo = new PickmReqAppVO(); + AggPickmVO vo = new AggPickmVO(); vo.setParentVO(hvos[i]); List bodyvo = new ArrayList(); diff --git a/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java b/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java index db13bcf..447b4bb 100644 --- a/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java +++ b/pu/src/private/nc/bs/pu/m422x/query/Abstract422XRefQueryBP1.java @@ -8,9 +8,9 @@ package nc.bs.pu.m422x.query; import nc.bs.scmpub.util.SCMDataAccessUtils; import nc.impl.pubapp.pattern.data.vo.VOQuery; import nc.ui.querytemplate.querytree.IQueryScheme; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.mmpac.pickm.entity.PickmHeadVO; import nc.vo.mmpac.pickm.entity.PickmItemVO; -import nc.vo.pu.m422x.entity.PickmReqAppVO; import nc.vo.pubapp.pattern.model.tool.BillComposite; import nc.vo.pubapp.query2.sql.process.QuerySchemeProcessor; @@ -42,7 +42,7 @@ public abstract class Abstract422XRefQueryBP1 { public abstract StringBuilder makeGetPKSql(); - public PickmReqAppVO[] queryPickmReqVOs() { + public AggPickmVO[] queryPickmReqVOs() { SCMDataAccessUtils utils = new SCMDataAccessUtils(10000); // this.psor.appendCurrentGroup(); StringBuilder sql = this.makeGetPKSql(); @@ -58,11 +58,11 @@ public abstract class Abstract422XRefQueryBP1 { PickmHeadVO[] headers = (PickmHeadVO[]) (new VOQuery(PickmHeadVO.class)).query((String[]) headPks.toArray(new String[headPks.size()])); PickmItemVO[] items = (PickmItemVO[]) (new VOQuery(PickmItemVO.class)).query(itemPks); - BillComposite bc = new BillComposite(PickmReqAppVO.class); - PickmReqAppVO tempVO = new PickmReqAppVO(); + BillComposite bc = new BillComposite(AggPickmVO.class); + AggPickmVO tempVO = new AggPickmVO(); bc.append(tempVO.getMetaData().getParent(), headers); bc.append(tempVO.getMetaData().getVOMeta(PickmItemVO.class), items); - PickmReqAppVO[] queryResult = (PickmReqAppVO[]) bc.composite(); + AggPickmVO[] queryResult = (AggPickmVO[]) bc.composite(); // return this.processQueryResult(queryResult); return queryResult; } else { @@ -82,7 +82,7 @@ public abstract class Abstract422XRefQueryBP1 { this.psor = psor; } - protected PickmReqAppVO[] processQueryResult(PickmReqAppVO[] queryResult) { + protected AggPickmVO[] processQueryResult(AggPickmVO[] queryResult) { return queryResult; } } diff --git a/pu/src/private/nc/pubimpl/pu/m422x/ic/m4455/Query422XFor4455Impl.java b/pu/src/private/nc/pubimpl/pu/m422x/ic/m4455/Query422XFor4455Impl.java index 44d3fd0..388d1aa 100644 --- a/pu/src/private/nc/pubimpl/pu/m422x/ic/m4455/Query422XFor4455Impl.java +++ b/pu/src/private/nc/pubimpl/pu/m422x/ic/m4455/Query422XFor4455Impl.java @@ -9,7 +9,7 @@ import nc.bs.pu.m422x.query.QueryFor4455BP; import nc.bs.pu.m422x.query.QueryFor4455BP1; import nc.pubitf.pu.m422x.ic.m4455.IQuery422XFor4455; import nc.ui.querytemplate.querytree.IQueryScheme; -import nc.vo.pu.m422x.entity.PickmReqAppVO; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.pu.m422x.entity.StoreReqAppVO; import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; @@ -29,7 +29,7 @@ public class Query422XFor4455Impl implements IQuery422XFor4455 { } @Override - public PickmReqAppVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException { + public AggPickmVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException { try { return (new QueryFor4455BP1(queryScheme)).queryPickmReqVOs(); } catch (Exception e) { diff --git a/pu/src/public/nc/pubitf/pu/m422x/ic/m4455/IQuery422XFor4455.java b/pu/src/public/nc/pubitf/pu/m422x/ic/m4455/IQuery422XFor4455.java index 3b602df..02e78c6 100644 --- a/pu/src/public/nc/pubitf/pu/m422x/ic/m4455/IQuery422XFor4455.java +++ b/pu/src/public/nc/pubitf/pu/m422x/ic/m4455/IQuery422XFor4455.java @@ -6,11 +6,12 @@ package nc.pubitf.pu.m422x.ic.m4455; import nc.ui.querytemplate.querytree.IQueryScheme; -import nc.vo.pu.m422x.entity.PickmReqAppVO; +import nc.vo.mmpac.pickm.entity.AggPickmVO; import nc.vo.pu.m422x.entity.StoreReqAppVO; import nc.vo.pub.BusinessException; public interface IQuery422XFor4455 { StoreReqAppVO[] queryStoreReqAppsFor4455(IQueryScheme queryScheme) throws BusinessException; - PickmReqAppVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException; + + AggPickmVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException; } diff --git a/pu/src/public/nc/vo/pu/m422x/entity/PickmAppVOMeta.java b/pu/src/public/nc/vo/pu/m422x/entity/PickmAppVOMeta.java deleted file mode 100644 index 95d7e42..0000000 --- a/pu/src/public/nc/vo/pu/m422x/entity/PickmAppVOMeta.java +++ /dev/null @@ -1,21 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package nc.vo.pu.m422x.entity; - -import nc.vo.mmpac.pickm.entity.PickmHeadVO; -import nc.vo.mmpac.pickm.entity.PickmItemVO; -import nc.vo.pubapp.pattern.model.meta.entity.bill.AbstractBillMeta; - -public class PickmAppVOMeta extends AbstractBillMeta { - public PickmAppVOMeta() { - this.init(); - } - - public void init() { - this.setParent(PickmHeadVO.class); - this.addChildren(PickmItemVO.class); - } -} diff --git a/pu/src/public/nc/vo/pu/m422x/entity/PickmReqAppVO.java b/pu/src/public/nc/vo/pu/m422x/entity/PickmReqAppVO.java deleted file mode 100644 index 9b2be38..0000000 --- a/pu/src/public/nc/vo/pu/m422x/entity/PickmReqAppVO.java +++ /dev/null @@ -1,48 +0,0 @@ -// -// Source code recreated from a .class file by IntelliJ IDEA -// (powered by FernFlower decompiler) -// - -package nc.vo.pu.m422x.entity; - -import nc.vo.annotation.AggVoInfo; -import nc.vo.mmpac.pickm.entity.PickmHeadVO; -import nc.vo.mmpac.pickm.entity.PickmItemVO; -import nc.vo.pubapp.pattern.model.entity.bill.AbstractBill; -import nc.vo.pubapp.pattern.model.meta.entity.bill.BillMetaFactory; -import nc.vo.pubapp.pattern.model.meta.entity.bill.IBillMeta; - -@AggVoInfo( - parentVO = "nc.vo.mmpac.pickm.entity.PickmHeadVO" -) -public class PickmReqAppVO extends AbstractBill { - private static final long serialVersionUID = -3077249229044777149L; - - public PickmReqAppVO() { - } - - /*public static StoreReqAppCloseVO[] getCloseVO(PickmReqAppVO[] vos) { - return (StoreReqAppCloseVO[]) (new BillToViewConvertor(StoreReqAppCloseVO.class)).convert(vos); - }*/ - - public PickmItemVO[] getBVO() { - return (PickmItemVO[]) ((PickmItemVO[]) this.getChildrenVO()); - } - - public PickmHeadVO getHVO() { - return (PickmHeadVO) this.getParent(); - } - - public IBillMeta getMetaData() { - IBillMeta billMeta = BillMetaFactory.getInstance().getBillMeta(PickmAppVOMeta.class); - return billMeta; - } - - public void setBVO(PickmItemVO[] voaChildren) { - this.setChildrenVO(voaChildren); - } - - public void setHVO(PickmHeadVO voaParent) { - this.setParent(voaParent); - } -}