From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +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 |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 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 627837a..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,
@@ -91,7 +91,7 @@
         left join `order` o on o.order_id = od.order_id
         <where>
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
-                                   and o.customer_id = #{orderDetail.order.customerId}
+                                   and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
         </where>
         group by od.order_id,od.product_id
         limit #{offset},#{pageSize};
@@ -105,7 +105,7 @@
         left join `order` o on o.order_id = od.order_id
         <where>
             and date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
-                and o.customer_id = #{orderDetail.order.customerId}
+                and o.customer_id = #{orderDetail.order.customerId} and o.create_order>0
         </where>
         group by od.order_id,od.product_id) as zu
     </select>
@@ -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) &lt;= #{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
@@ -285,6 +306,7 @@
         where date(o.create_time) >= #{startDate}
           and date(o.create_time) &lt;= #{endDate}
           and o.customer_id = #{orderDetail.order.customerId}
+          and o.create_order>0
         group by od.order_id,od.product_id
 
         UNION ALL

--
Gitblit v1.8.0