From a38d955f816eb64f297cd587b507defd5839892e Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 09 十二月 2025 15:08:46 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastStaMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 5d5fc77..ebc1221 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -119,9 +119,12 @@
         or sta_end = 0
         )
         and wrk_sts=0
-        and sta_end in (1018,2018)
+        and sta_end in (2006.2012,2018,2024,2030,1004,1014,1018,1028,1035)
         and wrk_no = #{workNo}
-        order by line_number,id
+        order by
+        case when mk = 1 then 0 else 1 end,
+        line_number,
+        id
     </select>
 
     <select id="selectNoInterfereToCrn" resultMap="BaseResultMap">
@@ -187,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