From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
index 2be8943..86491f8 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -77,7 +77,7 @@
o.customer_id,
o.customer_name,
sum(od.quantity) as quantity,
- sum(od.area) as area,
+ sum(od.compute_gross_area) as area,
od.shape,
od.width,
od.height,
@@ -268,6 +268,27 @@
and d.customer_id = #{orderDetail.order.customerId}
and om.money is not null
group by d.delivery_id, o.order_id, om.`column`
+
+ UNION ALL
+
+ select d.delivery_id,
+ d.order_id,
+ d.customer_name,
+ d.project,
+ '杩愯垂' as product_name,
+ d.freight_quantity as quantity,
+ 0 as area,
+ d.freight_price as price,
+ d.freight as money,
+ date(d.create_time) as create_time
+
+ from sd.delivery d
+
+ where date(d.create_time) >= #{startDate}
+ and date(d.create_time) <= #{endDate}
+ and d.customer_id = #{orderDetail.order.customerId}
+ and d.freight >0
+ group by d.delivery_id
</select>
<select id="exportSelectCustomerOderDate" >
@@ -276,7 +297,7 @@
od.product_name,
o.customer_name,
sum(od.quantity) as quantity,
- sum(od.area) as area,
+ sum(od.compute_gross_area) as area,
od.price,
sum(od.gross_amount) as money,
date(o.create_time) as create_time
--
Gitblit v1.8.0