From b7b4510ab85d9c3a31645f56e3d799ad817d9762 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期二, 30 九月 2025 08:36:43 +0800
Subject: [PATCH] 订单不转历史

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d2852af..61a40ea 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="ste_no" property="steNo" />
+        <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,74 @@
         <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" />
     </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 = 17 and io_type != 11))  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=10
+        or (wrk_sts=18 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=18 and dateadd(mi,15,crn_end_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+        or (wrk_sts=18 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=17 and io_type = #{ioType}
+    </select>
+
+    <select id="selectPakoutOfStaNo" resultMap="BaseResultMap">
+        select top 1 * from (
+            select top 1 * from asr_wrk_mast where 1=1
+            and crn_no = 2
+            and wrk_sts in (12,13,14,15,16)
+            and source_sta_no = #{staNo}
+            and io_type in (101.103,104,107,110)
+            union
+            select top 1 * from asr_wrk_mast where 1=1
+            and wrk_sts in (17,18)
+            and io_type in (101.103,104,107,110)
+            and wrk_no in (
+                select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
+            )
+        ) a
+
+    </select>
+
+    <select id="selectSameWrkMast" resultMap="BaseResultMap">
+        select wm.* from asr_wrk_mast wm
+        left join asr_loc_mast lm
+        on lm.loc_no = wm.loc_no
+        left join asr_wrk_detl wd
+        on wd.wrk_no = wm.wrk_no
+        where io_type=1
+        and wrk_sts &lt; 11
+        and lm.loc_sts = 'S'
+        and wd.matnr = #{matnr}
+        ORDER BY wm.wrk_no desc
     </select>
 
 </mapper>

--
Gitblit v1.9.1