From 8980782bebfd40b2a56169e4fb53686882e87a97 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 26 十二月 2025 14:20:44 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index f2f11b6..9250187 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -103,6 +103,31 @@
         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 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 +192,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