From 428afb64e7fc9b7c3701eacab98086fb622cca7b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 06 十一月 2025 09:30:03 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 4e90fba..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">

--
Gitblit v1.9.1