From 32e82f54c3405cf919e37a0c328679d717f61d2f Mon Sep 17 00:00:00 2001
From: houyi <1398559711@qq.com>
Date: Sat, 18 Oct 2025 14:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=98=AF=E6=95=B4=E5=8D=95=E5=A7=94?=
 =?UTF-8?q?=E5=A4=96=E7=9A=84=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81mes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/bp/rule/AfterApproveRuleHighpressureMes.java   | 6 ++++++
 .../pac0002/bp/rule/AfterPickmRuleHighpressureRule.java  | 6 ++++++
 .../web/mmpac/pickm/service/SyncGyMesPickmUtil.java      | 9 ++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

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 1fc0e40f..e1ed718b 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
@@ -80,6 +80,12 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
             if (checkIfOrg(orgCode, configParams)) {
                 continue;
             }
+            // 备料计划单据类型是整单委外的备料计划不需要推送mes
+            String billtypesql = " select pk_billtypecode from bd_billtype  where  pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'";
+            Map<String, Object> sourcebilltype = (Map<String, Object>) baseDAO.executeQuery(billtypesql, new MapProcessor());
+            if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) {
+                continue;
+            }
             JSONObject singleObj = new JSONObject();
             // 创建子项数组
             JSONArray contentArray = new JSONArray();
diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java
index afa0f3f7..9b64689b 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java
@@ -115,6 +115,12 @@ public class AfterPickmRuleHighpressureRule implements IRule<PMOAggVO> {
             if (checkIfOrg(orgCode, configParams)) {
                 continue;
             }
+            // 备料计划单据类型是整单委外的备料计划不需要推送mes
+            String billtypesql = " select pk_billtypecode from bd_billtype  where  pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'";
+            Map<String, Object> sourcebilltype = (Map<String, Object>) baseDAO.executeQuery(billtypesql, new MapProcessor());
+            if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) {
+                continue;
+            }
             JSONObject singleObj = new JSONObject();
             // 创建子项数组
             JSONArray contentArray = new JSONArray();
diff --git a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
index 049ca6aa..b6e49d32 100644
--- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
+++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import nc.bs.businessevent.bd.BDCommonEvent;
 import nc.bs.dao.BaseDAO;
 import nc.bs.dao.DAOException;
 import nc.bs.framework.common.NCLocator;
@@ -66,12 +67,18 @@ public class SyncGyMesPickmUtil {
         for (AggPickmVO vo : useVOs) {
             PickmHeadVO pickmHeadVO = vo.getParentVO();
             PickmItemVO[] itemVOS = (PickmItemVO[]) vo.getChildrenVO();
-            // 判断物料的业务单元是否是高压公司，不是则跳过
+            // 判断备料计划的业务单元是否是高压公司，不是则跳过
             String pkOrg = pickmHeadVO.getPk_org();
             String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
             if (checkIfOrg(orgCode, configParams)) {
                 continue;
             }
+            // 备料计划单据类型是整单委外的备料计划不需要推送mes
+            String billtypesql = " select pk_billtypecode from bd_billtype  where  pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'";
+            Map<String, Object> sourcebilltype = (Map<String, Object>) baseDAO.executeQuery(billtypesql, new MapProcessor());
+            if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) {
+                continue;
+            }
             JSONObject singleObj = new JSONObject();
             // 创建子项数组
             JSONArray contentArray = new JSONArray();