From 5eebfb4dd53b0b67282bdc48ff935921b1077e9b Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Sun, 15 Mar 2026 17:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BD=8D=E5=8D=95=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E6=9D=A1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ShiftMaterialDetailApplicationService.java | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftMaterialDetail/ShiftMaterialDetailApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftMaterialDetail/ShiftMaterialDetailApplicationService.java
index 08f0fae37..986834e2a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftMaterialDetail/ShiftMaterialDetailApplicationService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/shiftMaterialDetail/ShiftMaterialDetailApplicationService.java
@@ -7,7 +7,12 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.domain.BatchDetailFeignPO;
+import com.mhd.system.api.domain.PackDetailFeignPO;
 import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.materialBarCode.repository.facade.IMaterialBarCodeService;
+import com.mhd.wms.domain.materialBarCode.repository.po.MaterialBarCodePO;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
+import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
 import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
 import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
@@ -41,6 +46,9 @@ public class ShiftMaterialDetailApplicationService {
     @Autowired
     private MaterialInventoryMapper materialInventoryMapper;
 
+    @Autowired
+    private IMaterialBarCodeService materialBarCodeService;
+
     /**
      * 分页查询移位物料明细列表
      */
@@ -203,6 +211,21 @@ public class ShiftMaterialDetailApplicationService {
             MaterialInventoryPO materialInventoryPO = null;
             if (materialInventoryId != null) {
                 materialInventoryPO = materialInventoryMapper.selectByIdWithBatchAttributes(materialInventoryId);
+
+
+                List<MaterialBarCodePO> materialBarCodePOList = materialBarCodeService.getInfoByMaterialBaseInfoIds(materialBaseInfoId);
+                if (materialBarCodePOList != null && !materialBarCodePOList.isEmpty()) {
+                    Map<Long, MaterialBarCodePO> collect = materialBarCodePOList.stream()
+                            .collect(Collectors.toMap(
+                                    MaterialBarCodePO::getMaterialBaseInfoId,
+                                    po -> po,
+                                    (existing, replacement) -> existing
+                            ));
+                    MaterialBarCodePO materialBarCodePO = collect.get(shiftMaterialDetailPO.getMaterialBaseInfoId());
+                    if (materialBarCodePO != null && materialBarCodePO.getBarCode() != null) {
+                        shiftMaterialDetailPO.setBarCode(materialBarCodePO.getBarCode());
+                    }
+                }
             }
             
             if (materialBaseInfoId != null && batchDetailMap.containsKey(materialBaseInfoId)) {