From 3f02e208daff9a760d3a0ea5680a0138e0a23e03 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 03 十二月 2022 14:32:26 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkMastMapper.xml | 130 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 125 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ec3741c..7356f6d 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -12,6 +12,7 @@
<result column="wrk_sts" property="wrkSts" />
<result column="io_type" property="ioType" />
<result column="crn_no" property="crnNo" />
+ <result column="rgv_no" property="rgvNo" />
<result column="sheet_no" property="sheetNo" />
<result column="io_pri" property="ioPri" />
<result column="wrk_date" property="wrkDate" />
@@ -19,6 +20,8 @@
<result column="sta_no" property="staNo" />
<result column="source_sta_no" property="sourceStaNo" />
<result column="source_loc_no" property="sourceLocNo" />
+ <result column="rgv_ssta_no" property="rgvSstaNo" />
+ <result column="rgv_dsta_no" property="rgvDstaNo" />
<result column="loc_sts" property="locSts" />
<result column="picking" property="picking" />
<result column="link_mis" property="linkMis" />
@@ -56,14 +59,18 @@
<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" />
</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">
@@ -88,7 +95,7 @@
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
@@ -96,11 +103,11 @@
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where wrk_no=#{workNo} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
+ select top 1 * from asr_wrk_mast where barcode=#{barcode} and wrk_sts=14 and (io_type=103 or io_type=107 or io_type=104)
</select>
<select id="selectPakOutStep1" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * 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="selectPakOutStep2" resultMap="BaseResultMap">
@@ -111,4 +118,117 @@
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>
+ <select id="selectLocMoving" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectWorking" resultMap="BaseResultMap">
+ 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>-->
+
+<!-- <!– 鍑哄簱浠诲姟 –>-->
+<!-- <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
+ 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 = #{sourceStaNo}
+ order by io_time,wrk_no
+ </select>
+ <select id="selectPakoutEmpty" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
+ </select>
+ <select id="selectExistInEmpty" resultType="java.lang.Integer">
+ SELECT COUNT(*) FROM dbo.asr_wrk_mast Where io_type = 10 and wrk_sts in (1,2,3)
+ </select>
+
+ <!-- RGV璋冨害鍏ュ嚭搴撶浉鍏� -->
+ <select id="selectRgvInStep1" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast
+ where rgv_no=#{rgvNo} and rgv_ssta_no in
+ <foreach item="item" collection="staNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and wrk_sts=2 and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57)
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <select id="selectRgvInStep2" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvInDStn} and wrk_sts=7 and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time desc,wrk_no ASC
+ </select>
+
+ <select id="selectRgvInWorking" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (6,7) and rgv_no=#{rgvNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectRgvOutStep2" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvOutDStn} and wrk_sts=17 and io_type > 100 order by io_pri desc,io_time desc,wrk_no ASC
+ </select>
+
+ <select id="selectRgvDestStep2" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where rgv_dsta_no=#{rgvDestStn} and wrk_sts in (7,17) order by io_pri desc,io_time desc,wrk_no ASC
+ </select>
+
+ <select id="selectRgvOutStep1" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast
+ where rgv_no=#{rgvNo} and rgv_ssta_no in
+ <foreach item="item" collection="staNos" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and wrk_sts=14 and io_type>100 and online_yn='N'
+ order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <select id="selectRgvOutWorking" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (16,17) and rgv_no=#{rgvNo} order by io_time,wrk_no
+ </select>
+ <!-- RGV璋冨害鍏ュ嚭搴撶浉鍏� -->
+
</mapper>
--
Gitblit v1.9.1