From 2a891d0391bc9f2dfaaaee8f63fcb20ff0932202 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 七月 2024 15:11:40 +0800
Subject: [PATCH] 修改订单报表

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 833d4d9..e57aab1 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -148,11 +148,11 @@
 
     <insert id="insertDeliveryDetail"  useGeneratedKeys="true" >
         insert into sd.delivery_detail (delivery_id,delivery_number,order_number,
-                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time)
+                                        area,order_id,quantity,money,delivery_detail_remakes,delivery_detail_state,other_columns,create_time,price)
         values (
                    #{number} ,#{deliveryNumber},#{orderDetail.orderNumber},#{orderDetail.computeArea}*#{orderDetail.deliveryDetail.quantity},
                 #{orderDetail.orderId},#{orderDetail.deliveryDetail.quantity},
-                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now()
+                #{deliveryDetailMoney},'',1,#{orderDetail.otherColumns},now(),#{orderDetail.price}
                )
     </insert>
 
@@ -170,7 +170,7 @@
                od.building_number,
                od.product_id,
                od.product_name,
-               od.price,
+               dd.price,
                fgi.storage_region,
                dd.money,
                od.width,
@@ -262,7 +262,7 @@
             </if>
 
         </where>
-        order by dd.id desc
+        order by dd.id
         limit #{offset},#{pageSize};
     </select>
 
@@ -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 != ''">
@@ -913,7 +917,7 @@
                dd.area,
                ifnull(od.processing_note,"") as processingNote,
                ifnull(od.building_number,"") as buildingNumber,
-               od.price,
+               dd.price,
                od.other_columns
         from delivery_detail dd
                  left join order_detail od on dd.order_id = od.order_id and dd.order_number = od.order_number
@@ -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