From 489eca56172f0abf9a35fd5b36498ba048149944 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 27 四月 2026 11:18:47 +0800
Subject: [PATCH] 电视机托盘数优化

---
 src/main/java/com/zy/asrs/controller/OpenController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 39febb4..51aae33 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -986,6 +986,7 @@
         Integer sum = 0;
         if (ioType != null && ioType < 100) {
             supp = String.valueOf(resolveInboundSupp(wrkMast));
+            map.put("supp", supp);
         }else {
             String[] split = wrkDetls.get(0).getSupp().split("/");
             if (split != null && split.length > 0) {
@@ -993,10 +994,10 @@
             }else {
                 sum = Integer.valueOf(wrkDetls.get(0).getSupp());
             }
-            List<WrkMast> userNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()));
-            suppCount = sum - userNo.size()+1;
+            List<WrkMast> userNo = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("user_no", wrkMast.getUserNo()).in("wrk_sts",11,12,21,22,25));
+            suppCount = sum - userNo.size();
+            map.put("supp", suppCount + "/" + sum);
         }
-        map.put("supp", suppCount + "/" + sum);
 
         //鑰楁椂
         Long costTime = resolveCostTime(wrkMast);

--
Gitblit v1.9.1