From a99ba6b06c16fa1da4f8eb6750c0847c65c27278 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 15:51:28 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 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..86a19a2 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -13,7 +13,7 @@
</foreach>
</select>
<select id="getTaskDetlByTaskNo" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
+ SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mt.origin_site AS site_n4o, mtd.stock, mtd.batch FROM man_task mt INNER JOIN
man_task_detl mtd ON mt.id = mtd.task_id
WHERE 1 = 1
<if test="taskNo != null and taskNo != ''">
@@ -21,17 +21,32 @@
</if>
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
- SELECT * FROM (
+ SELECT
+ t.*
+ 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.site_no,
+ mws.task_detl_id
FROM
- man_wave_seed
- WHERE
- task_detl_id IN ( SELECT mtd.id FROM man_task mt INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id
+ man_wave_seed mws
+ 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
+ )
+ GROUP BY
+ order_no,
+ matnr
) t
</select>
<select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
@@ -40,6 +55,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 +66,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