From 87998c0a28abf1dde2ee64ec884354dbda613c97 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Wed, 20 Nov 2024 10:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E8=A6=81=E6=96=99=E4=BF=A1=E6=81=AF=E7=9A=84bug=E3=80=82=202.?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=91=BC=E5=8F=AB=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=80=E6=96=99=E4=B8=80?= =?UTF-8?q?=E7=AE=B1=E8=BD=AC=E5=8C=96=E4=B8=BA=E4=B8=80=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E4=B8=80=E6=96=99=E4=B8=80=E7=AE=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsTaskServiceImplements.java | 23 +++++++------------ .../WorkServiceImplements.java | 9 -------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java index e739233..77127be 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java @@ -374,21 +374,14 @@ public class WmsTaskServiceImplements implements IWmsTaskService { .eq(OutsideVehicles::getGoodsId, goodsId) .ne(OutsideVehicles::getOutStatus, 2)); if (!outsideVehiclesList.isEmpty()) { - boolean canCallStock = true; - // 判断这些outsideVehicles对应的库存是不是都是0 - for (OutsideVehicles outsideVehicle : outsideVehiclesList) { - Stock stock = stockService.getOne(new LambdaQueryWrapper() - .eq(Stock::getVehicleId, outsideVehicle.getVehicleId()) - .apply("goods_related ->> '$.goodsId' = {0}" + MYSQL_JSON_CI, goodsId) - .apply("goods_related ->> '$.remainNum' > 0") - .last("limit 1")); - if (stock != null) { - canCallStock = false; - break; - } - } - // 不能呼叫库存 - if (!canCallStock) { + // 这些箱子 + List outsideVehicleIds = outsideVehiclesList.stream().map(OutsideVehicles::getVehicleId).distinct().toList(); + // 这些箱子是不是有去到当前站台的拣选任务 + List outsidePickTasks = pickTaskService.list(new LambdaQueryWrapper() + .in(PickTask::getVehicleId, outsideVehicleIds) + .eq(PickTask::getStandId, workStation)); + if (!outsidePickTasks.isEmpty()) { + // 不能呼叫库存 return needNum; } } diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java index 102510b..a10676c 100644 --- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java +++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java @@ -274,15 +274,6 @@ public class WorkServiceImplements implements IWorkService { newGoodsToStation.setDistributedNum(newGoodsToStation.getDistributedNum().subtract(needNum)); newGoodsToStation.setDistributeStatus(1); needDistributeGoodsMap.put(notFinishedWorkFlow.getGoodsId(), newGoodsToStation); - } else { - GoodsToStation goodsToStation = new GoodsToStation(); - goodsToStation.setConfigId(notFinishedWorkFlow.getGoodsId() + "_" + workStation); - goodsToStation.setGoodsId(notFinishedWorkFlow.getGoodsId()); - goodsToStation.setWorkStation(workStation); - goodsToStation.setDistributeStatus(0); - goodsToStation.setDistributedNum(BigDecimal.ZERO); - goodsToStation.setTotalNum(needNum); - needDistributeGoodsMap.put(notFinishedWorkFlow.getGoodsId(), goodsToStation); } } }