From 9ccc8bd3a53160a40cf60f14e5867f6ce9f6c58f Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 16:49:15 +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 | 71 ++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 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 a9fc432..f94fa7d 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -41,7 +41,7 @@
<select id="getSelectCustomerDeliveryDate" >
- select d.delivery_id,d.order_id,d.customer_id,d.customer_name,
+ select d.delivery_id,dd.order_id,d.customer_id,d.customer_name,
d.project,od.product_name,sum(dd.quantity) as quantity,sum(dd.area) as area,dd.price,sum(dd.money) as money,
date(d.create_time) as create_time
@@ -51,7 +51,7 @@
where date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
and d.customer_id = #{orderDetail.order.customerId}
- group by od.product_id
+ group by dd.delivery_id,od.order_id,od.product_id
limit #{offset},#{pageSize};
</select>
@@ -65,7 +65,7 @@
where
date(d.create_time)>=#{startDate} and date(d.create_time) <= #{endDate}
and d.customer_id = #{orderDetail.order.customerId}
- group by od.product_id, od.width, od.height) as zu
+ group by dd.delivery_id,od.order_id,od.product_id) as zu
</select>
<select id="getSelectCustomerOderDate" >
@@ -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,
@@ -91,9 +91,9 @@
left join `order` o on o.order_id = od.order_id
<where>
and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- and o.customer_id = #{orderDetail.order.customerId}
+ and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
</where>
- group by od.product_id
+ group by od.order_id,od.product_id
limit #{offset},#{pageSize};
</select>
@@ -105,9 +105,9 @@
left join `order` o on o.order_id = od.order_id
<where>
and date(o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
- and o.customer_id = #{orderDetail.order.customerId}
+ and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
</where>
- group by od.product_id, od.width, od.height) as zu
+ group by od.order_id,od.product_id) as zu
</select>
<select id="getCustomerList">
@@ -115,7 +115,9 @@
a.*,
b.project,
b.salesman_id,
- b.salesman
+ b.salesman,
+ b.contacts,
+ b.contact_number
from
sd.customer as a
left join (SELECT
@@ -128,6 +130,8 @@
o.project,
o.salesman_id,
o.salesman,
+ o.contacts,
+ o.contact_number,
o.customer_id
FROM
sd.ORDER AS o
@@ -137,6 +141,20 @@
on a.id = b.customer_id
</select>
+ <select id="getProjectList">
+ select * from(select project,salesman_id as salesmanId,salesman,contacts,contact_number as contactNumber,id from sd.`order`
+ where customer_id = #{id}
+ group by project
+ ) as a
+ order by id desc
+ </select>
+
+ <select id="countByCustomerName">
+ SELECT COUNT(*)
+ FROM sd.customer
+ WHERE customer_name=#{customer.customerName}
+ </select>
+
<select id="getSelectCustomer">
select
*
@@ -225,7 +243,7 @@
<select id="exportSelectCustomerDeliveryDate" >
select d.delivery_id,
- d.order_id,
+ dd.order_id,
d.customer_name,
d.project,
od.product_name,
@@ -242,7 +260,7 @@
where date(d.create_time) >= #{startDate}
and date(d.create_time) <= #{endDate}
and d.customer_id = #{orderDetail.order.customerId}
- group by od.product_id
+ group by dd.delivery_id,od.order_id,od.product_id
UNION ALL
@@ -265,9 +283,31 @@
where date(d.create_time) >= #{startDate}
and date(d.create_time) <= #{endDate}
- and d.customer_id = 1855
+ and d.customer_id = #{orderDetail.order.customerId}
and om.money is not null
+ and om.money >0
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 +316,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
@@ -285,7 +325,8 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
- group by od.product_id
+ and o.order_review>0
+ group by od.order_id,od.product_id
UNION ALL
@@ -304,7 +345,9 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
+ and o.order_review>0
and om.money is not null
+ and om.money >0
group by o.order_id, om.`column`
</select>
--
Gitblit v1.8.0