From baa5472e646c46049c176a93a0d261b00dfb8d74 Mon Sep 17 00:00:00 2001 From: lihao Date: Wed, 24 Sep 2025 08:47:43 +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=E9=AB=98?= =?UTF-8?q?=E5=8E=8BMES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nc/bs/mmpac/pmo/pac0002/bp/PMOApproveBP.java | 15 +++++++++------ .../rule/AfterApproveSyncHighpressureMesRule.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 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 a5b979e0..096d7abd 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 @@ -1,9 +1,6 @@ package nc.bs.mmpac.pmo.pac0002.bp; -import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterApproveRuleSyncMes; -import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterApproveSyncEpicMesRule; -import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterApprovingSynchronizeRuleRZ; -import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterUnApproveSyncEpicMesRule; +import nc.bs.mmpac.pmo.pac0002.bp.rule.*; import nc.bs.mmpac.pmo.pac0002.pluginpoint.PMOPluginPoint; import nc.bs.mmpac.pmo.pac0002.rule.*; import nc.bs.mmpac.pmo.pac0002.rule.check.*; @@ -60,8 +57,14 @@ public class PMOApproveBP { processer.addAfterRule(new AfterApproveSyncEpicMesRule()); // 审批后推送流程生产订单到启源qms // processer.addAfterRule(new AfterApproveSyncQMSRule()); - // 流程生产订单审批后推送高压MES - // processer.addAfterRule(new AfterApproveSyncHighpressureMesRule()); +// 流程生产订单审批后推送高压MES + processer.addAfterRule(new AfterApproveSyncHighpressureMesRule()); +// processer.addAfterRule(new AfterApproveSyncQMSRule()); +// 流程生产订单审批后推送高压MES +// processer.addAfterRule(new AfterApproveSyncHighpressureMesRule()); + + +// processer.addAfterRule(new AfterApproveSyncEpicQMSRule()); } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java index c9da98b1..259e7e41 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java @@ -56,6 +56,8 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { BaseDAO baseDAO = new BaseDAO(); HYPubBO hybo = new HYPubBO(); + JSONObject list = new JSONObject(); + JSONArray jsonArray = new JSONArray(); for (PMOAggVO vo : useVOs) { PMOHeadVO pmoHeadVO = vo.getParentVO(); PMOItemVO[] itemVOS = vo.getChildrenVO(); @@ -114,8 +116,8 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { Map mrl = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", mrl.get("code")); // 物料编码 itemObj.put("materialName", mrl.get("name")); // 物料名称 - itemObj.put("drawingNumber", mrl.get("graphid")); // 图号编码 graphid - +// itemObj.put("drawingNumber", mrl.get("graphid")); // 图号编码 graphid + itemObj.put("drawingNumber","1234"); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' "); itemObj.put("unit", unit); // 单位 pk_measdoc @@ -127,8 +129,8 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { // 库存信息 itemObj.put("demandInventoryOrganization", item.getCrequireorg()); // 需求库存组织 - itemObj.put("plannedInputQuantity", item.getNplanputastnum().doubleValue()); // 计划投入量 - itemObj.put("plannedOutputQuantity", item.getNmmastnum().doubleValue()); // 计划产出量 + itemObj.put("plannedInputQuantity",(int) item.getNplanputastnum().doubleValue()); // 计划投入量 + itemObj.put("plannedOutputQuantity",(int)item.getNmmastnum().doubleValue()); // 计划产出量 itemObj.put("plannedStartTime", item.getTplanstarttime().toString()); // 计划开工时间 itemObj.put("plannedCompletionTime", item.getTplanendtime().toString()); // 计划完工时间 itemObj.put("customerMaterialCode", item.getCcustmaterialid()); // 客户物料编码 @@ -139,9 +141,10 @@ public class AfterApproveSyncHighpressureMesRule implements IRule { } singleObj.put("itemList", contentArray); // 将子项数组添加到主对象 - - pushData(singleObj); + jsonArray.add(singleObj); + list.put("list", jsonArray); } + pushData(list); } /**