From 7d7a2c1b4a8f4c0ce412916cf8acba3510e3ba05 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 17:21:48 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastStaMapper.xml |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index f2f11b6..ebc1221 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -103,6 +103,29 @@
         and wrk_no = #{workNo}
         order by line_number,id
     </select>
+    <select id="selectNoInterfereCrn" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where 1=1
+        and (sta_start in
+        <foreach item="item" collection="staStarts" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        or sta_start = 0
+        )
+        and (sta_end in
+        <foreach item="item" collection="staEnds" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        or sta_end = 0
+        )
+        and wrk_sts=0
+        and sta_end in (2006.2012,2018,2024,2030,1004,1014,1018,1028,1035)
+        and wrk_no = #{workNo}
+        order by
+        case when mk = 1 then 0 else 1 end,
+        line_number,
+        id
+    </select>
 
     <select id="selectNoInterfereToCrn" resultMap="BaseResultMap">
         select * from asr_wrk_mast_sta
@@ -167,6 +190,12 @@
         and sta_start = #{staStart}
     </select>
 
+    <select id="selectPakingWrkNum" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where mk = 1
+        and rgv_no = #{rgvNo}
+    </select>
+
 
 
 </mapper>

--
Gitblit v1.9.1