From cf3735927bcf6797555d1b760fde6db085bc320d Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 21 五月 2024 17:26:09 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/TaskWrkMapper.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 5a199cd..c8304a1 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -33,6 +33,13 @@
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">
select top 1 * from wcs_task_wrk
where 1=1
@@ -49,6 +56,12 @@
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}
@@ -56,10 +69,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=12
+ 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 +92,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 +106,40 @@
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 io_type != 2
+ 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=15 and status=5) or status=4 or (wrk_sts=5 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)
</insert>
+ <select id="selectWorkingTask" resultMap="BaseResultMap">
+ select * from dbo.wcs_task_wrk
+ where (wrk_sts=5 and io_type = 1)
+ or (wrk_sts=15 and io_type = 2)
+ or (wrk_sts = 5 and io_type = 3)
+ order by io_pri desc,create_time,wrk_no ASC
+ </select>
+ <select id="selectbyWrksts4" resultMap="BaseResultMap">
+ select * from dbo.wcs_task_wrk
+ where (wrk_sts=4 and io_type = 1)
+ or (wrk_sts=14 and io_type = 2)
+ or (wrk_sts = 4 and io_type = 3)
+ order by io_pri desc,create_time,wrk_no ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.1