From a5489ceb5a32b866b75cee4d552a8c0f2987136c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 29 Jun 2026 11:07:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialBaseInfoApplicationService.java   | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
index 40a4eef6c..c30840c5f 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java
@@ -249,6 +249,31 @@ public class MaterialBaseInfoApplicationService {
                 }
             }
         }
+        Long shipperId = materialBaseInfoDO.getShipperId();
+        String customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString());
+        if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<Map<String, Object>> listNc = null;
+            try {
+                listNc = objectMapper.readValue(
+                        customerCodeNcJson,
+                        new com.fasterxml.jackson.core.type.TypeReference<List<Map<String, Object>>>() {}
+                );
+                String codeStr = "";
+                if (listNc != null && listNc.size() > 0) {
+                    // 方式1：Stream拼接，逗号分隔
+                    codeStr = listNc.stream()
+                            .map(map -> map.get("code"))
+                            .filter(Objects::nonNull) // 过滤code为空
+                            .map(Object::toString)
+                            .collect(Collectors.joining(","));
+                    materialBaseInfoDO.setOrgId(codeStr);
+                }
+                // codeStr 就是拼接好的字符串
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
         Long materialBaseInfoId = materialBaseInfoDomainService.insert(materialBaseInfoDO);
         materialBaseInfoDO.setMaterialBaseInfoId(materialBaseInfoId);
         //商品规则
@@ -280,6 +305,31 @@ public class MaterialBaseInfoApplicationService {
      * 修改物料基础信息
      */
     public Boolean update(MaterialBaseInfoDO materialBaseInfoDO) {
+        Long shipperId = materialBaseInfoDO.getShipperId();
+        String customerCodeNcJson = materialBaseInfoMapper.getCustomerCodeNcJson(shipperId.toString());
+        if (customerCodeNcJson != null && !customerCodeNcJson.isEmpty()) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            List<Map<String, Object>> listNc = null;
+            try {
+                listNc = objectMapper.readValue(
+                        customerCodeNcJson,
+                        new com.fasterxml.jackson.core.type.TypeReference<List<Map<String, Object>>>() {}
+                );
+                String codeStr = "";
+                if (listNc != null && listNc.size() > 0) {
+                    // 方式1：Stream拼接，逗号分隔
+                    codeStr = listNc.stream()
+                            .map(map -> map.get("code"))
+                            .filter(Objects::nonNull) // 过滤code为空
+                            .map(Object::toString)
+                            .collect(Collectors.joining(","));
+                    materialBaseInfoDO.setOrgId(codeStr);
+                }
+                // codeStr 就是拼接好的字符串
+            } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+            }
+        }
         materialBaseInfoDomainService.update(materialBaseInfoDO);
         Long materialBaseInfoId = materialBaseInfoDO.getMaterialBaseInfoId();
         // 商品/公共/仓控 子表：Feign/前端常只带业务字段、未带子表主键，需按 material_base_info_id 补全后再 update，否则 WHERE xxx_id=? 为 null 导致 Updates: 0