diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 2c8b9d56..043c09ac 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -403,6 +403,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 确保warehouseId有值(如果前端没传,使用原值) if (newCoil.getWarehouseId() == null) { newCoil.setWarehouseId(oldCoil.getWarehouseId()); + newCoil.setActualWarehouseId(oldCoil.getActualWarehouseId()); } validEntityBeforeSave(newCoil); @@ -459,6 +460,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { updateStep.put("operation", "库区变更"); updateStep.put("old_warehouse_id", String.valueOf(oldCoil.getWarehouseId())); updateStep.put("new_warehouse_id", String.valueOf(bo.getWarehouseId())); + //放入真实库区 + updateStep.put("old_actual_warehouse_id", String.valueOf(oldCoil.getActualWarehouseId())); + updateStep.put("new_actual_warehouse_id", String.valueOf(bo.getActualWarehouseId())); updateStep.put("old_coil_id", String.valueOf(oldCoil.getCoilId())); updateStep.put("current_coil_no", currentCoilNo); updateStep.put("operator", LoginHelper.getUsername()); // 操作者 @@ -558,6 +562,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 如果没有指定库区,使用原库区 if (newCoil.getWarehouseId() == null) { newCoil.setWarehouseId(oldCoil.getWarehouseId()); + newCoil.setActualWarehouseId(oldCoil.getActualWarehouseId()); } // 为每个子钢卷生成独立二维码