From 66942458f7753fe4ddee7c5ed3386d61cff28b24 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 01 四月 2025 13:55:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/resources/mapper/TaskWrkMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 5a199cd..81b71b7 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -24,6 +24,7 @@
<result column="crn_no" property="crnNo" />
<result column="command_step" property="commandStep" />
<result column="transfer_mark" property="transferMark" />
+ <result column="mark_start" property="markStart"/>
</resultMap>
@@ -31,6 +32,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">
@@ -41,12 +49,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 +70,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 +93,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 +107,37 @@
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) 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>
+
+ <select id="selectStaWorking" resultMap="BaseResultMap">
+ select top 1 * from dbo.wcs_task_wrk_log
+ where wrk_no = #{workNo}
+ order by create_time DESC
+ </select>
+
</mapper>
--
Gitblit v1.9.1