From 50add1caee430cc5e70e53cdae138abf30ae98a3 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 22 一月 2026 17:47:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yhfzwcs' into yhfzwcs
---
src/main/resources/mapper/WrkMastMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 0b5d5aa..33833c1 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -59,7 +59,7 @@
<!-- <result column="Pdc_type" property="PdcType" />-->
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
-
+ <result column="call_agv" property="callAgv" />
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
@@ -103,7 +103,7 @@
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
+ select top 1 * from asr_wrk_mast where barcode=#{barcode} and ((wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)) or (wrk_sts=2 and (io_type=53 or io_type=54 or io_type=57)))
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
@@ -111,7 +111,7 @@
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and (wrk_sts=12 or wrk_sts = 16) and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and (wrk_sts=12 or wrk_sts = 16) and io_type>100 order by io_pri desc,wrk_sts ASC,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
--
Gitblit v1.9.1