From 3e4ca9accd2be4240308565bb21469f3abb86023 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 15:02:13 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/TaskWrkMapper.xml |   66 +++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index f798daa..c318b92 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -22,6 +22,8 @@
         <result column="cancel_time" property="cancelTime" />
         <result column="wrk_sts" property="wrkSts" />
         <result column="crn_no" property="crnNo" />
+        <result column="command_step" property="commandStep" />
+        <result column="transfer_mark" property="transferMark" />
 
     </resultMap>
     
@@ -29,6 +31,13 @@
         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 io_type=3
+        and start_point = #{startPoint}
     </select>
 
     <select id="selectByWrkNo" resultMap="BaseResultMap">
@@ -42,13 +51,35 @@
         where wrk_sts=2
         and crn_no=#{crnNo}
         and wrk_no=#{workNo}
-        and start_oint=#{startPoint}
+        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">
+        select * from dbo.wcs_task_wrk
+        where crn_no=#{crnNo}
+        and io_type = 3
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
+    <select id="selectCrnStaWorking" resultMap="BaseResultMap">
+        select * from dbo.wcs_task_wrk
+        where crn_no=#{crnNo}
+        and target_point=#{targetPoint}
+        and wrk_sts=12
+        and io_type = 2
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
     <select id="selectPakOut" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+        select * from dbo.wcs_task_wrk
         where crn_no=#{crnNo}
         and target_point=#{targetPoint}
         and wrk_sts=11
@@ -56,12 +87,41 @@
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
+    <select id="selectPakOut3" resultMap="BaseResultMap">
+        select * from dbo.wcs_task_wrk
+        where crn_no=#{crnNo}
+        and target_point=#{targetPoint}
+        and wrk_sts=11
+        and io_type = 3
+        order by io_pri desc,create_time,wrk_no ASC
+    </select>
+
     <select id="selectCrnWorking" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast
+        select top 1 * from dbo.wcs_task_wrk
         where 1=1
         and (wrk_sts=3 or wrk_sts=12)
         and crn_no=#{crnNo}
         order by io_pri desc,create_time,wrk_no ASC
     </select>
 
+    <select id="selectCrnNoWorking" 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)
+        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>
+
 </mapper>

--
Gitblit v1.9.1