From 971dc3eb422fb38ffe8205ed60283c85036fde36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:10:58 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期

---
 src/main/resources/mapper/WrkMastMapper.xml |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7a419f1..c71dc34 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,7 @@
     </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,error_time,io_time,wrk_no
+        select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type != 103 and io_type != 104 and io_type != 105 and io_type != 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,error_time,io_time,wrk_no
     </select>
 
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
@@ -72,10 +72,30 @@
         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))
+        or wrk_sts=105
         order by io_time,wrk_no asc
     </select>
     <select id="checkFinishByOrder" resultType="java.lang.Integer">
         select Count(*) FROM asr_wrk_detl d left join asr_wrk_mast m on d.wrk_no = m.wrk_no WHERE d.order_no = #{orderNo} and m.wrk_sts &lt; 14
     </select>
+    <select id="selectTop100" resultType="com.zy.asrs.entity.result.InOutCountDto">
+        SELECT TOP 10 m.io_type as ioType,m.appe_time as appeTime, d.matnr, d.anfme FROM asr_wrk_detl_log d left join asr_wrk_mast_log m on d.wrk_no = m.wrk_no order by m.appe_time desc
+    </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
+        <if test="matnr != null and matnr != ''">
+            and d.matnr = #{matnr}
+        </if>
+        <if test="batch != null and batch != ''">
+            and d.batch = #{batch}
+        </if>
+        <if test="grade != null and grade != ''">
+            and d.brand = #{grade}
+        </if>
+        ORDER BY m.wrk_no desc
+    </select>
 
 </mapper>

--
Gitblit v1.9.1