From 9e715c16b49a066e627d150fb2d973a8562db8dc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 09:26:38 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 00d7c39..dbe06de 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -5,127 +5,34 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
         <id column="wrk_no" property="wrkNo" />
-        <result column="inv_wh" property="invWh" />
-        <result column="ymd" property="ymd" />
         <result column="mk" property="mk" />
-        <result column="whs_type" property="whsType" />
         <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="sheet_no" property="sheetNo" />
         <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" />
         <result column="source_loc_no" property="sourceLocNo" />
-        <result column="loc_sts" property="locSts" />
-        <result column="picking" property="picking" />
-        <result column="link_mis" property="linkMis" />
-        <result column="online_yn" property="onlineYn" />
-        <result column="upd_mk" property="updMk" />
-        <result column="exit_mk" property="exitMk" />
-        <result column="plt_type" property="pltType" />
-        <result column="empty_mk" property="emptyMk" />
         <result column="io_time" property="ioTime" />
-        <result column="ctn_type" property="ctnType" />
-        <result column="packed" property="packed" />
-        <result column="ove_mk" property="oveMk" />
-        <result column="mtn_type" property="mtnType" />
-        <result column="user_no" property="userNo" />
-        <result column="crn_str_time" property="crnStrTime" />
-        <result column="crn_end_time" property="crnEndTime" />
-        <result column="plc_str_time" property="plcStrTime" />
-        <result column="crn_pos_time" property="crnPosTime" />
-        <result column="load_time" property="loadTime" />
-        <result column="exp_time" property="expTime" />
-        <result column="ref_wrkno" property="refWrkno" />
-        <result column="ref_iotime" property="refIotime" />
         <result column="modi_user" property="modiUser" />
         <result column="modi_time" property="modiTime" />
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
-        <result column="pause_mk" property="pauseMk" />
         <result column="error_time" property="errorTime" />
         <result column="error_memo" property="errorMemo" />
-        <result column="ctn_kind" property="ctnKind" />
-        <result column="manu_type" property="manuType" />
         <result column="memo" property="memo" />
-        <result column="sc_weight" property="scWeight" />
-        <result column="log_mk" property="logMk" />
-        <result column="log_err_time" property="logErrTime" />
-        <result column="log_err_memo" property="logErrMemo" />
         <result column="barcode" property="barcode" />
-        <result column="Pdc_type" property="PdcType" />
-        <result column="ctn_no" property="ctnNo" />
-        <result column="full_plt" property="fullPlt" />
+        <result column="crn_no" property="crnNo" />
+        <result column="rgv_no" property="rgvNo" />
+        <result column="wms_wrk_no" property="wmsWrkNo" />
+        <result column="system_msg" property="systemMsg" />
 
     </resultMap>
 
-    <select id="selectByLocNo"  resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
-    </select>
-
-    <select id="selectToBeCompleteData" resultMap="BaseResultMap">
-        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) 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 id="selectByWorkNo" resultMap="BaseResultMap">
         select * from asr_wrk_mast
-        where wrk_sts=5
-        or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
-        or (wrk_sts=15 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>
-
-    <select id="selectPakInStep1" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
-    </select>
-
-    <select id="selectPakInStep11" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
-    </select>
-
-    <select id="selectPakInStep23456" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4,5,6) and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
-    </select>
-
-    <select id="selectPakInStep45" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5)
-    </select>
-
-    <select id="selectPakInStep7" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts = 7
-    </select>
-
-    <select id="selectCarWaiting" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (2,8,11,14)
-    </select>
-
-    <select id="selectPickStep" resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
-    </select>
-
-    <select id="selectPakOutStep11" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
-    </select>
-
-    <select id="selectPakOutStep16" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=16 and io_type > 100 order by io_pri desc,io_time desc,wrk_no ASC
-    </select>
-
-    <select id="selectLocMove" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
-    </select>
-
-    <select id="selectLocMoving" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
-    </select>
-
-    <select id="selectWorking" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=7 or wrk_sts=16) and crn_no=#{crnNo} order by io_time,wrk_no
+        where wrk_no=#{workNo}
+        limit 0,1
     </select>
 
 </mapper>

--
Gitblit v1.9.1