From 572a655759f4f8fcfce2c89db491dd837327527a Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 03 十一月 2025 09:54:09 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 3b7c168..c77eaff 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -62,11 +62,16 @@
 <!--        <result column="Pdc_type" property="PdcType" />-->
         <result column="ctn_no" property="ctnNo" />
         <result column="full_plt" property="fullPlt" />
+        <result column="work_no_other" property="workNoOther" />
 
     </resultMap>
 
     <select id="selectByLocNo"  resultMap="BaseResultMap">
-        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and  (ctn_no is null or ctn_no != 'Y')
+        select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and  (ctn_no is null or ctn_no != 'Y') and  wrk_sts &lt; 14
+    </select>
+
+    <select id="selectByBarcodeTwo"  resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where barcode = #{barcode} and  wrk_sts = 2
     </select>
 
     <select id="selectByLocNo1"  resultMap="BaseResultMap">
@@ -87,7 +92,11 @@
     </select>
 
     <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 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) and (wrk_no not in (select wrk_no from asr_bas_devp)) 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">
@@ -106,6 +115,14 @@
         select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo}
     </select>
 
+    <select id="selectPakInStep4" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no=#{sheetNo}
+    </select>
+
+    <select id="selectPakInStep5" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo}
+    </select>
+
     <select id="selectPickStep" resultMap="BaseResultMap">
         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>
@@ -116,6 +133,14 @@
 
     <select id="selectPakOutStep2" resultMap="BaseResultMap">
         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>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
@@ -247,6 +272,37 @@
         and rgv_no is null
     </select>
 
+    <select id="selectWaitBindRgvNo2" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast
+        where 1=1
+        and wrk_sts in (2,14)
+        and (rgv_no IS NULL OR rgv_no = 0)
+    </select>
+
+    <select id="selectWaitBindRGVRgvNo" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast_rgv
+        where 1=1
+        and wrk_sts &lt; 110
+        and rgv_no = #{rgvNo}
+    </select>
+
+    <select id="selectWaitBindRgvNoOneWrkNo" resultMap="BaseResultMap">
+        select * from dbo.asr_wrk_mast_rgv
+        where 1=1
+        and wrk_no = #{wrkNo}
+    </select>
+
+    <insert id="insertRgvMast">
+        INSERT INTO dbo.asr_wrk_mast_rgv SELECT * FROM asr_wrk_mast WHERE wrk_no = #{wrkNo}
+    </insert>
+
+    <update id="updateRgvMast">
+        update asr_wrk_mast_rgv
+        set wrk_sts=100
+        where 1=1
+        and wrk_no = #{wrkNo}
+    </update>
+
     <select id="selectRgvInSteWrkNo" resultMap="BaseResultMap">
         select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts =12 and wrk_no=#{wrkNo} and rgv_no is null
     </select>
@@ -304,8 +360,20 @@
         SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =51 and source_sta_no = #{sourceStaNo}
     </select>
 
+    <select id="selectWrkMastUnstackingOne202Two" resultMap="BaseResultMap">
+        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =52 and source_sta_no = #{sourceStaNo}
+    </select>
+
+    <select id="selectWrkMastUnstackingOne145" resultMap="BaseResultMap">
+        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=1 and wrk_sts =2 and sheet_no='4' and source_sta_no = #{sourceStaNo}
+    </select>
+
     <select id="selectWrkMastLabelingOne54" resultMap="BaseResultMap">
         SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=202 and wrk_sts =54
     </select>
 
+    <select id="selectWrkMastUnstackingOne212" resultMap="BaseResultMap">
+        SELECT top 1 * FROM dbo.asr_wrk_mast Where 1=1 and io_type=212 and sta_no =212
+    </select>
+
 </mapper>

--
Gitblit v1.9.1