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/WaveSeedMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 cb29a88..f699e75 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
@@ -1,5 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.wms.asrs.mapper.WaveSeedMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wms.asrs.mapper.WaveSeedMapper">
+
+<!-- waveLabels: {siteId: '绔欑偣鏍囪瘑', siteNo: '绔欑偣缂栧彿', orderNo: '璁㈠崟缂栧彿', matnr: '鍟嗗搧缂栧彿', workQty: '澶嶆牳鏁伴噺', anfme: '鏁伴噺' ,batch: '鎵瑰彿', createTime$: '娣诲姞鏃堕棿', createBy$: '娣诲姞浜哄憳', memo: '澶囨敞' },-->
+
+ <select id="getSeedsList" resultType="com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds">
+ SELECT
+ *
+ FROM
+ ( 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