From 8b7a9628109a16e6109feba03eccccf2ed5d7df6 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Thu, 20 Nov 2025 10:59:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A8=E9=80=81=E7=AE=B1?=
 =?UTF-8?q?=E5=8F=98qms=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/action/MaterialPushToQmsAction.java     | 12 ++++++++++--
 .../nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java |  4 ++--
 .../nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java |  7 +++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPushToQmsAction.java b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPushToQmsAction.java
index 4dacff28..c4782bcc 100644
--- a/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPushToQmsAction.java
+++ b/uapbd/src/client/nccloud/web/uapbd/material/action/MaterialPushToQmsAction.java
@@ -93,7 +93,15 @@ public class MaterialPushToQmsAction implements ICommonAction {
             String pk_marbasclass = vo.getPk_marbasclass();
             String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE,
                     "pk_marbasclass = '" + pk_marbasclass + "'");
-            // 计量单位
+
+            String isPushtoQms = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.DEF3,
+                    "pk_marbasclass = '" + pk_marbasclass + "'");
+            if(null != isPushtoQms && "Y".equals(isPushtoQms)) {
+                continue;
+            }
+            // if(null == isPushtoQms || !"Y".equals(isPushtoQms)) {
+            //     continue;
+            // }
             // 过滤物料分类
             if(checkMrlType(mrlTypeName,configParams)){
                 continue;
@@ -173,7 +181,7 @@ public class MaterialPushToQmsAction implements ICommonAction {
         // 遍历每个类型，检查是否以mrlTypeName为前缀
         for (String typeCode : typeItems) {
             // 跳过空字符串，且判断当前类型是否以目标名称为前缀
-            if (!typeCode.isEmpty() && typeCode.startsWith(mrlTypeName)) {
+            if (!typeCode.isEmpty() && mrlTypeName.startsWith(typeCode)) {
                 return true;
             }
         }
diff --git a/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java
index 8eed062e..f37f5e38 100644
--- a/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java
+++ b/uapbd/src/private/nc/bs/uapbd/task/ims/MaterialOutGyImsPlugin.java
@@ -99,8 +99,8 @@ public class MaterialOutGyImsPlugin implements IBackgroundWorkPlugin {
                     MaterialOutHeadVO hvo = vo.getHead();
                     MaterialOutBodyVO[] bodys = vo.getBodys();
                     hvo.setVbillcode(mainMap.get("vbillcode") + "");
-                    hvo.setCreator("BIP");
-                    hvo.setBillmaker("BIP");
+                    hvo.setCreator(MyHelper.getUserId((String) mainMap.get("creator")) );
+                    hvo.setBillmaker(MyHelper.getUserId((String) mainMap.get("billmaker")) );
                     hvo.setVtrantypecode("4D-01");
                     if (MMValueCheck.isEmpty(mainMap.get("cwarehouseid"))) {
                         continue;
diff --git a/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java
index e8b55946..7edfae21 100644
--- a/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java
+++ b/uapbd/src/private/nc/bs/uapbd/task/mes/qy/MaterialToQmsPlugin.java
@@ -118,6 +118,13 @@ public class MaterialToQmsPlugin implements IBackgroundWorkPlugin {
             String mrlTypeName = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.CODE,
                     "pk_marbasclass = '" + pk_marbasclass + "'");
             // 计量单位
+            // 过滤物料分类
+             String isPushtoQms = MyHelper.getStrValByCondition(MarBasClassVO.getDefaultTableName(), MarBasClassVO.DEF3,
+                    "pk_marbasclass = '" + pk_marbasclass + "'");
+            // 计量单位
+            if(null != isPushtoQms && "Y".equals(isPushtoQms)) {
+                continue;
+            }
             // 过滤物料分类
             if (checkMrlType(mrlTypeName, configParams)) {
                 continue;