From 1e6b4d88290ccd79b51bed3acb805750a0ea7d01 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 15:25:23 +0800
Subject: [PATCH] 记录输送线异常日志

---
 src/main/resources/mapper/LocMastMapper.xml |  126 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 123 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 1a9ad24..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">
@@ -42,15 +43,21 @@
         from asr_loc_mast
         where row1=#{row}
         and loc_sts='O'
+        and whs_type=#{whsType}
         <if test="locType1 != null">
             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">
         select * from asr_loc_mast
         where 1=1
+        and whs_type=#{whsType}
         and loc_no in (
          select
          concat(
@@ -77,11 +84,124 @@
     </select>
 
     <select id="selectLocShuttleMoveUnilateralY" resultMap="BaseResultMap">
-        select * from [dbo].[asr_loc_mast] where row1>1 and row1 &lt; 18 and bay1 = #{bay} and lev1 = #{lev} and loc_sts='F' order by row1
+        select *
+        from [dbo].[asr_loc_mast]
+        where 1=1
+        and whs_type=#{whsType}
+        and row1>1 and row1 &lt; 18
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and loc_sts='F'
+        order by row1
     </select>
 
     <select id="selectLocShuttleMoveUnilateralN" resultMap="BaseResultMap">
-        select * from [dbo].[asr_loc_mast] where row1>17 and row1 &lt; 31 and bay1 = #{bay} and lev1 = #{lev} and loc_sts='F' order by row1 desc
+        select *
+        from [dbo].[asr_loc_mast]
+        where 1=1
+        and whs_type=#{whsType}
+        and row1>17 and row1 &lt; 31
+        and bay1 = #{bay}
+        and lev1 = #{lev}
+        and loc_sts='F'
+        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 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 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 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 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