From 654e9abc341299694c82a40b8a77416003ad85f5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 01 八月 2024 09:35:58 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
index d5bb659..26a2681 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -828,7 +828,7 @@
</if>
</where>
- group by dd.delivery_id,od.product_id
+ group by dd.delivery_id,dd.order_id,od.product_id
order by dd.delivery_id,dd.delivery_number
limit #{offset},#{pageSize};
</select>
@@ -924,7 +924,7 @@
</if>
</where>
- group by dd.delivery_id,od.product_id) as zu
+ group by dd.delivery_id,dd.order_id,od.product_id) as zu
</select>
<select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
@@ -1080,7 +1080,7 @@
left join sd.`order` o on dd.order_id=o.order_id
left join sd.customer c on d.customer_id=c.id
where date(d.create_time)>=#{dates[0]} and date(d.create_time) <= #{dates[1]}
- group by dd.delivery_id,od.product_id
+ group by dd.delivery_id,dd.order_id,od.product_id
order by dd.delivery_id,dd.delivery_number
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0