From 1eee1c2af23940a6c2af5b519b65bdd1e7b4ac49 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 02 九月 2025 14:17:29 +0800
Subject: [PATCH] 去除多于代码，取消许可证校验
---
src/main/resources/mapper/WrkMastMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e356371..0410542 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,7 +63,8 @@
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
<result column="work_no_other" property="workNoOther" />
-
+ <result column="rgv_create_time" property="rgvCreateTime" />
+ <result column="rgv_finish_time" property="rgvFinishTime" />
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
@@ -80,7 +81,7 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=5
+ where wrk_sts=4
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) <= 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))
@@ -89,6 +90,10 @@
<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="selectPakInStep111" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and barcode=#{barcode} and ((io_type = 202 and wrk_sts=51) or (io_type=1 and wrk_sts=2)) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
@@ -127,6 +132,10 @@
select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
+ <select id="selectPakOutStep2345" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ </select>
+
<select id="selectPakOutStep3" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and io_type=10
</select>
--
Gitblit v1.9.1