From e9af1f12fee5cc07636fb8bfa44feb908693a9bc Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Mon, 14 Apr 2025 10:05:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E5=AD=98=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceImpl/StackerTaskServiceImpl.java | 83 +++++++++++++++++-- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java index f314f94..9df6f83 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java @@ -65,6 +65,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService { * 输送线任务服务 */ private final IConveyTaskService conveyTaskService; + /** + * 库存更新服务 + */ + private final ITAppStockUpdateService appStockUpdateService; /** * 业务通用 */ @@ -311,6 +315,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService { List goodsIds = new ArrayList<>(); // 新的库存信息 List newStockList = new ArrayList<>(); + // 库存更新记录 + List stockUpdateList = new ArrayList<>(); // 入库记录 List newTaskBakList = new ArrayList<>(); // 需要删除的任务id @@ -352,7 +358,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService { } } // 新库存，增加库存信息 - newStockList.add(new TAppStock( + TAppStock thisTimeNewStock = new TAppStock( UUIDUtils.getNewUUID(), vehicleId, thisVehicleInTask.getDestination(), @@ -371,7 +377,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService { sledDays, null, null - )); + ); + newStockList.add(thisTimeNewStock); + // 库存更新记录 + TAppStockUpdate stockUpdate = new TAppStockUpdate( + UUIDUtils.getNewUUID(), + thisTimeNewStock.getVehicleId(), + thisTimeNewStock.getGoodsId(), + thisTimeNewStock.getFirstInTime(), + 0, + thisTimeNewStock.getRealNum(), + thisVehicleInTask.getOrigin() + "：入库", + LocalDateTime.now(), + thisVehicleInTask.getOpUser() + ); + stockUpdateList.add(stockUpdate); } } // 当前载具是否是空载具 @@ -416,6 +436,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService { if (!newStockList.isEmpty()) { appStockService.saveOrUpdateBatch(newStockList); } + // 增加库存更新记录 + if (!stockUpdateList.isEmpty()) { + appStockUpdateService.saveBatch(stockUpdateList); + } // 添加任务记录 if (!newTaskBakList.isEmpty()) { appTaskBakService.saveBatch(newTaskBakList); @@ -457,6 +481,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService { List goodsIds = new ArrayList<>(); // 新的库存信息 List newStockList = new ArrayList<>(); + // 库存更新记录 + List stockUpdateList = new ArrayList<>(); // 待删除的库存信息 List needDeleteStockIds = new ArrayList<>(); // 入库记录 @@ -508,7 +534,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService { } if (oldStockList.isEmpty()) { // 新库存，增加库存信息 - newStockList.add(new TAppStock( + TAppStock thisTimeNewStock = new TAppStock( UUIDUtils.getNewUUID(), vehicleId, thisVehicleInTask.getDestination(), @@ -527,7 +553,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService { sledDays, null, null - )); + ); + newStockList.add(thisTimeNewStock); + // 库存更新记录 + TAppStockUpdate stockUpdate = new TAppStockUpdate( + UUIDUtils.getNewUUID(), + thisTimeNewStock.getVehicleId(), + thisTimeNewStock.getGoodsId(), + thisTimeNewStock.getFirstInTime(), + 0, + thisTimeNewStock.getRealNum(), + thisVehicleInTask.getOrigin() + "：入库", + LocalDateTime.now(), + thisVehicleInTask.getOpUser() + ); + stockUpdateList.add(stockUpdate); } else { // 更新已有库存信息 if (oldStockList.size() > 1) { @@ -539,7 +579,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService { .mapToInt(TAppStock::getTotalNum) .sum(); // 新库存，增加库存信息 - newStockList.add(new TAppStock( + TAppStock thisTimeOldNewStock = new TAppStock( UUIDUtils.getNewUUID(), vehicleId, thisVehicleInTask.getDestination(), @@ -558,7 +598,21 @@ public class StackerTaskServiceImpl implements IStackerTaskService { sledDays, null, null - )); + ); + newStockList.add(thisTimeOldNewStock); + // 库存更新记录 + TAppStockUpdate stockUpdate = new TAppStockUpdate( + UUIDUtils.getNewUUID(), + thisTimeOldNewStock.getVehicleId(), + thisTimeOldNewStock.getGoodsId(), + thisTimeOldNewStock.getFirstInTime(), + originSum, + thisTimeOldNewStock.getRealNum(), + thisVehicleInTask.getOrigin() + "：入库", + LocalDateTime.now(), + thisVehicleInTask.getOpUser() + ); + stockUpdateList.add(stockUpdate); needDeleteStockIds.addAll(oldStockList.stream() .map(TAppStock::getStockId) .toList()); @@ -574,6 +628,19 @@ public class StackerTaskServiceImpl implements IStackerTaskService { oldStock.setLastUpdateUser(thisVehicleInTask.getOpUser()); oldStock.setStockStatus(WmsStockStatusEnums.OK.getCode()); newStockList.add(oldStock); + // 库存更新记录 + TAppStockUpdate stockUpdate = new TAppStockUpdate( + UUIDUtils.getNewUUID(), + oldStock.getVehicleId(), + oldStock.getGoodsId(), + oldStock.getFirstInTime(), + oldStock.getRealNum() - thisVehicleInTask.getOpNum(), + oldStock.getRealNum(), + thisVehicleInTask.getOrigin() + "：入库", + LocalDateTime.now(), + thisVehicleInTask.getOpUser() + ); + stockUpdateList.add(stockUpdate); } } } @@ -624,6 +691,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService { if (!newStockList.isEmpty()) { appStockService.saveOrUpdateBatch(newStockList); } + // 增加库存更新记录 + if (!stockUpdateList.isEmpty()) { + appStockUpdateService.saveBatch(stockUpdateList); + } // 添加任务记录 if (!newTaskBakList.isEmpty()) { appTaskBakService.saveBatch(newTaskBakList);