diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java index ae4dd414..c1d2b94e 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java @@ -28,7 +28,7 @@ public class PickmApproveBP { processer.addAfterRule(pickmstatusFilterRule); //备料计划审批后推送高压MES IRule pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes(); - processer.addAfterRule(pickmHighpressureMesRules); + processer.addAfterRule(new AfterApproveRuleHighpressureMes()); } private void addBeforeRule(CompareAroundProcesser processer) { diff --git a/uapbd/src/private/nc/bs/bd/pfxx/plugin/MaterialPlanPfxxPlugin.java b/uapbd/src/private/nc/bs/bd/pfxx/plugin/MaterialPlanPfxxPlugin.java index 7140b829..cd67832a 100644 --- a/uapbd/src/private/nc/bs/bd/pfxx/plugin/MaterialPlanPfxxPlugin.java +++ b/uapbd/src/private/nc/bs/bd/pfxx/plugin/MaterialPlanPfxxPlugin.java @@ -183,12 +183,13 @@ public class MaterialPlanPfxxPlugin extends AbstractPfxxPlugin { wlbz = defName; } // 产品分类 - String cpfl = "内配铸造件成品"; + String cpfl; String cpflId = stockMap.get("def4") + ""; String defName1 = getDefName("zdy-jmzz002", cpflId); - if (MMValueCheck.isNotEmpty(defName1)) { - cpfl = defName1; + if (MMValueCheck.isEmpty(defName1)) { + return;// 缺少产品分类则跳过同步启源 } + cpfl = defName1; // 组装数据 JSONObject singleObj = new JSONObject(); // 批次编号,用于唯一标识当前传输的物料数据批次,便于追溯和批量处理 @@ -198,7 +199,8 @@ public class MaterialPlanPfxxPlugin extends AbstractPfxxPlugin { contentObj.put("meswlbh", qyCode); // 启源物料编码 contentObj.put("bipwlbh", vo.getCode()); // BIP物料编码 contentObj.put("wlmc", vo.getName()); // 物料名称 - contentObj.put("wlxhgg", vo.getMaterialtype() + vo.getMaterialspec()); // 物料型号规格 + String wlxhgg = MyHelper.skipNull(vo.getMaterialtype()) + MyHelper.skipNull(vo.getMaterialspec()); + contentObj.put("wlxhgg", wlxhgg); // 物料型号规格 contentObj.put("wlfl", ""); // 物料分类 contentObj.put("cpfl", cpfl); // 产品分类 contentObj.put("wlbz", wlbz); // 物料标志 diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java index 94432cc6..23374443 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java @@ -45,8 +45,8 @@ public class MaterialToEpicMesListener implements IBusinessListener { String eventType = event.getEventType(); Object[] objs = e.getObjs(); - // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后 - if ("1002".equals(eventType) || "1004".equals(eventType) || + // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后 1061批改后 + if ("1002".equals(eventType) || "1004".equals(eventType) || "1061".equals(eventType) || "1071".equals(eventType) || "1069".equals(eventType)) { MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class); configParams = MyHelper.getConfigParams("Dldz-config", null); diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToJmQmsListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToJmQmsListener.java index 49354287..e9fcde23 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToJmQmsListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToJmQmsListener.java @@ -161,12 +161,13 @@ public class MaterialToJmQmsListener implements IBusinessListener { wlbz = defName; } // 产品分类 - String cpfl = "内配铸造件成品"; + String cpfl; String cpflId = stockMap.get("def4") + ""; String defName1 = getDefName("zdy-jmzz002", cpflId); - if (MMValueCheck.isNotEmpty(defName1)) { - cpfl = defName1; + if (MMValueCheck.isEmpty(defName1)) { + continue;// 缺少产品分类则跳过同步启源 } + cpfl = defName1; // 组装数据 JSONObject singleObj = new JSONObject(); // 批次编号,用于唯一标识当前传输的物料数据批次,便于追溯和批量处理 @@ -177,7 +178,8 @@ public class MaterialToJmQmsListener implements IBusinessListener { contentObj.put("meswlbh", qyCode); // 启源物料编码 contentObj.put("bipwlbh", vo.getCode()); // BIP物料编码 contentObj.put("wlmc", vo.getName()); // 物料名称 - contentObj.put("wlxhgg", vo.getMaterialtype() + vo.getMaterialspec()); // 物料型号规格 + String wlxhgg = MyHelper.skipNull(vo.getMaterialtype()) + MyHelper.skipNull(vo.getMaterialspec()); + contentObj.put("wlxhgg", wlxhgg); // 物料型号规格 contentObj.put("wlfl", ""); // 物料分类 contentObj.put("cpfl", cpfl); // 产品分类 contentObj.put("wlbz", wlbz); // 物料标志