diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java index 105459e..9b96863 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterDelSyncEpicMesRule.java @@ -10,6 +10,7 @@ import nc.bs.uapbd.util.MyHelper; import nc.bs.uapbd.util.ThirdPartyPostRequestUtil; import nc.impl.pubapp.pattern.rule.IRule; import nc.util.mmf.framework.base.MMArrayUtil; +import nc.vo.bd.material.MaterialVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOHeadVO; import nc.vo.mmpac.pmo.pac0002.entity.PMOItemVO; @@ -85,14 +86,25 @@ public class AfterDelSyncEpicMesRule implements IRule { */ private void buildSyncData(PMOAggVO aggVO, JSONArray orderArr) throws BusinessException { PMOHeadVO headVo = aggVO.getParentVO(); + PMOItemVO pmoItem = aggVO.getChildrenVO()[0]; + String cdeptid = pmoItem.getCdeptid(); + // 物料 + String cmaterialid = pmoItem.getCmaterialid(); + String goodsCode = MyHelper.getStrValByCondition(MaterialVO.getDefaultTableName(), MaterialVO.CODE, + MaterialVO.PK_MATERIAL + " = '" + cmaterialid + "'"); // 组织 String pkOrg = headVo.getPk_org(); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); + String deptCode = MyHelper.transferField(DeptVO.getDefaultTableName(), DeptVO.CODE, DeptVO.PK_DEPT, cdeptid); // 组装数据 JSONObject orderParam = new JSONObject(); orderParam.put("type", "D"); // 删除标识 orderParam.put("companyCode", orgCode);// 公司编码 orderParam.put("workOrderCode", headVo.getVbillcode());// 工单号 + // 根据自定义档案中的映射关系,部门编码转换为MES中的编码 + orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码 + orderParam.put("produCode", goodsCode); // 产品编码 + orderParam.put("qty", String.valueOf(pmoItem.getNastnum())); // 计划数量 orderArr.add(orderParam); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java index ee79efd..deda644 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java @@ -184,6 +184,7 @@ public class SyncEpicMesUtil { JSONObject data = new JSONObject(); JSONObject orderParam = new JSONObject(); orderParam.put("id", null); // 唯一标识(主键) + // 根据自定义档案中的映射关系,部门编码转换为MES中的编码 orderParam.put("siteCode", deptParams.getOrDefault(deptCode, ""));// 工厂编码 orderParam.put("contractNo", pmoItem.getVfirstcode());// 合同号-取ERP的源头单据号-销售订单号 /*if (projectMap != null) {