From 85abc5b176632d16474dfcddfc234ee52fc619ad Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Thu, 24 Oct 2024 16:51:52 +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=E5=A4=A7=E5=B1=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=20=E4=BF=AE=E5=A4=8D=E5=8D=A1outsideVeh?=
 =?UTF-8?q?icles=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/wms/controller/MonitorController.java |  2 +-
 .../WmsTaskServiceImplements.java             | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wms/controller/MonitorController.java b/src/main/java/com/wms/controller/MonitorController.java
index a4fd9b9..87b3396 100644
--- a/src/main/java/com/wms/controller/MonitorController.java
+++ b/src/main/java/com/wms/controller/MonitorController.java
@@ -174,7 +174,7 @@ public class MonitorController {
                     }
                 }
                 total.add(currentStationWorkFlowList.size());
-                complete.add(finishingRows/currentStationWorkFlowList.size());
+                complete.add((finishingRows * 100)/currentStationWorkFlowList.size());
             }
         } catch (Exception e) {
             total = Collections.emptyList();
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 b297a25..e739233 100644
--- a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
+++ b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
@@ -327,8 +327,7 @@ public class WmsTaskServiceImplements implements IWmsTaskService {
                             .last("limit 1"));
                     if (stock == null) {
                         // 没有库存
-                        outsideVehicle.setRemainNum(BigDecimal.ZERO);
-                        outsideVehiclesService.updateById(outsideVehicle);
+                        outsideVehiclesService.removeById(outsideVehicle);
                     } else {
                         // 库存状态为正常
                         if (Objects.equals(stock.getStockStatus(), StockStatus.OK.getCode())) {
@@ -375,7 +374,23 @@ public class WmsTaskServiceImplements implements IWmsTaskService {
                     .eq(OutsideVehicles::getGoodsId, goodsId)
                     .ne(OutsideVehicles::getOutStatus, 2));
             if (!outsideVehiclesList.isEmpty()) {
-               return needNum;
+                boolean canCallStock = true;
+                // 判断这些outsideVehicles对应的库存是不是都是0
+                for (OutsideVehicles outsideVehicle : outsideVehiclesList) {
+                    Stock stock = stockService.getOne(new LambdaQueryWrapper<Stock>()
+                            .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) {
+                    return needNum;
+                }
             }
             // 查询库存，判断数量是否充足
             List<Stock> stockList = stockService.list(new LambdaQueryWrapper<Stock>()