From e3a8e36cf8c4d9d3fdf4c7dafd7309e19ff4b983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Tue, 17 Mar 2026 21:03:57 +0800
Subject: [PATCH] =?UTF-8?q?barcode=E5=80=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shiftManage/repository/persistence/ShiftManageImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
index 54bdd1ddc..972ceb913 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
@@ -222,7 +222,10 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
         }
         shiftMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
         shiftMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
-        shiftMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
+        // 优先保留 setMaterialInventory 已从库存表取到的 barCode，仅在为空时才从物料基础信息补充
+        if (StringUtils.isBlank(shiftMaterialDetailDO.getBarCode())) {
+            shiftMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
+        }
         shiftMaterialDetailDO.setPackId(materialBaseInfoPO.getPackId());
         shiftMaterialDetailDO.setPackCode(materialBaseInfoPO.getPackCode());
         shiftMaterialDetailDO.setPackName(materialBaseInfoPO.getPackName());