From 9cd6448cae1d7584a466dfda361b02e7b5e14372 Mon Sep 17 00:00:00 2001
From: houyi <1398559711@qq.com>
Date: Tue, 21 Oct 2025 15:53:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=96=B0=E5=A2=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9mes=E6=8E=A5=E5=8F=A3=20=E5=AD=97=E6=AE=B5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bd/material/baseinfo/MaterialToGyMesListener.java     | 8 +++++++-
 .../uapbd/material/listener/MaterialToGyMesListener.java  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 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 7078ee5c..2878349d 100644
--- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
@@ -80,6 +80,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
      * 构建同步数据
      */
     private void buildSyncData(MaterialVO[] useVOs, String eventType) throws BusinessException {
+        BaseDAO baseDAO = new BaseDAO();
         JSONArray dataArr = new JSONArray();
         for (MaterialVO vo : useVOs) {
             String pkMaterial = vo.getPk_material();
@@ -137,6 +138,11 @@ public class MaterialToGyMesListener implements IBusinessListener {
                 singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
                 singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
             }
+            // 库存供货组织编码获取
+            String mrlsql = "select code from org_stockorg where pk_stockorg = '" + stockMap.get("pk_suplystockorg") + "' ";
+            Map<String, Object> stockorg = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
+            singleObj.put("supplyInventoryOrg", stockorg.get("code"));// 库存供货组织
+
             singleObj.put("bipCreateBy", creatorName); // 创建人
             dataArr.add(singleObj);
             /**
@@ -215,7 +221,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" +
+        String sql = " select pk_suplystockorg, 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 + "' " + " and bd_materialstock.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
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 5ddd4904..11876da4 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
@@ -116,6 +116,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
      * 构建同步数据
      */
     private void buildSyncData(MaterialVO[] useVOs, String eventType) throws BusinessException {
+        BaseDAO baseDAO = new BaseDAO();
         JSONArray dataArr = new JSONArray();
         for (MaterialVO vo : useVOs) {
             String pkMaterial = vo.getPk_material();
@@ -172,6 +173,11 @@ public class MaterialToGyMesListener implements IBusinessListener {
                 singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
                 singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
             }
+            // 库存供货组织编码获取
+            String mrlsql = "select code from org_stockorg where pk_stockorg = '" + stockMap.get("pk_suplystockorg") + "' ";
+            Map<String, Object> stockorg = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
+            singleObj.put("supplyInventoryOrg", stockorg.get("code"));// 库存供货组织
+
             singleObj.put("bipCreateBy", creatorName); // 创建人
             dataArr.add(singleObj);
             /**
@@ -298,7 +304,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" +
+        String sql = " select pk_suplystockorg, 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 + "' " + " and bd_materialstock.pk_org = '" + orgId + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());