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/WaveSeedMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
index 13081b1..f699e75 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
@@ -8,7 +8,32 @@
SELECT
*
FROM
- ( SELECT site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo FROM man_wave_seed ) t
+ ( SELECT id, site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo, deleted FROM man_wave_seed ) t
${ew.customSqlSegment}
</select>
+ <select id="selectShippingOrderDtel" resultType="com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto">
+ SELECT
+ mo.order_no,
+ mo.id,
+ wcs.wave_no,
+ mo.anfme,
+ mo.batch,
+ wcs.matnr,
+ wcs.site_no,
+ wcs.work_qty,
+ wcs.memo
+ FROM
+ man_order_detl mo
+ LEFT JOIN
+ (SELECT wave_no, order_detl_id , site_no, order_no, SUM(anfme) anfme, SUM(work_qty) work_qty, memo, batch, matnr
+ FROM man_wave_seed GROUP BY order_id, matnr, batch) wcs
+ ON mo.id = wcs.order_detl_id
+ <where>
+ 1 = 1
+ <if test="orderNo != null and orderNo != ''">
+ AND mo.order_no = #{orderNo}
+ </if>
+ </where>
+
+ </select>
</mapper>
--
Gitblit v1.9.1