From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/LocMastMapper.xml | 101 +++++++++++++-------------------------------------
1 files changed, 26 insertions(+), 75 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 552b136..ee92255 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,86 +33,11 @@
<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" />
<result column="qr_code_value" property="qrCodeValue" />
<result column="status" property="status" />
</resultMap>
-
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
- select
- *
- from asr_loc_mast
- where 1=1
- and row1 in
- <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- and ctn_no =
- (
- select
- top 1
- ctn_no
- from (
- select
- ctn_no,
- count(1) as count
- from asr_loc_mast
- where 1=1
- and row1 in
- <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- and loc_no not in ('0100101', '0200101', '0300101', '0400101')
- and loc_sts = 'O'
- group by ctn_no
- ) a
- where count = #{rowsLen}
- order by right(ctn_no, 2) + 0 asc, left(ctn_no, 3) + 0 asc
- )
- </select>
- <select id="queryFreeLocMast" resultMap="BaseResultMap">
- select
- *
- from asr_loc_mast
- where 1=1
- and row1 in
- <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- and ctn_no =
- (
- select
- top 1
- ctn_no
- from (
- select
- ctn_no,
- count(1) as count
- from asr_loc_mast
- where 1=1
- and row1 in
- <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- and loc_no not in ('0100101', '0200101', '0300101', '0400101')
- and (bay1 = 3 or bay1 = 11 or (bay1 = 7 and row1 = 10))
- and loc_sts = 'O'
- group by ctn_no
- ) a
- where count = #{rowsLen}
- order by right(ctn_no, 2) + 0 asc, left(ctn_no, 3) + 0 asc
- )
- </select>
-
- <select id="queryFreeLocMast0" resultMap="BaseResultMap">
- select top 1 *
- from asr_loc_mast
- where row1=#{row}
- and loc_sts='O'
- order by loc_sts desc ,lev1 asc,bay1 asc
- </select>
<select id="selectAvailableNearLocDesc" resultMap="BaseResultMap">
SELECT TOP 1 * FROM asr_loc_mast WHERE loc_sts IN ('O')
@@ -187,6 +112,27 @@
order by loc_sts desc ,lev1 asc,bay1 asc
</select>
+ <select id="selectAreaEmpty" resultMap="BaseResultMap">
+ select * from asr_loc_mast
+ where loc_sts in ('O')
+ and loc_type3 = #{locType3}
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ ORDER BY row1,bay1,lev1
+ </select>
+
+ <select id="selectAreaEmptyByLev" resultMap="BaseResultMap">
+ select * from asr_loc_mast
+ where loc_sts in ('O')
+ and loc_type3 = #{locType3}
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ and lev1 = #{lev}
+ ORDER BY row1,bay1,lev1
+ </select>
+
<select id="selectEmptyByLocNos" resultMap="BaseResultMap">
SELECT * FROM asr_loc_mast
WHERE loc_sts IN ('O')
@@ -198,6 +144,11 @@
row1 ASC
</select>
+ <select id="selectByLoc" resultMap="BaseResultMap">
+ select * from asr_loc_mast
+ where loc_no = #{locNo}
+ </select>
+
<select id="updateLocType2ByRBL" resultMap="BaseResultMap">
update asr_loc_mast set loc_type2 = #{locType2}
where (row1 >= #{startRow} and row1 <= #{endRow})
--
Gitblit v1.9.1