weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-17 21:41:27 +08:00
parent 3ad35af34b e3a8e36cf8
commit 9121eec116
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/repository/persistence/ShiftManageImpl.java
+4 -1
View File
@@ -222,7 +222,10 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
} }
shiftMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode()); shiftMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
shiftMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName()); shiftMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
shiftMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode()); // 优先保留 setMaterialInventory 已从库存表取到的 barCode，仅在为空时才从物料基础信息补充
if (StringUtils.isBlank(shiftMaterialDetailDO.getBarCode())) {
shiftMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
}
shiftMaterialDetailDO.setPackId(materialBaseInfoPO.getPackId()); shiftMaterialDetailDO.setPackId(materialBaseInfoPO.getPackId());
shiftMaterialDetailDO.setPackCode(materialBaseInfoPO.getPackCode()); shiftMaterialDetailDO.setPackCode(materialBaseInfoPO.getPackCode());
shiftMaterialDetailDO.setPackName(materialBaseInfoPO.getPackName()); shiftMaterialDetailDO.setPackName(materialBaseInfoPO.getPackName());