From dcdfc93b50febf61301832d91dfcddcfa1ca5403 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 14:06:36 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/TaskWrkMapper.xml | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index a8ad7dc..9787512 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>
@@ -51,6 +52,7 @@
<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}
@@ -121,7 +123,7 @@
select * from "SOURCE"."wcs_task_wrk"
where 1=1
and (("WRK_STS"=14 and "STATUS"=5) or "STATUS"=7 or "STATUS"=4
- or ("WRK_STS"=4 and "STATUS"=5))
+ or ("WRK_STS"=4 and "STATUS"=5) or ("WRK_STS"=14 and "STATUS"=9))
order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
</select>
@@ -129,7 +131,12 @@
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"=6 or "STATUS"=7 or "STATUS"=9)
+ and ("WRK_NO" not in (select "WRK_NO" from "SOURCE"."asr_bas_devp"))
+ </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 +146,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