From 23e81c5d24c37a87fbbbf67c68b17e8f78832148 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 18:56:42 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/TaskWrkMapper.xml |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index a8ad7dc..25c8895 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -25,6 +25,7 @@
         <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>
@@ -33,6 +34,12 @@
         select top 1 * from "SOURCE"."wcs_task_wrk"
         where 1=1
         and "TASK_NO" = #{taskNo}
+    </select>
+
+    <select id="selectByLaneNo" resultMap="BaseResultMap">
+        select * from "SOURCE"."wcs_task_wrk"
+        where 1=1
+          and "CRN_NO"=#{crnNo}
     </select>
 
     <select id="selectByStartPoint" resultMap="BaseResultMap">
@@ -51,10 +58,21 @@
     <select id="selectPakIn" resultMap="BaseResultMap">
         select top 1 * from "SOURCE"."wcs_task_wrk"
         where "STATUS"=1
+        and "WRK_STS"=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="selectPakInDemo" resultMap="BaseResultMap">
+        select top 1 * from "SOURCE"."wcs_task_wrk"
+        where "WRK_STS"=2
+          and "CRN_NO"=#{crnNo}
+          and "WRK_NO"=#{workNo}
+          and "ORIGIN_START_POINT"=#{startPoint}
+          and "IO_TYPE"=4
         order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
     </select>
 
@@ -80,6 +98,15 @@
         order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
     </select>
 
+    <select id="selectCrnStaWorkingDemo" resultMap="BaseResultMap">
+        select * from "SOURCE"."wcs_task_wrk"
+        where "CRN_NO"=#{crnNo}
+          and "ORIGIN_TARGET_POINT"=#{targetPoint}
+          and "WRK_STS"=13
+          and "IO_TYPE" = 4
+        order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
+    </select>
+
     <select id="selectPakOut" resultMap="BaseResultMap">
         select * from "SOURCE"."wcs_task_wrk"
         where "CRN_NO"=#{crnNo}
@@ -88,6 +115,17 @@
         </if>
         and "WRK_STS"=11
         and "IO_TYPE" = 2
+        order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
+    </select>
+
+    <select id="selectPakOutDemo" resultMap="BaseResultMap">
+        select * from "SOURCE"."wcs_task_wrk"
+        where "CRN_NO"=#{crnNo}
+        <if test="targetPoint!=null and targetPoint!='' ">
+            and "ORIGIN_TARGET_POINT"=#{targetPoint}
+        </if>
+        and "WRK_STS"=11
+        and "IO_TYPE" = 4
         order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
     </select>
 
@@ -129,7 +167,11 @@
         insert into "SOURCE"."wcs_task_wrk_log"
         select * from "SOURCE"."wcs_task_wrk"
         where "TASK_NO" = #{taskNo}
-          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6)
+          and ("STATUS"=5 or "STATUS"=4 or "STATUS"=7)
+    </insert>
+
+    <insert id="saveToHistoryD">
+        insert into "SOURCE"."wcs_task_wrk_log" select * from "SOURCE"."wcs_task_wrk" where TASK_NO = #{taskNo}
     </insert>
 
     <select id="selectWorkingTask" resultMap="BaseResultMap">
@@ -139,4 +181,36 @@
         order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
     </select>
 
+    <sql id="batchSeq">
+        <if test="wrkNo != null">
+            and WRK_NO = #{wrkNo}
+        </if>
+        <if test="taskNo != null">
+            and TASK_NO = #{taskNo}
+        </if>
+        <if test="status != null">
+            and STATUS = #{status}
+        </if>
+        <if test="modiTimeStart != null ">
+            <if test="modiTimeEnd != null ">
+                and MODI_TIME between #{modiTimeStart} and #{modiTimeEnd}
+            </if>
+        </if>
+    </sql>
+
+
+    <select id="selectTaskWrkList" resultMap="BaseResultMap">
+        SELECT * FROM "SOURCE"."wcs_task_wrk"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+        ORDER BY CREATE_TIME DESC
+        LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize});
+    </select>
+
+    <select id="selectTaskWrkListTotal" resultType="Long">
+        SELECT count(1) FROM "SOURCE"."wcs_task_wrk"
+        WHERE 1=1
+        <include refid="batchSeq"></include>
+    </select>
+
 </mapper>

--
Gitblit v1.9.1