From 4282d15a5e69a6b4c822c87d27a1ed6e7e618f00 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 02 七月 2025 13:29:12 +0800
Subject: [PATCH] 初始化1.0
---
src/main/resources/mapper/WrkMastMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index d9d5431..d572645 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,14 +56,19 @@
<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="Pdc_type" property="PdcType" />-->
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
+ <result column="wms_wrk_no" property="wmsWrkNo" />
</resultMap>
<select id="selectByLocNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo}
+ select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
+ </select>
+
+ <select id="selectByLocNo1" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
</select>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -108,7 +113,7 @@
</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 top 1 * from dbo.asr_wrk_mast where io_type=3 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
<select id="selectLocMoving" resultMap="BaseResultMap">
@@ -119,12 +124,48 @@
select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
- <!-- 鍏ュ簱浠诲姟 -->
- <select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no
+<!-- <!– 鍏ュ簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
+<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+<!-- </select>-->
+
+<!-- <!– 鍑哄簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from dbo.asr_wrk_mast-->
+<!-- where (wrk_sts in (11,12)-->
+<!-- or (wrk_sts in (14,15) and wrk_no in-->
+<!-- (-->
+<!-- select wrk_no-->
+<!-- from asr_bas_devp-->
+<!-- where wrk_no > 0)-->
+<!-- ))-->
+<!-- and io_type != 11-->
+<!-- and source_sta_no = 180-->
+<!-- order by io_time,wrk_no-->
+<!-- </select>-->
+
+ <select id="selectCrnWorking" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
- <!-- 鍑哄簱浠诲姟 -->
+ <select id="selectDevWorking" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts=2 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectPick" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
+ </select>
+
+ <select id="selectPakOutStep11" resultMap="BaseResultMap">
+ select * 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="selectWorkingPakin" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ </select>
+
<select id="selectWorkingPakout" resultMap="BaseResultMap">
select top 1 *
from dbo.asr_wrk_mast
@@ -136,9 +177,7 @@
where wrk_no > 0)
))
and io_type != 11
- and source_sta_no = 180
+ and sta_no = #{staNo}
order by io_time,wrk_no
</select>
-
-
</mapper>
--
Gitblit v1.9.1