diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java index 8fe32a5..7823486 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java @@ -71,9 +71,9 @@ public class AfterApproveRuleSyncRZWMS implements IRule { private List checkAndFilterBillSrcOrg(AggPickmVO[] aggPickmVOS) throws BusinessException { List aggvoList = new ArrayList<>(); for (AggPickmVO aggvo : aggPickmVOS) { - String pkOrg = aggvo.getParentVO().getPk_org(); // 假设领料组织在表头 + String pkOrg = aggvo.getParentVO().getPk_org(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("30401".equals(orgCode)) { // 示例组织编码 + if ("30401".equals(orgCode)) { aggvoList.add(aggvo); } } diff --git a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java b/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java index bb8e7c5..c78dcd2 100644 --- a/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java +++ b/sc/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java @@ -55,27 +55,27 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule { JSONObject singleObj = new JSONObject(); // 单据类型 - singleObj.put("cgjh_wbid", body.getVsrctrantype()); - singleObj.put("cgxh", body.getVsrcrowno()); - singleObj.put("cgbh", body.getVsrccode()); - singleObj.put("bzsm", body.getVbmemo()); - singleObj.put("cght_wbid", head.getVbillcode()); - singleObj.put("htxsbh", head.getVbillcode()); + singleObj.put("cgjh_wbid", body.getVsrctrantype()); // 第三方系统采购计划id + singleObj.put("cgxh", body.getVsrcrowno()); // 采购计划序号 + singleObj.put("cgbh", body.getVsrccode()); // 采购计划编号 + singleObj.put("bzsm", body.getVbmemo()); // 备注说明 + singleObj.put("cght_wbid", head.getVbillcode()); // 第三方系统合同ID + singleObj.put("htxsbh", head.getVbillcode()); // 合同编号 // 供应商 - singleObj.put("zbxx_gycs_wbid", transferCodeByPk(SupplierVO.getDefaultTableName(), SupplierVO.CODE, SupplierVO.PK_SUPPLIER, head.getPk_supplier())); + singleObj.put("zbxx_gycs_wbid", transferCodeByPk(SupplierVO.getDefaultTableName(), SupplierVO.CODE, SupplierVO.PK_SUPPLIER, head.getPk_supplier())); // 第三方系统厂商id // 仓库 - singleObj.put("sdck", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.CODE, StordocVO.PK_STORDOC, body.getPk_recvstordoc())); + singleObj.put("sdck", transferCodeByPk(StordocVO.getDefaultTableName(), StordocVO.CODE, StordocVO.PK_STORDOC, body.getPk_recvstordoc())); // 送达仓库 // 物料 - singleObj.put("wlbm_wbid", transferCodeByPk(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL, body.getPk_material())); + singleObj.put("wlbm_wbid", transferCodeByPk(MaterialVO.getDefaultTableName(), MaterialVO.CODE, MaterialVO.PK_MATERIAL, body.getPk_material())); // 第三方系统材料id - singleObj.put("cgsl", body.getNqtunitnum()); - singleObj.put("jhrq", body.getDplanarrvdate()); - singleObj.put("zbxx_cgrq", head.getDbilldate().toString()); - singleObj.put("cgrq", head.getDbilldate()).toString(); + singleObj.put("cgsl", body.getNqtunitnum()); // 采购数量 + singleObj.put("jhrq", body.getDplanarrvdate()); // 交货日期 + singleObj.put("zbxx_cgrq", head.getDbilldate().toString()); // 采购日期 + singleObj.put("cgrq", head.getDbilldate()).toString(); // 采购日期 + + singleObj.put("htxh", body.getCrowno()); // 合同序号 + singleObj.put("zbxx_cgy_wbid", transferCodeByPk(PsndocVO.getDefaultTableName(), PsndocVO.CODE, PsndocVO.PK_PSNDOC, head.getCemployeeid())); // 第三方系统采购员id - singleObj.put("htxh", body.getCrowno()); - // 业务员 - singleObj.put("zbxx_cgy_wbid", transferCodeByPk(PsndocVO.getDefaultTableName(), PsndocVO.CODE, PsndocVO.PK_PSNDOC, head.getCemployeeid())); details.add(singleObj); }