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

This commit is contained in:
王奎兴
2026-04-18 17:17:06 +08:00
2 changed files with 7 additions and 1 deletions
@@ -161,6 +161,8 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
shiftMaterialDetailDOChild.setOldStorageLocationCode(e.getOldStorageLocationCode());
shiftMaterialDetailDOChild.setOldStorageLocationName(e.getOldStorageLocationName());
shiftMaterialDetailDOChild.setBatchNumber(e.getBatchNumber());
shiftMaterialDetailDOChild.setLotNumber(e.getLotNumber());
shiftMaterialDetailDOChild.setInOrderNumber(e.getInOrderNumber());
shiftMaterialDetailDOChild.setMaterialStatusCode(e.getMaterialStatusCode());
shiftMaterialDetailDOChild.setMaterialStatusName(e.getMaterialStatusName());
shiftMaterialDetailDOChild.setContainerId(e.getContainerId());
@@ -400,6 +402,8 @@ public class ShiftManageImpl extends ServiceImpl<ShiftManageMapper, ShiftManage>
shiftMaterialDetailDO.setOldStorageLocationCode(materialInventoryPO.getStorageLocationCode());
shiftMaterialDetailDO.setOldStorageLocationName(materialInventoryPO.getStorageLocationName());
shiftMaterialDetailDO.setBatchNumber(materialInventoryPO.getBatchNumber());
shiftMaterialDetailDO.setLotNumber(materialInventoryPO.getLotNumber());
shiftMaterialDetailDO.setInOrderNumber(materialInventoryPO.getInOrderNumber());
shiftMaterialDetailDO.setMaterialStatusCode(materialInventoryPO.getMaterialStatusCode());
shiftMaterialDetailDO.setMaterialStatusName(materialInventoryPO.getMaterialStatusName());
//没有选择容器并且选择的同期和原库位不一样