From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/resources/mapper/LocMastMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index e464b67..d883d4b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -317,7 +317,7 @@
#{item}
</foreach>
and loc_sts = 'O'
- <if test="crnNo != null || crnNo != ''">
+ <if test="crnNo != null and crnNo != ''">
and crn_no = #{crnNo}
</if>
order by bay1,lev1,row1
@@ -326,7 +326,9 @@
<select id="findEmptyLowFrequencyLocMast" resultMap="BaseResultMap">
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'
and crn_no = #{crnNo}
order by bay1,lev1,row1
@@ -351,4 +353,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