From 9609e2b096fac01efaa56958042b4175bbc25d5b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 18 十一月 2025 14:36:45 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/LocMastMapper.xml |   92 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 982dd31..cae15d0 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -34,7 +34,8 @@
         <result column="mk" property="mk" />
         <result column="barcode" property="barcode" />
         <result column="ctn_no" property="ctnNo" />
-
+        <result column="frozen" property="frozen" />
+        <result column="frozen_memo" property="frozenMemo" />
     </resultMap>
 
     <select id="queryFreeLocMast" resultMap="BaseResultMap">
@@ -47,6 +48,10 @@
             and loc_type1 = #{locType1}
         </if>
         order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
+    <select id="selectLocByLev" resultMap="BaseResultMap">
+        SELECT * FROM asr_loc_mast WHERE lev1 = #{lev}
     </select>
 
     <select id="queryShallowLocFMast" resultMap="BaseResultMap">
@@ -102,52 +107,101 @@
         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="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="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>
+    <select id="findFirstFrozenLocNo" resultType="java.lang.String">
+        select top 1 loc_no  from asr_loc_mast where frozen = 1 and loc_no in 
+        <foreach collection="locNoList" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
 
 </mapper>

--
Gitblit v1.9.1