DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-11-04 09:43:02 +08:00
parent bb4c2761ac 7a21237fd3
commit ad5e940f7f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -403,6 +403,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 确保warehouseId有值（如果前端没传，使用原值） // 确保warehouseId有值（如果前端没传，使用原值）
if (newCoil.getWarehouseId() == null) { if (newCoil.getWarehouseId() == null) {
newCoil.setWarehouseId(oldCoil.getWarehouseId()); newCoil.setWarehouseId(oldCoil.getWarehouseId());
newCoil.setActualWarehouseId(oldCoil.getActualWarehouseId());
} }
validEntityBeforeSave(newCoil); validEntityBeforeSave(newCoil);
@@ -459,6 +460,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
updateStep.put("operation", "库区变更"); updateStep.put("operation", "库区变更");
updateStep.put("old_warehouse_id", String.valueOf(oldCoil.getWarehouseId())); updateStep.put("old_warehouse_id", String.valueOf(oldCoil.getWarehouseId()));
updateStep.put("new_warehouse_id", String.valueOf(bo.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("old_coil_id", String.valueOf(oldCoil.getCoilId()));
updateStep.put("current_coil_no", currentCoilNo); updateStep.put("current_coil_no", currentCoilNo);
updateStep.put("operator", LoginHelper.getUsername()); // 操作者 updateStep.put("operator", LoginHelper.getUsername()); // 操作者
@@ -558,6 +562,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
// 如果没有指定库区，使用原库区 // 如果没有指定库区，使用原库区
if (newCoil.getWarehouseId() == null) { if (newCoil.getWarehouseId() == null) {
newCoil.setWarehouseId(oldCoil.getWarehouseId()); newCoil.setWarehouseId(oldCoil.getWarehouseId());
newCoil.setActualWarehouseId(oldCoil.getActualWarehouseId());
} }
// 为每个子钢卷生成独立二维码 // 为每个子钢卷生成独立二维码