From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d2852af..406c6cc 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -12,6 +12,8 @@
         <result column="wrk_sts" property="wrkSts" />
         <result column="io_type" property="ioType" />
         <result column="crn_no" property="crnNo" />
+        <result column="shuttle_no" property="shuttleNo" />
+        <result column="out_most" property="outMost" />
         <result column="sheet_no" property="sheetNo" />
         <result column="io_pri" property="ioPri" />
         <result column="wrk_date" property="wrkDate" />
@@ -59,11 +61,53 @@
         <result column="Pdc_type" property="PdcType" />
         <result column="ctn_no" property="ctnNo" />
         <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 = 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 * from asr_wrk_mast where ((wrk_sts = 9 Or wrk_sts = 29) and io_type != 103 and io_type != 104) 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=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>
+
+    <select id="selectByLocNoOfPakin" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_wrk_mast
+        where 1=1
+        and io_type &lt; 100 and io_type != 11
+        and loc_no = #{locNo}
+        and wrk_sts &lt; 9
+    </select>
+
+    <select id="selectBySourceLocNoOfPakout" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_wrk_mast
+        where 1=1
+        and io_type > 100
+        and source_loc_no = #{sourceLocNo}
+        and wrk_sts &lt; 17
+    </select>
+
+    <select id="selectOfPick" resultMap="BaseResultMap">
+        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">
+        select loc_no from asr_wrk_mast m,asr_wrk_detl d
+        where m.wrk_no=d.wrk_no and io_type=1 and wrk_sts &lt; 11 and d.matnr = #{matnr} ORDER BY m.wrk_no desc
+    </select>
+
+    <select id="selectSameLevMatnrs" resultMap="BaseResultMap">
+        select m.loc_no from asr_wrk_mast m,asr_wrk_detl d,asr_loc_mast lm
+        where m.wrk_no=d.wrk_no and m.loc_no = lm.loc_no and io_type=1 and wrk_sts &lt; 11 and d.matnr = #{matnr} and lm.lev1 = #{lev} ORDER BY m.wrk_no desc
+    </select>
 </mapper>

--
Gitblit v1.9.1