From b7b4510ab85d9c3a31645f56e3d799ad817d9762 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 30 九月 2025 08:36:43 +0800
Subject: [PATCH] 订单不转历史
---
src/main/resources/mapper/LocMastMapper.xml | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 6eba518..feff422 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -292,11 +292,11 @@
#{item}
</foreach>
and loc_sts = 'O'
- order by row1,bay1,lev1
+ order by bay1,lev1,row1
</select>
<select id="findInEmptyLocMast" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast
+ select * from asr_loc_mast
where loc_type2 = 1
and loc_type1 = #{locType1}
and row1 in
@@ -304,11 +304,12 @@
#{item}
</foreach>
and loc_sts = 'O'
- order by row1,bay1,lev1
+ and crn_no = #{crnNo}
+ order by bay1,lev1,row1
</select>
- <select id="findEmptyLocMastByLocNos" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast
+ <select id="findInEmptyLocMastNew" resultMap="BaseResultMap">
+ select * from asr_loc_mast
where loc_type2 = 1
and loc_type1 = #{locType1}
and loc_no in
@@ -316,15 +317,42 @@
#{item}
</foreach>
and loc_sts = 'O'
- order by row1,bay1,lev1
+ 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 top 1 * from asr_loc_mast
+ select * from asr_loc_mast
where loc_type2 = 3
- and loc_type1 = #{locType1}
+ <if test="locType1 != 1">
+ and loc_type1 = #{locType1}
+ </if>
and loc_sts = 'O'
- order by row1,bay1,lev1
+ 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">
@@ -338,4 +366,22 @@
#{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