From 1760bfd1f4399bf11476b2298c997f4a3844f48b Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Tue, 18 Mar 2025 12:57:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wms/bussiness/JobComponent.java | 24 ++++++++++--------- .../serviceImplements/OrderOutImplements.java | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/wms/bussiness/JobComponent.java b/src/main/java/com/wms/bussiness/JobComponent.java index d6eddf6..7126d40 100644 --- a/src/main/java/com/wms/bussiness/JobComponent.java +++ b/src/main/java/com/wms/bussiness/JobComponent.java @@ -258,6 +258,7 @@ public class JobComponent extends BaseController { logger.info("没有可移动库位,移动库位存在任务"); return; // 没有可用库位或者m库位存在干涉 } + logger.info("查找到可用移动库位{},原库位{}", emptyLocationItem.getLocationId(),beforLocation.getLocationId()); // 锁定旧库位库存 stockMapper.updateStockStatusWithLocationId(beforLocation.getLocationId(), StockStatus.LOCK.getCode()); @@ -385,19 +386,20 @@ public class JobComponent extends BaseController { } if (desDeepLocations.isEmpty()) { logger.info("后一个库位信息为空"); - return; - } - Location desDeepLocation = desDeepLocations.get(0); // 前一个库位 - List desNotCompleteTasks = taskMapper.haveNotCompleteTask(desDeepLocation.getLocationId()); - if (desNotCompleteTasks == null) { - logger.info("查询任务异常"); - return; - } - if (!desNotCompleteTasks.isEmpty()) { - logger.info("发送移库任务时目标库位,高深度存在未完成的任务，退出函数"); - return; + }else { + Location desDeepLocation = desDeepLocations.get(0); // 前一个库位 + List desNotCompleteTasks = taskMapper.haveNotCompleteTask(desDeepLocation.getLocationId()); + if (desNotCompleteTasks == null) { + logger.info("查询任务异常"); + return; + } + if (!desNotCompleteTasks.isEmpty()) { + logger.info("发送移库任务时目标库位,高深度存在未完成的任务，退出函数"); + return; + } } + /* 检查该库位前一个深度是否存在库存，若存在库存则生成一个移库任务，此任务暂不下发 */ List thisLocations = locationService.selLocations(new Location(task.getOrigin())); if(thisLocations == null) { diff --git a/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java b/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java index eb5d0be..c64a1c4 100644 --- a/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java +++ b/src/main/java/com/wms/service/serviceImplements/OrderOutImplements.java @@ -133,7 +133,7 @@ public class OrderOutImplements implements IOrderOutService { outTasks.add(task); } // 把这条库存记录可用数量更新为 0 -// stockMapper.updateStockAvailableNumWithStockId(outStock.getStockId(), outStock.getAvailableNum()-outNum); + stockMapper.updateStockAvailableNumWithStockId(outStock.getStockId(), outStock.getAvailableNum()-outNum); // 更新库存为出库中 stockMapper.updateStockStatusWithLocationId(outStock.getLocationId(), StockStatus.OUT.getCode()); // 重新计算需求数量