From 131fd52a71e4801957a80305afb2ea959ecc72fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 10:09:52 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkChargeMapper.xml |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/WrkChargeMapper.xml b/src/main/resources/mapper/WrkChargeMapper.xml
index 5ce83e6..b029dfc 100644
--- a/src/main/resources/mapper/WrkChargeMapper.xml
+++ b/src/main/resources/mapper/WrkChargeMapper.xml
@@ -27,20 +27,30 @@
         <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 &lt; 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>
         <if test="charge != null">
             and charge = #{charge}
         </if>
-        and wrk_sts &lt; 30
+        and wrk_sts &lt; 60
         and memo = 'charge'
         order by appe_time, io_pri desc
     </select>
@@ -57,4 +67,10 @@
         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