From 7400211f1ceecea0048ff3f5adfeeb8fe975bc7a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 三月 2025 11:01:53 +0800
Subject: [PATCH] #初始化地图

---
 src/main/resources/mapper/WrkMastMapper.xml |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 80f8e83..7921056 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -56,14 +56,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">
@@ -82,6 +86,9 @@
     <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="selectPakInStepBarcode" resultMap="BaseResultMap">
+        select top 1 * from dbo.asr_wrk_mast where  barcode = #{barcode}
+    </select>
 
     <select id="selectPakInStep11" resultMap="BaseResultMap">
         select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
@@ -96,7 +103,7 @@
     </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">
@@ -119,4 +126,70 @@
         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>
 
+<!--    &lt;!&ndash; 鍏ュ簱浠诲姟 &ndash;&gt;-->
+<!--    <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>-->
+
+<!--    &lt;!&ndash; 鍑哄簱浠诲姟 &ndash;&gt;-->
+<!--    <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="selectPickStep2" resultMap="BaseResultMap">
+        select top 1 * from asr_wrk_mast where barcode = #{barcode} and (wrk_sts=14 and io_type=107) or (wrk_sts=2 and io_type=57)
+    </select>
+    <select id="selectByWrkNo" resultMap="BaseResultMap">
+        select * from asr_wrk_mast
+        where wrk_no = #{wrkNo}
+    </select>
 </mapper>

--
Gitblit v1.9.1