From 4213916be23f39d1c7b1e3a2405fc5ccb54375b8 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 12:38:21 +0800
Subject: [PATCH] 完善堆垛机连续出库
---
src/main/resources/mapper/LocMastMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2454472..d962abc 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,23 +33,36 @@
<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="queryDemoSourceLoc0" resultMap="BaseResultMap">
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+ and loc_sts='D' and row1 in (1,2,4,5,8,9)
+ ORDER BY NEWID()
</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' and row1 in (1,2,3,6,7,10)
ORDER BY NEWID()
</select>
<select id="queryDemoLoc" resultMap="BaseResultMap">
- select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
- ORDER BY NEWID()
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O' and row1 in(1,2,3,6,7,10)
+ ORDER BY modi_time,bay1 desc
</select>
</mapper>
--
Gitblit v1.9.1