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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 8c6800e..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>
@@ -48,7 +49,7 @@
<select id="selectPakIn" resultMap="BaseResultMap">
select top 1 * from dbo.wcs_task_wrk
- where status=1
+ where status=2
and crn_no=#{crnNo}
and wrk_no=#{workNo}
and start_point=#{startPoint}
@@ -133,4 +134,10 @@
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