From 12f2fd73462da331478fabc7eaa79fc35b1a59b3 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 七月 2024 16:41:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 780c2ff..e57aab1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -520,6 +520,8 @@
     <select id="getSelectDeliveryDetailReport" resultMap="selectDeliveryDetail">
         select dd.delivery_id,
         dd.delivery_number,
+        od.product_id,
+        od.product_name,
         d.payment_terms,
         d.project,
         d.customer_id,
@@ -541,6 +543,7 @@
         dd.create_time
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
+        left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
         <where>
                and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -617,6 +620,7 @@
         count(dd.id) as 'total'
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
+        left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
         <where>
             and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -964,10 +968,13 @@
         select dd.id,
             dd.delivery_id,
         dd.delivery_number,
+        od.product_id,
+        od.product_name,
         d.payment_terms,
         d.project,
         d.customer_id,
         d.customer_name,
+        c.customer_abbreviation,
         d.delivery_date,
         d.pay_method,
         d.pay_date,
@@ -985,6 +992,8 @@
         dd.create_time
         from sd.delivery_detail dd
         left join sd.delivery d on dd.delivery_id=d.delivery_id
+        left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
+        left join sd.customer c on d.customer_id=c.id
         where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
     </select>
 
@@ -998,6 +1007,7 @@
                d.project,
                d.customer_id,
                d.customer_name,
+               c.customer_abbreviation,
                d.delivery_date,
                d.pay_method,
                d.pay_date,
@@ -1015,6 +1025,9 @@
                dd.create_time
         from sd.delivery_detail dd left join delivery d on dd.delivery_id=d.delivery_id
                                    left join order_detail od on dd.order_id=od.order_id and dd.order_number=od.order_number
+                                   left join sd.customer c on d.customer_id=c.id
         where  date(d.create_time)>=#{dates[0]} and date(d.create_time) &lt;= #{dates[1]}
+        group by dd.delivery_id,od.product_id
+        order by dd.delivery_id,dd.delivery_number
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0