From 252a054a6a0a0b462fe18bcc72a8b65f52606bf6 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 15 Sep 2025 08:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=8A=9B=E7=94=B5=E5=AD=90-=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=90=8C=E6=AD=A5=E8=89=BE=E6=99=AEMES-=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8F=8A=E5=85=B6=E5=AE=83=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java | 2 -- .../so/m30/action/main/ApproveSaleOrderAction.java | 6 +++--- .../material/listener/MaterialToEpicMesListener.java | 10 ++-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java index 9a276b1..7148a8f 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java @@ -55,8 +55,6 @@ public class PMOApproveBP { processer.addAfterRule(new AfterApproveRuleSyncMes()); // 审批后推送流程生产订单到艾普MES processer.addAfterRule(new AfterApproveSyncEpicMesRule()); - - // 审批后推送流程生产订单到启源qms processer.addAfterRule(new AfterApproveSyncQMSRule()); // 流程生产订单审批后推送高压MES diff --git a/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java b/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java index ab19b73..310db1a 100644 --- a/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java +++ b/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java @@ -166,11 +166,11 @@ public class ApproveSaleOrderAction { processer.addAfterRule(new MobAfterApproveMessageRule()); processer.addAfterRule(new SaleOrderCreateRmBeforeRule()); // 在审批后推送到MES系统 - // processer.addAfterRule(new AfterApprovingSynchronizeRuleMES()); + processer.addAfterRule(new AfterApprovingSynchronizeRuleMES()); // 在审批后推送到QMS系统 - // processer.addAfterRule(new AfterApprovingSynchronizeRuleQMS()); + processer.addAfterRule(new AfterApprovingSynchronizeRuleQMS()); // 在审批后推送到高压MES - processer.addAfterRule(new AfterSoSyncRuleGyMes()); + // processer.addAfterRule(new AfterSoSyncRuleGyMes()); } private boolean isExistDelivery(String ctranstype) { 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 5aed2b8..c030c91 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToEpicMesListener.java @@ -44,14 +44,8 @@ public class MaterialToEpicMesListener implements IBusinessListener { Object[] objs = e.getObjs(); // EventType是事件编码 1002-新增后 1004-修改后 1071-状态由停用变为启用后 1069-状态由启用变为停用后 - if ("1004".equals(eventType)) { - MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class); - configParams = MyHelper.getConfigParams("Dldz-config", null); - if (configParams.isEmpty()) { - throw new BusinessException("电力电子的艾普MES接口缺少配置"); - } - buildSyncData(useVOs, eventType); - } else if ("1071".equals(eventType) || "1069".equals(eventType)) { + if ("1002".equals(eventType) || "1004".equals(eventType) || + "1071".equals(eventType) || "1069".equals(eventType)) { MaterialVO[] useVOs = ArrayClassConvertUtil.convert(objs, MaterialVO.class); configParams = MyHelper.getConfigParams("Dldz-config", null); if (configParams.isEmpty()) {