From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型

---
 src/main/resources/mapper/LocMastMapper.xml |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index ffd3a10..d883d4b 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>
@@ -198,6 +197,25 @@
         order by loc_sts desc ,lev1 asc,bay1 asc
     </select>
 
+    <select id="queryFreeLocMastEnd1" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        <choose>
+            <when test="inoutEveryday != null and inoutEveryday">
+                AND bay1 &lt; 11             </when>
+            <otherwise>
+                AND bay1 >= 11
+            </otherwise>
+        </choose>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
     <select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
         select *
         from asr_loc_mast
@@ -237,7 +255,7 @@
     <select id="queryFreeLocMast2" resultMap="BaseResultMap">
         select *
         from asr_loc_mast
-        where row1=#{row}
+        where 1=1
         and loc_sts='O'
         <if test="locType1 != null">
             and loc_type1 = #{locType1}
@@ -265,4 +283,92 @@
         order by loc_sts desc ,lev1 asc,bay1 asc
     </select>
 
+    <select id="findOutMast" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_type1 = #{locType1}
+        and loc_type2 = 2
+        and crn_no in
+        <foreach item="item" collection="crnNos" index="index"  separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and loc_sts = 'O'
+        order by bay1,lev1,row1
+    </select>
+
+    <select id="findInEmptyLocMast" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_type2 = 1
+        and loc_type1 = #{locType1}
+        and row1 in
+        <foreach item="item" collection="rows" index="index"  separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and loc_sts = 'O'
+        and crn_no = #{crnNo}
+        order by bay1,lev1,row1
+    </select>
+
+    <select id="findEmptyLocMastByLocNos" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_type2 = 1
+        and loc_type1 = #{locType1}
+        and loc_no in
+        <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and loc_sts = 'O'
+        <if test="crnNo != null and crnNo != ''">
+            and crn_no = #{crnNo}
+        </if>
+        order by bay1,lev1,row1
+    </select>
+
+    <select id="findEmptyLowFrequencyLocMast" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_type2 = 3
+        <if test="locType1 != 1">
+            and loc_type1 = #{locType1}
+        </if>
+        and loc_sts = 'O'
+        and crn_no = #{crnNo}
+        order by bay1,lev1,row1
+    </select>
+
+    <select id="findEmptyLocMast" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_type1 = #{locType1}
+        and loc_sts = 'O'
+        and crn_no = #{crnNo}
+        order by bay1,lev1,row1
+    </select>
+
+    <select id="selectLocByLev" resultMap="BaseResultMap">
+        SELECT * FROM asr_loc_mast WHERE lev1 = #{lev}
+    </select>
+
+    <select id="selectByLocNos" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_no in
+        <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="selectEmptyLocCount0" resultType="java.lang.Integer">
+        select count(1) from asr_loc_mast
+        where 1=1
+        and loc_sts = 'O'
+        and loc_type1 = #{locType1}
+        and loc_type2 = #{locType2}
+        and crn_no = #{crnNo}
+        <if test="crnNo == 1">
+            and row1 in (3,4)
+        </if>
+        <if test="crnNo == 2">
+            and row1 in (11,12)
+        </if>
+        <if test="crnNo == 3">
+            and row1 in (18,19)
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.1