From 2810958ef9b3101b664f0670722291ee4fbdb151 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 18 七月 2025 17:35:49 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/WrkDetlMapper.xml |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 615f059..d8f8891 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -50,11 +50,40 @@
     </select>
 
     <select id="count2" resultType="Integer">
-        select count(1) from asr_wrk_detl where 1=1 and order_no = #{orderNo} and (wrk_no in (select wrk_no from asr_wrk_mast where 1=1 and wrk_sts in (11,12,13,14)))
+        SELECT COUNT(DISTINCT detl.batch)
+        FROM asr_wrk_detl detl
+                 INNER JOIN asr_wrk_mast mast
+                            ON detl.wrk_no = mast.wrk_no
+        WHERE (mast.io_type = 103 OR mast.io_type = 101)
+          AND mast.wrk_sts IN (11, 12, 13, 14)
+        AND  detl.order_no = #{orderNo}
     </select>
 
     <select id="count3" resultType="Integer">
-        select count(1) from asr_bas_devp where 1=1 and dev_no > 19999
+        SELECT COUNT(DISTINCT detl.batch)
+        FROM asr_wrk_detl detl
+                 INNER JOIN asr_bas_devp devp
+                            ON detl.wrk_no = devp.wrk_no
+    </select>
+
+    <select id="count111" resultType="Integer">
+        SELECT COUNT(DISTINCT batch)
+        FROM (
+                 SELECT detl.batch
+                 FROM asr_wrk_detl detl
+                          INNER JOIN asr_wrk_mast mast
+                                     ON detl.wrk_no = mast.wrk_no
+                 WHERE mast.io_type IN (101, 103)
+                   AND mast.wrk_sts IN (11, 12, 13, 14)
+
+                 UNION
+
+                 SELECT detl.batch
+                 FROM asr_wrk_detl detl
+                          INNER JOIN asr_bas_devp devp
+                                     ON detl.wrk_no = devp.wrk_no
+                 WHERE devp.dev_no BETWEEN 131 AND 144
+             ) AS combined_batches;
     </select>
 
 </mapper>

--
Gitblit v1.9.1