From f291be24a072b4c8993106247e3142b0dcc5f480 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 07 十月 2023 18:02:32 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkChargeMapper.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/WrkChargeMapper.xml b/src/main/resources/mapper/WrkChargeMapper.xml
index def654e..b029dfc 100644
--- a/src/main/resources/mapper/WrkChargeMapper.xml
+++ b/src/main/resources/mapper/WrkChargeMapper.xml
@@ -10,6 +10,7 @@
<result column="io_type" property="ioType" />
<result column="crn_no" property="crnNo" />
<result column="ste_no" property="steNo" />
+ <result column="charge" property="charge" />
<result column="out_most" property="outMost" />
<result column="io_pri" property="ioPri" />
<result column="loc_no" property="locNo" />
@@ -26,18 +27,32 @@
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
<result column="barcode" property="barcode" />
+ <result column="shuttle_no" property="shuttleNo" />
</resultMap>
+
+ <select id="selectWorking" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_wrk_charge
+ where 1=1
+ <if test="shuttleNo != null">
+ and shuttle_no = #{shuttleNo}
+ </if>
+ and wrk_sts < 60
+ and memo = 'charge'
+ order by appe_time, io_pri desc
+ </select>
<select id="selectWorkingOfCharge" resultMap="BaseResultMap">
select top 1 *
from asr_wrk_charge
where 1=1
- <if test="steNo != null">
- and ste_no = #{steNo}
+ <if test="charge != null">
+ and charge = #{charge}
</if>
- and wrk_sts < 30
+ and wrk_sts < 60
and memo = 'charge'
+ order by appe_time, io_pri desc
</select>
<select id="selectWorkingOfReset" resultMap="BaseResultMap">
@@ -49,6 +64,13 @@
</if>
and wrk_sts < 47
and memo = 'reset'
+ order by appe_time, io_pri desc
+ </select>
+
+ <select id="selectByWorkNo" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_charge
+ where wrk_no=#{workNo}
+ order by appe_time, io_pri desc
</select>
</mapper>
--
Gitblit v1.9.1