Merge remote-tracking branch 'origin/main'

mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToGeneralInAction.java

@@ -1,6 +1,7 @@
 package nccloud.web.mmpac.pickm.action;
 
 import nc.bs.dao.BaseDAO;
+import nc.bs.trade.business.HYPubBO;
 import nc.bs.uapbd.util.MyHelper;
 import nc.itf.ic.m4a.IGeneralInMaintain;
 import nc.itf.mmpac.pickm.IPickmQueryService;
@@ -153,6 +154,19 @@ public class PickmToGeneralInAction implements ICommonAction {
             head.setCtrantypeid(pk_billtypeid);
             head.setVtrantypecode(typeCode);
             head.setCwarehouseid(warehouseId);
+            GeneralInBodyVO[] bodys = inVO.getBodys();
+            if (bodys != null) {
+                for (GeneralInBodyVO body : bodys) {
+                    String cpickmId=body.getCunitid();
+                    IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class);
+                    AggPickmVO[] vos = service.queryBillsByPks(new String[]{cpickmId});
+                   if (vos != null && vos.length > 0) {
+                       HYPubBO hybo = new HYPubBO();
+                       Object cmaterialvidDef261 = hybo.findColValue("bd_material", "def26", "pk_material = '"+vos[0].getParentVO().getCmaterialvid()+"' ");
+                       body.setVnotebody((String) cmaterialvidDef261);
+                   }
+                }
+            }
         }
         return inVOS;
     }

mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmByIdsQueryAction.java

@@ -83,6 +83,18 @@ public class PickmByIdsQueryAction implements ICommonAction {
                         cmaterialvidDef26.setValue(cmaterialvidDef261);
                         row.getValues().put("cmaterialvidDef26", cmaterialvidDef26);
                         list.add(row);
+
+                        // 구죕셕뺍데뵀	혤구죕셕뺍깊庫
+                        Cell vbillcode = new Cell();
+                        vbillcode.setValue(vo.getParentVO().getVbillcode());
+                        row.getValues().put("vbillcode", vbillcode);
+                        list.add(row);
+
+                        // 윱都셕뺍데뵀	혤구죕셕뺍깊庫
+                        Cell vsourcebillcode = new Cell();
+                        vsourcebillcode.setValue(vo.getParentVO().getVsourcebillcode());
+                        row.getValues().put("vsourcebillcode", vsourcebillcode);
+                        list.add(row);
                     }
 
 //                    bodyList.add(billCard.getBody());

mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterupdateSyncEpicMesRule.java

@@ -41,7 +41,7 @@ public class AfterupdateSyncEpicMesRule implements IRule<AggPickmVO> {
             List<PMOAggVO> list = new ArrayList<PMOAggVO>();
             if(null!=aggPickmVO.getParentVO().getVfirstbilltype() && aggPickmVO.getParentVO().getVfirstbilltype().indexOf("55A2")!=-1){
                 try {
-                    PMOAggVO[] pmoAggVO = queryService.queryPMOAggVOByBid(new String[Integer.parseInt(aggPickmVO.getParentVO().getCsourcebillid())]);
+                    PMOAggVO[] pmoAggVO = queryService.queryPMOAggVOByBid( new String[]{aggPickmVO.getParentVO().getCsourcebillid()});
                     if(null!=pmoAggVO){
                         for (PMOAggVO pmoAggVO1 : pmoAggVO) {
                             if (1 == pmoAggVO1.getParentVO().getFbillstatus()){