From 7b26abe9d5e833901783613bbb3cfa27fa75a346 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 20 十一月 2023 20:17:41 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/WrkMastMapper.xml |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index db134bf..7dbe608 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -12,7 +12,7 @@
         <result column="wrk_sts" property="wrkSts" />
         <result column="io_type" property="ioType" />
         <result column="crn_no" property="crnNo" />
-        <result column="ste_no" property="steNo" />
+        <result column="shuttle_no" property="shuttleNo" />
         <result column="out_most" property="outMost" />
         <result column="sheet_no" property="sheetNo" />
         <result column="io_pri" property="ioPri" />
@@ -63,18 +63,19 @@
         <result column="full_plt" property="fullPlt" />
         <result column="pre_have" property="preHave" />
         <result column="take_none" property="takeNone" />
+        <result column="lift_no" property="liftNo" />
     </resultMap>
 
     <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from asr_wrk_mast where ((wrk_sts = 14 Or wrk_sts = 34) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
+        select * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 29) and io_type != 103 and io_type != 104 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no
     </select>
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from asr_wrk_mast
-        where wrk_sts=15
-        or (wrk_sts=35 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=35 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=35 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+        where wrk_sts=10
+        or (wrk_sts=30 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=30 and dateadd(mi,10,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=30 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
         order by io_time,wrk_no asc
     </select>
 
@@ -97,7 +98,7 @@
     </select>
 
     <select id="selectOfPick" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=17 and io_type = #{ioType}
+        select top 1 * from asr_wrk_mast where wrk_no=#{wrkNo} and wrk_sts=29 and io_type = #{ioType}
     </select>
 
     <select id="selectSameMatnrs" resultMap="BaseResultMap">

--
Gitblit v1.9.1