From ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期六, 21 十二月 2024 14:58:43 +0800
Subject: [PATCH] 1.花材统计报表：增加父类名称
---
src/main/resources/mapper/payment/DeliveryOrderMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
index 2a91ac6..91e1e49 100644
--- a/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
+++ b/src/main/resources/mapper/payment/DeliveryOrderMapper.xml
@@ -6,7 +6,10 @@
SELECT q.*, o.warehouse_name, o.warehouse_location_code, o.payment_time
FROM t_delivery_order q
join t_order o on q.order_id = o.id
+ left join t_warehouse w on o.warehouse_id=w.id
+ left join t_warehouse_location wl on o.warehouse_location_id=wl.id
WHERE q.deleted = 0 and o.deleted = 0
+-- and w.deleted=0 and wl.deleted=0
and q.supplier_id = #{supplierId}
<if test="condition.orderNo != null and condition.orderNo != ''">
AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
@@ -29,7 +32,8 @@
<if test="condition.endDate != null">
AND o.payment_time < #{condition.endDate}
</if>
- ORDER BY o.payment_time
+-- ORDER BY o.payment_time
+ order by w.seq,wl.seq asc
</select>
<select id="selectDoStationList" resultType="com.mzl.flower.dto.response.payment.DeliveryOrderStationListDTO">
--
Gitblit v1.9.3