From 50a1c95123740252a833372878d993368b547690 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 18 七月 2025 18:02:28 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/WrkDetlMapper.xml | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index d8f8891..6e2e622 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -50,20 +50,52 @@
</select>
<select id="count2" resultType="Integer">
- 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 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 (202)
+ AND mast.wrk_sts IN (51)
+ AND detl.order_no = #{orderNo}
+ UNION
+
+ 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 = 103 OR mast.io_type = 101)
+ AND mast.wrk_sts IN (11, 12, 13, 14)
+ AND detl.order_no = #{orderNo}
+ 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
+ AND detl.order_no = #{orderNo}
+ ) AS combined_batches;
</select>
<select id="count3" resultType="Integer">
- SELECT COUNT(DISTINCT detl.batch)
- FROM asr_wrk_detl detl
- INNER JOIN asr_bas_devp devp
- ON detl.wrk_no = devp.wrk_no
+ 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 (202)
+ AND mast.wrk_sts IN (51)
+ 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>
<select id="count111" resultType="Integer">
@@ -73,6 +105,13 @@
FROM asr_wrk_detl detl
INNER JOIN asr_wrk_mast mast
ON detl.wrk_no = mast.wrk_no
+ WHERE mast.io_type IN (202)
+ AND mast.wrk_sts IN (51)
+ UNION
+ 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)
--
Gitblit v1.9.1