From cd761b085ddff0d4f55a0d5b892b3120cf8fa9d2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 13 一月 2026 13:18:04 +0800
Subject: [PATCH] 修改了AGV请求接口的逻辑，Mas获取返回信息的订单编号
---
src/main/resources/mapper/LocMastMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 61d8a3a..d72d8d4 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -33,12 +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" />
-
+ <result column="pic" property="pic" />
</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='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 NEWID()
+ </select>
+
</mapper>
--
Gitblit v1.9.1