From 1465b8bcfb5c901118cfcf0caa646e688036bde8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 十一月 2025 15:50:26 +0800
Subject: [PATCH] 侧面出库下发码盘层数
---
src/main/resources/mapper/TaskWrkMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 6055c3a..6106ba4 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -25,7 +25,10 @@
<result column="command_step" property="commandStep" />
<result column="transfer_mark" property="transferMark" />
<result column="mark_start" property="markStart"/>
-
+ <result column="mp" property="mp"/>
+ <result column="lx" property="lx"/>
+ <result column="lev" property="lev"/>
+ <result column="mp_completed_report" property="mpCompletedReport"/>
</resultMap>
<select id="selectByTaskNo" resultMap="BaseResultMap">
@@ -37,8 +40,21 @@
<select id="selectByStartPoint" resultMap="BaseResultMap">
select top 1 * from wcs_task_wrk
where 1=1
- and io_type=3
and start_point = #{startPoint}
+ </select>
+
+ <select id="selectByTargetPoint" resultMap="BaseResultMap">
+ select top 1 * from wcs_task_wrk
+ where 1=1
+ and target_point = #{targetPoint}
+ </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">
@@ -119,7 +135,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=14 and status=5 and dateadd(ss,10,complete_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)) or status=7 or status=4 or (wrk_sts=4 and status=5))
order by io_pri desc,create_time,wrk_no ASC
</select>
--
Gitblit v1.9.1