From c6ccaf79e9f46530cf3361eba853984c78802a70 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 17 Oct 2025 11:03:36 +0800
Subject: [PATCH] =?UTF-8?q?feat(material):=20=E9=AB=98=E5=8E=8BMES?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E5=92=8C?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87ID=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/bd/material/baseinfo/MaterialToGyMesListener.java | 7 ++++---
 .../uapbd/material/listener/MaterialToGyMesListener.java   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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 941e82db..460922c9 100644
--- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
@@ -42,6 +42,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
     private static final String updateUrl = "/bip/order/materialUpdate";
     private Map<String, String> configParams;
     private BaseDAO baseDAO = new BaseDAO();
+    private String orgId = "";
 
     public void doAction(IBusinessEvent event) throws BusinessException {
         BDCommonEvent e = (BDCommonEvent) event;
@@ -52,7 +53,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
         if (configParams.isEmpty()) {
             throw new BusinessException("高压的gymes接口缺少配置");
         }
-
+        orgId = MyHelper.getStrValByCondition(OrgVO.getDefaultTableName(), OrgVO.PK_ORG, OrgVO.CODE + " = 'C046' and ISBUSINESSUNIT = 'Y'");
         HYPubBO hyPub = new HYPubBO();
         List<MaterialVO> voList = new ArrayList<>();
         for (Object obj : objs) {
@@ -217,7 +218,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
     private Map getStockInfo(String pkMaterial) throws BusinessException {
         String sql = " select martype, wholemanaflag, outpriority, remain,bd_stordoc.code as pk_stordoc" +
                 " from bd_materialstock  left join bd_stordoc on bd_stordoc.pk_stordoc = bd_materialstock.pk_stordoc " +
-                " where pk_material = '" + pkMaterial + "' ";
+                " where pk_material = '" + pkMaterial + "' " + " and bd_materialstock.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }
@@ -228,7 +229,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
                 "FROM " +
                 " bd_materialprod a" +
                 " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " +
-                " where a.pk_material = '" + pkMaterial + "' ";
+                " where a.pk_material = '" + pkMaterial + "' " + " and a.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }
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 0246ab3b..cb81fabe 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
@@ -300,7 +300,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
     private Map getStockInfo(String pkMaterial) throws BusinessException {
         String sql = " select martype, wholemanaflag, outpriority, remain,bd_stordoc.code as pk_stordoc" +
                 " from bd_materialstock  left join bd_stordoc on bd_stordoc.pk_stordoc = bd_materialstock.pk_stordoc " +
-                " where pk_material = '" + pkMaterial + "' ";
+                " where pk_material = '" + pkMaterial + "' " + " and bd_materialstock.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }
@@ -311,7 +311,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
                 "FROM " +
                 " bd_materialprod a" +
                 " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " +
-                " where a.pk_material = '" + pkMaterial + "' ";
+                " where a.pk_material = '" + pkMaterial + "' " + " and a.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }