From 1a9bd1bcbfd34bd651dbfc50a1b33766e9ef744d Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Sun, 15 Mar 2026 15:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E4=BB=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockInOrder/StockInOrderApplicationService.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
index 175acfb0f..c746d8c57 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
@@ -19,6 +19,7 @@ import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
 import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
 import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO;
@@ -1336,8 +1337,14 @@ public class StockInOrderApplicationService {
                     
                     InMaterialDetailDO d = new InMaterialDetailDO();
                     d.setMaterialBaseInfoId(materialBaseInfoId);
-                    // 设置商品名称和料号（从Excel读取）
-                    d.setMaterialName(r.getMaterialName());
+                    if (materialBaseInfoId != null){
+                        //从数据库获取名称
+                        MaterialBaseInfo materialBaseInfo = materialBaseInfoService.getById(materialBaseInfoId);
+                        d.setMaterialName(materialBaseInfo.getMaterialName());
+                    }else {
+                        // 设置商品名称和料号（从Excel读取）
+                        d.setMaterialName(r.getMaterialName());
+                    }
                     // 如果料号为空但物料ID有值，根据物料ID查询并补充料号
                     String materialCode = r.getMaterialCode();
                     if (StringUtils.isBlank(materialCode) && materialBaseInfoId != null) {