From 4282d15a5e69a6b4c822c87d27a1ed6e7e618f00 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 02 七月 2025 13:29:12 +0800
Subject: [PATCH] 初始化1.0
---
src/main/resources/mapper/TaskWrkMapper.xml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 39e8c53..6350877 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>
@@ -33,11 +34,26 @@
and task_no = #{taskNo}
</select>
+ <select id="selectByTargetPoint" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and io_type=2
+ and target_point = #{targetPoint}
+ </select>
+
+
<select id="selectByStartPoint" resultMap="BaseResultMap">
select top 1 * from wcs_task_wrk
where 1=1
- and io_type=3
+ and io_type=1
and start_point = #{startPoint}
+ </select>
+
+ <select id="selectByBarcode" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and io_type=3
+ and barcode = #{barcode}
</select>
<select id="selectByWrkNo" resultMap="BaseResultMap">
@@ -48,7 +64,7 @@
<select id="selectPakIn" resultMap="BaseResultMap">
select top 1 * from dbo.wcs_task_wrk
- where wrk_sts=2
+ where status=2
and crn_no=#{crnNo}
and wrk_no=#{workNo}
and start_point=#{startPoint}
@@ -73,7 +89,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>
@@ -106,7 +122,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 +134,12 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
where 1=1
- and ((wrk_sts=14 and status=5) or status=4 or (wrk_sts=4 and status=5))
+ 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=5 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">
@@ -133,4 +149,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