From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期四, 03 七月 2025 09:25:08 +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 |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 3a0916c..e0581a3 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -34,7 +34,7 @@
                 mws.wave_no,
                 SUM( mws.work_qty ) work_qty,
                 mws.batch,
-                mws.task_detl_id ,
+                mws.task_detl_id,
                 mcs.site_no
             FROM
                 man_wave_seed mws LEFT JOIN man_cache_site mcs ON mws.order_id = mcs.order_id
@@ -54,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,
@@ -61,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