From 3f68c7a7f117eda92eed81c8951317429e6a9a0c Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 02 二月 2024 12:01:48 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/TaskWrkMapper.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 103e228..8c6800e 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -48,7 +48,7 @@
<select id="selectPakIn" resultMap="BaseResultMap">
select top 1 * from dbo.wcs_task_wrk
- where wrk_sts=2
+ where status=1
and crn_no=#{crnNo}
and wrk_no=#{workNo}
and start_point=#{startPoint}
@@ -73,7 +73,7 @@
select * from dbo.wcs_task_wrk
where crn_no=#{crnNo}
and target_point=#{targetPoint}
- and wrk_sts=12
+ and wrk_sts=13
and io_type = 2
order by io_pri desc,create_time,wrk_no ASC
</select>
@@ -92,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">
@@ -106,7 +106,7 @@
order by io_pri desc,create_time,wrk_no ASC
</select>
- <select id="selectCrnNoWorking" resultMap="BaseResultMap">
+ <select id="selectCrnNoInWorking" resultMap="BaseResultMap">
select top 1 * from dbo.wcs_task_wrk
where 1=1
and (wrk_sts=3 or wrk_sts=12)
@@ -118,12 +118,19 @@
<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>
+
</mapper>
--
Gitblit v1.9.1