From 5fb7dae61f9d6c38c37014cf27f28107c6f52e74 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 十一月 2025 16:18:19 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastMapper.xml |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index f634991..0187fbe 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -25,6 +25,7 @@
         <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>
 
@@ -72,13 +73,6 @@
         order by io_pri desc,wrk_sts desc
     </select>
 
-    <select id="selectNoShuttleWrkByLev" resultMap="BaseResultMap">
-        select * from asr_wrk_mast
-        where shuttle_no is null
-        and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 101 and source_loc_no like #{lev}))
-        order by io_pri desc,wrk_sts desc
-    </select>
-
     <select id="selectShuttleWrkByLev" resultMap="BaseResultMap">
         select * from asr_wrk_mast
         where shuttle_no is not null
@@ -96,8 +90,6 @@
     <select id="selectLiftWrkMast" resultMap="BaseResultMap">
         select * from asr_wrk_mast
         where lift_no = #{liftNo}
-        and wrk_sts in (3,4,104,105,302,303,304,305,306,307,308,309)
-        limit 0,1
     </select>
 
     <select id="selectLocToLocWrkMast" resultMap="BaseResultMap">
@@ -170,7 +162,7 @@
 
     <select id="selectChargeWorkingByChargeSta" resultMap="BaseResultMap">
         select * from asr_wrk_mast
-        where wrk_sts in (201,202,203)
+        where wrk_sts in (201,202,203,204,205,210)
         and mk = #{chargeSta}
         order by io_pri desc,io_time,wrk_no asc
     </select>

--
Gitblit v1.9.1