From e5beb189d8b8a544f3763e5090ea6084639d46e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 02 八月 2024 09:55:05 +0800
Subject: [PATCH] 打印显示批次，和筛选问题

---
 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 c3dd373..26a2681 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml
@@ -88,6 +88,8 @@
         <result column="product_id" property="orderDetail.productId"/>
         <result column="product_name" property="orderDetail.productName"/>
 
+        <result column="other_money" property="order.otherMoney"/>
+
 
 
     </resultMap>
@@ -542,10 +544,12 @@
         dd.money,
         dd.quantity,
         dd.delivery_detail_remakes,
-        dd.create_time
+        dd.create_time,
+        o.other_money
         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.`order` o on dd.order_id=o.order_id
         <where>
                and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -632,6 +636,7 @@
         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.`order` o on dd.order_id=o.order_id
         <where>
             and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -736,9 +741,11 @@
         sum(dd.money) as money,
         sum(dd.quantity) as quantity,
         dd.delivery_detail_remakes,
-        dd.create_time
+        dd.create_time,
+        o.other_money
         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.`order` o on dd.order_id=o.order_id
         <where>
             and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -821,7 +828,7 @@
             </if>
 
         </where>
-        group by dd.delivery_id,od.product_id
+        group by dd.delivery_id,dd.order_id,od.product_id
         order by dd.delivery_id,dd.delivery_number
         limit #{offset},#{pageSize};
     </select>
@@ -834,6 +841,7 @@
         select dd.id as id
         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.`order` o on dd.order_id=o.order_id
         <where>
             and date(dd.create_time)>=#{startDate} and date(dd.create_time) &lt;= #{endDate}
             <if test="deliveryDetail.deliveryId != null and deliveryDetail.deliveryId != ''">
@@ -916,7 +924,7 @@
             </if>
 
         </where>
-        group by dd.delivery_id,od.product_id) as zu
+        group by dd.delivery_id,dd.order_id,od.product_id) as zu
     </select>
 
     <select id="getSelectDeliveryPrinting" resultMap="selectDeliveryDetailOrderDetail" >
@@ -1029,10 +1037,12 @@
         dd.money,
         dd.quantity,
         dd.delivery_detail_remakes,
-        dd.create_time
+        dd.create_time,
+        o.other_money
         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.`order` o on dd.order_id=o.order_id
         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>
@@ -1063,12 +1073,14 @@
                sum(dd.quantity) as quantity,
                dd.delivery_detail_remakes,
                dd.price,
-               dd.create_time
+               dd.create_time,
+               o.other_money
         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.`order` o on dd.order_id=o.order_id
                                    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
+        group by dd.delivery_id,dd.order_id,od.product_id
         order by dd.delivery_id,dd.delivery_number
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0