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 } 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());