From e0ce49ec06c62ff404e97c79669feb24d7a1fa49 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 05 九月 2025 14:27:43 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/TaskWrkMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 6055c3a..6f780b4 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -25,6 +25,8 @@
<result column="command_step" property="commandStep" />
<result column="transfer_mark" property="transferMark" />
<result column="mark_start" property="markStart"/>
+ <result column="origin_start_point" property="originStartPoint"/>
+ <result column="origin_target_point" property="originTargetPoint"/>
</resultMap>
@@ -50,10 +52,10 @@
<select id="selectPakIn" resultMap="BaseResultMap">
select top 1 * from dbo.wcs_task_wrk
where status=2
- and crn_no=#{crnNo}
and wrk_no=#{workNo}
and start_point=#{startPoint}
and io_type=1
+ and wrk_sts= 2
order by io_pri desc,create_time,wrk_no ASC
</select>
@@ -81,10 +83,8 @@
<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>
+ where
+ target_point=#{targetPoint}
and wrk_sts=11
and io_type = 2
order by io_pri desc,create_time,wrk_no ASC
@@ -119,7 +119,7 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from dbo.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))
+ and (wrk_sts=6 or wrk_sts=16 or status=4 or status=5)
order by io_pri desc,create_time,wrk_no ASC
</select>
--
Gitblit v1.9.1