From da898ad78c509134aa3b1324374e7ab1ae9e56fd Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 10:42:44 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
index 5db1164..e0581a3 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -21,17 +21,31 @@
</if>
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT * FROM (
+ SELECT
+ *
+ FROM
+ (
SELECT
- id,matnr,order_no, SUM(anfme) anfme ,wave_no, SUM(work_qty) work_qty, batch, task_detl_id
+ mws.id,
+ mws.matnr,
+ mws.order_no,
+ mws.order_id,
+ SUM( mws.anfme ) anfme,
+ mws.wave_no,
+ SUM( mws.work_qty ) work_qty,
+ mws.batch,
+ mws.task_detl_id,
+ mcs.site_no
FROM
- man_wave_seed
+ man_wave_seed mws LEFT JOIN man_cache_site mcs ON mws.order_id = mcs.order_id
WHERE
task_detl_id IN ( SELECT mtd.id FROM man_task mt INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
- <if test="taskNo != null and taskNo != ''">
- AND mt.task_no = #{taskNo}
- </if>
- ) GROUP BY order_no, matnr
+ <if test="taskNo != null and taskNo != ''">
+ AND mt.task_no = #{taskNo}
+ </if>
+ )
+ GROUP BY
+ order_no, matnr
) t
</select>
<select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
@@ -40,6 +54,10 @@
SELECT
mt.task_no,
mt.barcode,
+ mt.task_type,
+ mt.target_site,
+ mtt.title,
+ mt.update_time,
mtd.wave_no,
SUM( mtd.anfme ) anfme,
mt.id,
@@ -47,6 +65,7 @@
FROM
man_task mt
INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
+ INNER JOIN man_task_type mtt ON mt.task_type = mtt.id
GROUP BY
mt.task_no,
mtd.wave_no
--
Gitblit v1.9.1