From 1465b8bcfb5c901118cfcf0caa646e688036bde8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 十一月 2025 15:50:26 +0800
Subject: [PATCH] 侧面出库下发码盘层数

---
 src/main/resources/mapper/TaskWrkMapper.xml |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 5a199cd..6106ba4 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -24,13 +24,37 @@
         <result column="crn_no" property="crnNo" />
         <result column="command_step" property="commandStep" />
         <result column="transfer_mark" property="transferMark" />
-
+        <result column="mark_start" property="markStart"/>
+        <result column="mp" property="mp"/>
+        <result column="lx" property="lx"/>
+        <result column="lev" property="lev"/>
+        <result column="mp_completed_report" property="mpCompletedReport"/>
     </resultMap>
     
     <select id="selectByTaskNo" resultMap="BaseResultMap">
         select top 1 * from wcs_task_wrk
         where 1=1
         and task_no = #{taskNo}
+    </select>
+
+    <select id="selectByStartPoint" resultMap="BaseResultMap">
+        select top 1 * from wcs_task_wrk
+        where 1=1
+        and start_point = #{startPoint}
+    </select>
+
+    <select id="selectByTargetPoint" resultMap="BaseResultMap">
+        select top 1 * from wcs_task_wrk
+        where 1=1
+        and target_point = #{targetPoint}
+    </select>
+
+
+    <select id="selectByBarcode" resultMap="BaseResultMap">
+        select top 1 * from wcs_task_wrk
+        where 1=1
+          and io_type=3
+          and barcode = #{barcode}
     </select>
 
     <select id="selectByWrkNo" resultMap="BaseResultMap">
@@ -41,12 +65,18 @@
 
     <select id="selectPakIn" resultMap="BaseResultMap">
         select top 1 * from dbo.wcs_task_wrk
-        where wrk_sts=2
+        where status=2
         and crn_no=#{crnNo}
         and wrk_no=#{workNo}
         and start_point=#{startPoint}
         and io_type=1
         order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
+    <select id="selectReceive" resultMap="BaseResultMap">
+        select * from wcs_task_wrk
+        where 1=1
+        and status = 1
     </select>
 
     <select id="selectPakOutIoType" resultMap="BaseResultMap">
@@ -56,10 +86,21 @@
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
-    <select id="selectPakOut" resultMap="BaseResultMap">
+    <select id="selectCrnStaWorking" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
         where crn_no=#{crnNo}
         and target_point=#{targetPoint}
+        and wrk_sts=13
+        and io_type = 2
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
+    <select id="selectPakOut" resultMap="BaseResultMap">
+        select * from dbo.wcs_task_wrk
+        where crn_no=#{crnNo}
+        <if test="targetPoint!=null and targetPoint!='' ">
+            and target_point=#{targetPoint}
+        </if>
         and wrk_sts=11
         and io_type = 2
         order by io_pri desc,create_time,wrk_no ASC
@@ -68,10 +109,10 @@
     <select id="selectPakOut3" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
         where crn_no=#{crnNo}
-        and target_point=#{targetPoint}
+--         and target_point=#{targetPoint}
         and wrk_sts=11
         and io_type = 3
-        order by io_pri desc,create_time,wrk_no ASC
+        order by io_pri desc,create_time ASC
     </select>
 
     <select id="selectCrnWorking" resultMap="BaseResultMap">
@@ -82,15 +123,31 @@
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
+    <select id="selectCrnNoInWorking" resultMap="BaseResultMap">
+        select top 1 * from dbo.wcs_task_wrk
+        where 1=1
+        and (wrk_sts=3 or wrk_sts=12)
+        and crn_no=#{crnNo}
+        and wrk_no=#{workNo}
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
     <select id="selectToBeHistoryData" resultMap="BaseResultMap">
         select * from dbo.wcs_task_wrk
         where 1=1
-        and (status=3 or status=4)
+        and ((wrk_sts=14 and status=5 and dateadd(ss,10,complete_time) &lt;= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or status=7 or status=4 or (wrk_sts=4 and status=5))
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
     <insert id="saveToHistory">
-        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=3 or status=4)
+        insert into wcs_task_wrk_log select * from wcs_task_wrk where task_no = #{taskNo} and (status=5 or status=4 or status=6)
     </insert>
 
+    <select id="selectWorkingTask" resultMap="BaseResultMap">
+        select * from dbo.wcs_task_wrk
+        where (wrk_sts=3 and io_type = 1)
+        or (wrk_sts=12 and io_type = 2)
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
 </mapper>

--
Gitblit v1.9.1