From a3c831343b4a975cb3bf71e5c8300e4598bcfef4 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 25 十二月 2025 11:45:13 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 35c3f01..9250187 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -19,6 +19,7 @@
         <result column="bign_time" property="bignTime" />
         <result column="work_sta" property="workSta"/>
         <result column="rgv_no" property="rgvNo"/>
+        <result column="mk" property="mk"/>
 
     </resultMap>
 
@@ -42,7 +43,7 @@
         select top 1 * from asr_wrk_mast_sta
         where 1=1
           and wrk_no = #{workNo}
-          and wrk_sts = 2
+          and wrk_sts = 1
     </select>
 
 <!--    <select id="selectNoInterfere" resultMap="BaseResultMap">-->
@@ -102,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
@@ -150,7 +176,27 @@
             and wrk_sts = #{wrkSts}
         </if>
     </select>
+    <select id="selectLockWrk" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where wrk_sts > 0
+        and sta_end &lt; 2000
+    </select>
+    <select id="selectLockWrkT" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where wrk_sts > 0
+        and sta_end &gt; 2000
+    </select>
+    <select id="selectPakingWrk" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where mk = 1
+        and sta_start = #{staStart}
+    </select>
 
+    <select id="selectPakingWrkNum" resultMap="BaseResultMap">
+        select * from asr_wrk_mast_sta
+        where mk = 1
+        and rgv_no = #{rgvNo}
+    </select>
 
 
 

--
Gitblit v1.9.1