From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13

---
 src/main/resources/mapper/LocMastMapper.xml |  101 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 982dd31..4cda0ab 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -102,51 +102,118 @@
         order by row1 desc
     </select>
 
+<!--    <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts not in ('O') order by row1-->
+<!--    </select>-->
+
     <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts not in ('O') order by row1
     </select>
 
+    <select id="selectLocByLocStsPakInShuttleF1" resultMap="BaseResultMap">
+        SELECT top 1 *
+        FROM [dbo].[asr_loc_mast]
+        WHERE 1=1
+          and whs_type=#{whsType}
+          and crn_no=#{crnNo}
+          and bay1 = #{bay}
+          and lev1 = #{lev}
+          and gro1 = #{gro}
+          AND loc_sts not in ('O') order by bay1
+    </select>
+
+<!--    <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and 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>-->
     <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts not in ('O') order by row1 desc
     </select>
 
+    <select id="selectLocByLocStsPakInShuttleF2" resultMap="BaseResultMap">
+        SELECT top 1 *
+        FROM [dbo].[asr_loc_mast]
+        WHERE 1=1
+          and whs_type=#{whsType}
+          and crn_no=#{crnNo}
+          and bay1 = #{bay}
+          and lev1 = #{lev}
+          and gro1 = #{gro}
+          AND loc_sts not in ('O') order by bay1 desc
+    </select>
+<!--    <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts in ('O') order by row1 desc-->
+<!--    </select>-->
     <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts in ('O') order by row1 desc
     </select>
-
+<!--    <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">-->
+<!--        SELECT top 1 *-->
+<!--        FROM [dbo].[asr_loc_mast]-->
+<!--        WHERE 1=1-->
+<!--        and whs_type=#{whsType}-->
+<!--        and loc_no in-->
+<!--        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">-->
+<!--            #{locNo}-->
+<!--        </foreach>-->
+<!--        AND loc_sts in ('O') order by row1-->
+<!--    </select>-->
     <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
         SELECT top 1 *
         FROM [dbo].[asr_loc_mast]
         WHERE 1=1
         and whs_type=#{whsType}
-        and loc_no in
-        <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
-            #{locNo}
-        </foreach>
+        and crn_no=#{crnNo}
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and gro1 = #{gro}
         AND loc_sts in ('O') order by row1
     </select>
 

--
Gitblit v1.9.1