From 3b996941f7826a152114591c8bd84634b257b0c2 Mon Sep 17 00:00:00 2001
From: houyi <1398559711@qq.com>
Date: Thu, 13 Nov 2025 11:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=8D=95=E5=A7=94=E5=A4=96=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E4=B8=8D?=
 =?UTF-8?q?=E6=8E=A8MES=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/bp/rule/AfterApproveRuleHighpressureMes.java    | 8 +-------
 .../pac0002/bp/rule/AfterPickmRuleHighpressureRule.java   | 8 +-------
 .../web/mmpac/pickm/service/SyncGyMesPickmUtil.java       | 8 +-------
 3 files changed, 3 insertions(+), 21 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 1a3610d3..4e15723a 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,13 +80,7 @@ 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;
-            }
-            // 期初类型的单据不推MES，其余类型推MES
+            // 期初、整单委外类型的单据不推MES，其余类型推MES
             String billType = pickmHeadVO.getVbusitype();
             if (checkBillType(billType, configParams)) {
                 continue;
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 586f9147..f2f1328e 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,13 +115,7 @@ 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;
-            }
-            // 期初类型的单据不推MES，其余类型推MES
+            // 期初、整单委外类型的单据不推MES，其余类型推MES
             String billType = pickmHeadVO.getVbusitype();
             if (checkBillType(billType, configParams)) {
                 continue;
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 492af9bd..675def2b 100644
--- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
+++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
@@ -73,13 +73,7 @@ public class SyncGyMesPickmUtil {
             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;
-            }
-            // 期初类型的单据不推MES，其余类型推MES
+            // 期初、整单委外的单据不推MES，其余类型推MES
             String billType = pickmHeadVO.getVbusitype();
             if (checkBillType(billType, configParams)) {
                 continue;