From d40571cfb7ce69fc5fc633c3b4e0b28940f137b4 Mon Sep 17 00:00:00 2001 From: houyi <1398559711@qq.com> Date: Fri, 10 Oct 2025 15:09:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81=E9=AB=98=E5=8E=8BMES?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/AfterApproveRuleHighpressureMes.java | 22 +++++++++++++++-- .../AfterApproveSyncHighpressureMesRule.java | 24 ++++++++++++++----- .../baseinfo/MaterialToGyMesListener.java | 9 ++++++- .../listener/MaterialToGyMesListener.java | 11 ++++++++- 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java index fe2eec95..8819fd30 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java @@ -130,7 +130,16 @@ public class AfterApproveRuleHighpressureMes implements IRule { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("drawingNumber", "计划信息组织"); // 图号 + +// itemObj.put("drawingNumber", "计划信息组织"); // 图号 + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + item.getCbmaterialid() + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + itemObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + itemObj.put("drawingNumber", ""); + } + Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); itemObj.put("unit", unit); // 规格单位 // 生产信息 @@ -198,7 +207,16 @@ public class AfterApproveRuleHighpressureMes implements IRule { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("drawingNumber", "计划信息组织"); // 图号 + +// itemObj.put("drawingNumber", "计划信息组织"); // 图号 + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + item.getCbmaterialid() + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + itemObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + itemObj.put("drawingNumber", ""); + } + Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); itemObj.put("unit", unit); // 规格单位 // 生产信息 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 bc6ebbf7..1a1f33dd 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 @@ -124,10 +124,16 @@ 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", "计划信息组织"); // 图号编码 graphid -// itemObj.put("drawingNumber", "1234"); - Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' "); + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + item.getCmaterialvid() + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + itemObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + itemObj.put("drawingNumber", ""); + } + + Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' "); itemObj.put("unit", unit); // 单位 pk_measdoc // 生产信息 @@ -184,10 +190,16 @@ 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", "计划信息组织"); - Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' "); + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + item.getCmaterialvid() + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + itemObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + itemObj.put("drawingNumber", ""); + } + + Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' "); itemObj.put("unit", unit); // 单位 pk_measdoc // 生产信息 diff --git a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java index 011adb29..fe55f90e 100644 --- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java +++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java @@ -109,8 +109,15 @@ public class MaterialToGyMesListener implements IBusinessListener { singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]); // 主单位 singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位 + // singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码 - singleObj.put("drawingNumber", "计划信息组织"); // 图号编码("计划信息组织"是高压的图号) + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + pkMaterial + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + singleObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + singleObj.put("drawingNumber", ""); + } singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用 singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码 singleObj.put("batchManagement", stockMap.get("wholemanaflag")); // 批次管理 diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java index 8478f92f..5113dbbd 100644 --- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java +++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java @@ -42,6 +42,7 @@ public class MaterialToGyMesListener implements IBusinessListener { private static final String addUrl = "/bip/order/materialAdd"; private static final String updateUrl = "/bip/order/materialUpdate"; private Map configParams; + private BaseDAO baseDAO = new BaseDAO(); @Override public void doAction(IBusinessEvent event) throws BusinessException { @@ -141,8 +142,16 @@ public class MaterialToGyMesListener implements IBusinessListener { singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]); // 主单位 singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位 + // singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码 - singleObj.put("drawingNumber", "计划信息组织"); // 图号编码("计划信息组织"是高压的图号) + String plansql = "select def1 from bd_materialplan where pk_org = '0001A11000000059XIB0' " + "and pk_material = '" + pkMaterial + "' " + "and dr=0";//计划信息查询 + Map plan = (Map) baseDAO.executeQuery(plansql, new MapProcessor()); + if (plan != null && !plan.isEmpty()) { + singleObj.put("drawingNumber", plan.get("def1")); // 图号编码(计划信息查询高压生产中心) + } else { + singleObj.put("drawingNumber", ""); + } + singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用 singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码 singleObj.put("batchManagement", stockMap.get("wholemanaflag")); // 批次管理