From 564b8ff8aa19e80f7cf4dbdb06b6f153b41641ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 31 Jul 2026 16:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StockReceiptOrderApplicationService.java              | 4 +++-
 mhd_wms/src/main/resources/bootstrap.yml                  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
index 355dc57d2..ea0c33038 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
@@ -233,7 +233,9 @@ public class StockReceiptOrderApplicationService {
         }
         for (ReceiptMaterialDetailPO receiptMaterialDetailPO : receiptMaterialDetailPOList) {
             MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoMap.get(receiptMaterialDetailPO.getMaterialBaseInfoId());
-            receiptMaterialDetailPO.setCopyCode(materialBaseInfoPO.getCopyCode());
+            if (materialBaseInfoPO != null) {
+                receiptMaterialDetailPO.setCopyCode(materialBaseInfoPO.getCopyCode());
+            }
         }
         
         // 4.2 批量查询包装规格信息（单位代码为EA的单位名称）
diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml
index fc7380c20..39eb710cb 100644
--- a/mhd_wms/src/main/resources/bootstrap.yml
+++ b/mhd_wms/src/main/resources/bootstrap.yml
@@ -14,18 +14,18 @@ spring:
     nacos:
       discovery:
 #        server-addr: 127.0.0.1:8848
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
       #        线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
       #线上正式环境
 #              server-addr: 10.102.192.105:6848
       config:
 #        server-addr: 127.0.0.1:8848
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
         # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.30:6848
+#        server-addr: 10.102.192.30:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境