From d4c3ebd99e8619c3fc230bb50828e9e762f8dd7a Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期二, 30 九月 2025 09:23:25 +0800
Subject: [PATCH] 字段完善

---
 src/main/resources/mapper/LocMastMapper.xml |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index a9c6062..a74039a 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -89,7 +89,7 @@
         <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
             #{locNo}
         </foreach>
-        AND loc_sts not in ('O') order by row1
+        AND loc_sts not in ('O') order by row1 , lev1
     </select>
 
     <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
@@ -97,7 +97,7 @@
         <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
             #{locNo}
         </foreach>
-        AND loc_sts not in ('O') order by row1 desc
+        AND loc_sts not in ('O') order by row1 desc ,lev1
     </select>
 
     <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
@@ -105,7 +105,7 @@
         <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
             #{locNo}
         </foreach>
-        AND loc_sts in ('O') order by row1 desc
+        AND loc_sts in ('O') order by row1 desc ,lev1
     </select>
 
     <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
@@ -113,7 +113,15 @@
         <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
             #{locNo}
         </foreach>
-        AND loc_sts in ('O') order by row1
+        AND loc_sts in ('O') order by row1 ,lev1
+    </select>
+
+    <select id="selectLocByLocStsPakInF" resultMap="BaseResultMap">
+        SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+            #{locNo}
+        </foreach>
+        AND loc_sts not in ('O') order by row1 DESC
     </select>
 
 </mapper>

--
Gitblit v1.9.1