合并备料计划转出库申请单-移除自建的PickmReqAppVO相关代码，适配AggPickmVO(备料计划的聚合VO)

ic/src/client/nccloud/web/ic/outbound/sapplybill/action/QueryPickmFor4455Action.java

@@ -5,9 +5,10 @@ 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 nc.vo.scmpub.util.BillBodySortUtils;
 import nccloud.dto.scmpub.page.entity.SCMQueryTreeFormatVO;
 import nccloud.framework.core.json.IJson;
 import nccloud.framework.service.ServiceLocator;
@@ -49,7 +50,7 @@ public class QueryPickmFor4455Action implements ICommonAction {
 
         scheme = schemeservice.appendOrgPermission(scheme);
 
-        PickmReqAppVO[] vos = null;
+        AggPickmVO[] vos = null;
 
         IQuery422XFor4455 queryService = (IQuery422XFor4455) ServiceLocator.find(IQuery422XFor4455.class);
         try {
@@ -60,6 +61,7 @@ public class QueryPickmFor4455Action implements ICommonAction {
         if (null == vos) {
             return null;
         }
+        BillBodySortUtils.sort(vos);
         // VO与UI数据格式转换 卡片列表：BillGridOperator
         BillGridOperator operator = new BillGridOperator(info.getTempletid(), info.getPageCode());
         BillGrid[] grids = operator.toBillGrids(vos);

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<PickmItemVO> 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<PickmItemVO> bodyvo = new ArrayList();
 

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<PickmReqAppVO> bc = new BillComposite(PickmReqAppVO.class);
+            BillComposite<AggPickmVO> bc = new BillComposite(AggPickmVO.class);
-            PickmReqAppVO tempVO = new PickmReqAppVO();
+            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;
     }
 }

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) {

pu/src/public/nc/pubitf/pu/m422x/ic/m4455/IQuery422XFor4455.java

@@ -6,12 +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 var1) throws BusinessException;
 
-    PickmReqAppVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException;
+    AggPickmVO[] queryPickmAppsFor4455(IQueryScheme queryScheme) throws BusinessException;
 }

pu/src/public/nc/vo/pu/m422x/entity/PickmAppVOMeta.java

@@ -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);
-    }
-}

pu/src/public/nc/vo/pu/m422x/entity/PickmReqAppVO.java

@@ -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);
-    }
-}