From 0bedfead3ffe6d2251d7428d772de0a4df6b5201 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 21 七月 2025 15:52:49 +0800
Subject: [PATCH] 1.向mes查询物料 2.入库上报mes

---
 src/main/resources/mapper/LocMastMapper.xml |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 118 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index fb1bd8d..8d918ad 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,7 +33,6 @@
         <result column="inv_wh" property="invWh" />
         <result column="mk" property="mk" />
         <result column="barcode" property="barcode" />
-        <result column="Pdc_type" property="PdcType" />
         <result column="ctn_no" property="ctnNo" />
 
     </resultMap>
@@ -43,6 +42,7 @@
         from asr_loc_mast
         where row1=#{row}
         and loc_sts='O'
+        and whs_type=#{whsType}
         <if test="locType1 != null">
             and loc_type1 = #{locType1}
         </if>
@@ -52,6 +52,7 @@
     <select id="queryShallowLocFMast" resultMap="BaseResultMap">
         select * from asr_loc_mast
         where 1=1
+        and whs_type=#{whsType}
         and loc_no in (
          select
          concat(
@@ -76,4 +77,120 @@
         )
         and (loc_sts = 'F' or loc_sts = 'D') and crn_no = #{crnNo}
     </select>
+
+    <select id="selectLocShuttleMoveUnilateralY" resultMap="BaseResultMap">
+        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 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>
+
 </mapper>

--
Gitblit v1.9.1