From 0c60480362efdcffa0cbb3f6dd4272f43859adb1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 15:05:15 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/TaskWrkMapper.xml | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 103e228..81fae90 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -12,6 +12,9 @@
<result column="io_pri" property="ioPri" />
<result column="start_point" property="startPoint" />
<result column="target_point" property="targetPoint" />
+ <result column="origin_start_point" property="originStartPoint" />
+ <result column="origin_target_point" property="originTargetPoint" />
+ <result column="sc_weight" property="scWeight" />
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="memo" property="memo" />
@@ -22,7 +25,6 @@
<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>
@@ -48,7 +50,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 +75,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 +94,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 +108,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 +120,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