From f0d2defd354a3d6fbaf77338f0c42fe133f019fd Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 15 三月 2023 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbjfwcs' into nbjfwcs
---
src/main/resources/mapper/LocMastMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2454472..796ebd6 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,17 +33,24 @@
<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>
<select id="queryFreeLocMast" 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 top 1 *
+ from asr_loc_mast
+ where row1=#{row}
+ and loc_sts='O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ order by NEWID(),lev1 asc,bay1 asc
</select>
<select id="queryDemoSourceLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo} and (loc_sts='F' or loc_sts='D')
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+ and loc_sts='D'
ORDER BY NEWID()
</select>
@@ -52,4 +59,8 @@
ORDER BY NEWID()
</select>
+ <select id="queryDemoLoc0" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'and loc_type1 = #{locType1}
+ ORDER BY NEWID()
+ </select>
</mapper>
--
Gitblit v1.9.1