From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 75874ef..f834c18 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -9,7 +9,6 @@
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
<result column="io_pri" property="ioPri" />
- <result column="wrk_date" property="wrkDate" />
<result column="loc_no" property="locNo" />
<result column="sta_no" property="staNo" />
<result column="source_sta_no" property="sourceStaNo" />
@@ -25,6 +24,8 @@
<result column="barcode" property="barcode" />
<result column="shuttle_no" property="shuttleNo" />
<result column="lift_no" property="liftNo" />
+ <result column="wms_wrk_no" property="wmsWrkNo" />
+ <result column="system_msg" property="systemMsg" />
</resultMap>
@@ -46,7 +47,7 @@
</select>
<select id="selectByWorkNo" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast
+ select * from asr_wrk_mast
where wrk_no=#{workNo}
limit 0,1
</select>
@@ -139,7 +140,7 @@
where 1=1
and shuttle_no = #{shuttleNo}
and wrk_sts not in (9,10,109,110,210)
- and io_type not in (200)
+ and io_type not in (200,300)
order by io_pri desc,io_time,wrk_no asc
limit 0,1
</select>
@@ -163,9 +164,16 @@
<select id="selectChargeWorking" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts in (201,202,203)
+ where io_type in (300)
and shuttle_no = #{shuttleNo}
- order by priority desc,start_time,wrk_no asc
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <select id="selectChargeWorkingByChargeSta" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_sts in (201,202,203,204,205,210)
+ and mk = #{chargeSta}
+ order by io_pri desc,io_time,wrk_no asc
</select>
</mapper>
--
Gitblit v1.9.1