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 | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 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 867bd6f..e0581a3 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -8,9 +8,69 @@
on mt.id = mtd.task_id
where task_sts not in (199,200)
and wave_id in
- <foreach item="item" collection="waveIds" index="index" separator="," open="(" close=")">
+ <foreach item="item" collection="waveIds" index="index" separator="," open="(" close=")">
#{item}
</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
+ man_task_detl mtd ON mt.id = mtd.task_id
+ WHERE 1 = 1
+ <if test="taskNo != null and taskNo != ''">
+ AND mt.task_no = #{taskNo}
+ </if>
+ </select>
+ <select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ 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 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
+ ) t
+ </select>
+ <select id="getTaskIntegrateByTaskNo" resultType="com.zy.asrs.wms.asrs.entity.dto.LargeScreenTaskDto">
+ SELECT * FROM
+ (
+ 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,
+ mt.task_sts
+ 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
+ ) t
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.9.1