From 1a8b16b11ee37dce35723904a1db050289b375ec Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 23 Jul 2025 18:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81=E8=89=BE?= =?UTF-8?q?=E6=99=AEMES-=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pac0002/bp/rule/AfterApproveSyncEpicMesRule.java | 10 ---------- .../bp/rule/AfterUnApproveSyncEpicMesRule.java | 9 --------- .../pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java | 12 +++++------- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncEpicMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncEpicMesRule.java index 28f03d9..ac23fe4 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncEpicMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncEpicMesRule.java @@ -1,7 +1,6 @@ package nc.bs.mmpac.pmo.pac0002.bp.rule; -import nc.bs.dao.BaseDAO; import nc.bs.logging.Log; import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil; import nc.impl.pubapp.pattern.rule.IRule; @@ -9,8 +8,6 @@ import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.scmpub.util.ArrayUtil; -import java.util.Map; - /** * 流程生产订单审批后推送艾普MES * @@ -23,13 +20,6 @@ public class AfterApproveSyncEpicMesRule implements IRule { private static final Log logDl = Log.getInstance(LOG_INFO_NAME); - private static final String pmoUrl = "/prj-v5-web/ext/api/workOrder"; - private static final String codeUrl = "/prj-v5-web/ext/api/releaseNo"; - private Map configParams; - private Map deptParams; - - private static final BaseDAO dao = new BaseDAO(); - @Override public void process(PMOAggVO[] pmoAggVOS) { if (ArrayUtil.isEmpty(pmoAggVOS)) { diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterUnApproveSyncEpicMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterUnApproveSyncEpicMesRule.java index 618454e..6a065c8 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterUnApproveSyncEpicMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterUnApproveSyncEpicMesRule.java @@ -1,7 +1,6 @@ package nc.bs.mmpac.pmo.pac0002.bp.rule; -import nc.bs.dao.BaseDAO; import nc.bs.logging.Log; import nc.bs.mmpac.pmo.pac0002.bp.rule.util.SyncEpicMesUtil; import nc.impl.pubapp.pattern.rule.ICompareRule; @@ -9,8 +8,6 @@ import nc.util.mmf.framework.base.MMArrayUtil; import nc.vo.mmpac.pmo.pac0002.entity.PMOAggVO; import nc.vo.pubapp.pattern.exception.ExceptionUtils; -import java.util.Map; - /** * 流程生产订单取消审批后同步艾普MES * @@ -23,12 +20,6 @@ public class AfterUnApproveSyncEpicMesRule implements ICompareRule { private static final Log logDl = Log.getInstance(LOG_INFO_NAME); - private static final String pmoUrl = "/prj-v5-web/ext/api/workOrder"; - private Map configParams; - private Map deptParams; - - private static final BaseDAO dao = new BaseDAO(); - @Override public void process(PMOAggVO[] pmoAggVOS, PMOAggVO[] originVOs) { if (MMArrayUtil.isEmpty(pmoAggVOS)) { 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 809b4dc..ebe4b34 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 @@ -78,22 +78,20 @@ public class SyncEpicMesUtil { } if ("N".equals(auditCode)) { JSONObject data = buildSyncData(aggVO); -// pushData(pmoUrl, data); + pushData(pmoUrl, data); } else { JSONObject data = buildSyncData(aggVO); -// pushData(pmoUrl, data); + pushData(pmoUrl, data); JSONObject buildSyncData = buildSyncCodeData(aggVO); jsonArray.add(buildSyncData); } } if (!jsonArray.isEmpty()) { -// pushData(codeUrl, jsonArray); + pushData(codeUrl, jsonArray); } - - logDl.info("生产订单同步到艾普MES系统处理完成。"); } @@ -320,8 +318,8 @@ public class SyncEpicMesUtil { for (PMOItemVO item : vo.getChildrenVO()) { HYPubBO hybo = new HYPubBO(); Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' "); - IBillcodeManage billcodeManage=new BillCodeManageImpl(); - String code= billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule",hvo.getPk_group(),hvo.getPk_org()); + IBillcodeManage billcodeManage = new BillCodeManageImpl(); + String code = billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule", hvo.getPk_group(), hvo.getPk_org()); String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code; jsonArray.add(detailItem); }