From a85bc05fb3a7dc9c67930a1b412cf5b1be172fd5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 19 十二月 2024 16:44:06 +0800
Subject: [PATCH] 修改报工新增为通过判断工序是否为复合工序报工

---
 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 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 86491f8..d1a3706 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -51,7 +51,7 @@
 
                 where date(d.create_time)>=#{startDate} and date(d.create_time) &lt;= #{endDate}
                 and d.customer_id = #{orderDetail.order.customerId}
-        group by od.order_id,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) &lt;= #{endDate}
             and d.customer_id = #{orderDetail.order.customerId}
-        group by od.order_id,od.product_id) as zu
+        group by dd.delivery_id,od.order_id,od.product_id) as zu
     </select>
 
     <select id="getSelectCustomerOderDate" >
@@ -242,7 +242,7 @@
         where date(d.create_time) >= #{startDate}
           and date(d.create_time) &lt;= #{endDate}
           and d.customer_id = #{orderDetail.order.customerId}
-        group by od.order_id,od.product_id
+        group by dd.delivery_id,od.order_id,od.product_id
 
         UNION ALL
 

--
Gitblit v1.8.0