From c003b14186f929c1245d6c75e1eb9d3061aab067 Mon Sep 17 00:00:00 2001 From: houyi <1398559711@qq.com> Date: Wed, 24 Sep 2025 18:16:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=AB=98=E5=8E=8B-=E5=A4=87=E6=96=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=AB=98=E5=8E=8BMES=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From f74bca024b92e2d1ae01de678b41b5beb8ffaf6e Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 24 Sep 2025 18:42:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A8=E8=89=BE?= =?UTF-8?q?=E6=99=AEmes=E5=A2=9E=E5=8A=A0=E6=89=B9=E6=94=B9=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uapbd/material/listener/MaterialToEpicMesListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 2317ec4afae5f78c579156d4dd5425e46967b916 Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 24 Sep 2025 18:47:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=B2=BE=E5=AF=86=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=8E=A8=E5=90=AF=E6=BA=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/bs/bd/pfxx/plugin/MaterialPlanPfxxPlugin.java | 10 ++++++---- .../material/listener/MaterialToJmQmsListener.java | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) 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/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); // 物料标志