From 20d07cb3380f9fc6553b710fa35f6bc969a95445 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 三月 2025 10:41:08 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/WrkDetlMapper.xml                    |    6 +++++-
 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java            |    1 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java    |    3 ++-
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |    4 ++++
 src/main/java/com/zy/asrs/controller/MonitorController.java    |    3 ++-
 src/main/java/com/zy/asrs/service/WrkDetlService.java          |    1 +
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index d1dc9b0..e6c188b 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -359,9 +359,10 @@
     @GetMapping("/led/useInfo")
     public R monitorLedUseInfo(@RequestParam("ledId") Integer ledId) {
         Integer count1 = wrkDetlService.count1();
+        Integer count11 = wrkDetlService.count11();
         Integer count3 = wrkDetlService.count3();
         Map<String, Object> map = new HashMap<>();
-        map.put("count1", count1);
+        map.put("count1", count1+count11);
         map.put("count2", count3);
         return R.ok().add(map);
     }
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index f4a6afb..a3e9ff2 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -20,6 +20,7 @@
     List<WrkDetl> selectByWrkNo(Integer wrkNo);
 
     Integer count1();
+    Integer count11();
     Integer count2(@Param("orderNo")String orderNo);
     Integer count3();
 
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 8660ed7..678f936 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -18,6 +18,7 @@
     List<WrkDetl> selectByWrkNo(Integer wrkNo);
 
     Integer count1();
+    Integer count11();
     Integer count2(String orderNo);
     Integer count3();
 
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index eb6c246..dc8bd4b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2467,9 +2467,10 @@
                         continue;
                     }
                     Integer count1 = wrkDetlService.count1();
+                    Integer count11 = wrkDetlService.count11();
                     Integer count2 = wrkDetlService.count2(wrkDetls.get(0).getOrderNo());
                     Integer count3 = wrkDetlService.count3();
-                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl,count1,count2,count3)));
+                    wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl,count1+count11,count2,count3)));
                 }
                 commands.add(ledCommand);
             }
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index f4d9696..4126014 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -68,6 +68,10 @@
         return this.baseMapper.count1();
     }
     @Override
+    public Integer count11() {
+        return this.baseMapper.count11();
+    }
+    @Override
     public Integer count2(String orderNo) {
         return this.baseMapper.count2(orderNo);
     }
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 90cf3af..615f059 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -42,7 +42,11 @@
     </select>
 
     <select id="count1" resultType="Integer">
-        select count(1) from asr_wrk_detl where 1=1 and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
+        select count(1) from asr_wrk_detl where 1=1 and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and io_type = 101 and wrk_sts in (11,12,13,14)))
+    </select>
+
+    <select id="count11" resultType="Integer">
+        select count(1) from asr_wrk_mast where 1=1 and io_type = 103 and wrk_sts in (11,12,13,14)
     </select>
 
     <select id="count2" resultType="Integer">

--
Gitblit v1.9.1