From 828641ce9d4178bbff9030ad19ce93d0267f185c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 17 九月 2025 08:36:42 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 7010b60..876b512 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 != ''">
@@ -22,7 +22,7 @@
</select>
<select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
SELECT
- *
+ t.*
FROM
(
SELECT
@@ -30,23 +30,25 @@
mws.matnr,
mws.order_no,
mws.order_id,
+ mws.anfme AS rev_qty,
SUM( mws.anfme ) anfme,
mws.wave_no,
SUM( mws.work_qty ) work_qty,
mws.batch,
+ mws.site_no,
mws.task_detl_id
--- ,mcs.site_no
FROM
man_wave_seed mws
--- 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
+ INNER JOIN man_order_detl od ON mws.order_detl_id = od.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
) t
</select>
<select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
--
Gitblit v1.9.1