From 16b37165b10c0e47fd7ee0bb6cd7091775a35fbe Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 20 十月 2025 14:46:44 +0800
Subject: [PATCH] 修复堆垛机线程堆垛机号为空
---
src/main/resources/mapper/LocMastMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index c641927..26e5424 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.LocMastMapper">
+<mapper namespace="com.zy.mapper.LocMastMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
+ <resultMap id="BaseResultMap" type="com.zy.entity.LocMast">
<id column="loc_no" property="locNo" />
<result column="whs_type" property="whsType" />
<result column="plt_type" property="pltType" />
@@ -33,23 +33,30 @@
<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')
- order by loc_sts desc ,lev1 asc, bay1 asc, row1 asc
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo}
+ and loc_sts='D'
+ 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 loc_sts desc ,lev1 desc, bay1 desc, row1 desc
+ select top 1 * from asr_loc_mast where crn_no = #{crnNo} and loc_sts = 'O'
+ ORDER BY NEWID()
</select>
</mapper>
--
Gitblit v1.9.1