From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题，调整流程卡打印半径显示逻辑
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 14 +++++++++++---
1 files changed, 11 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..1761017 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) <= #{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) <= #{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" >
@@ -137,6 +137,14 @@
on a.id = b.customer_id
</select>
+ <select id="getProjectList">
+ select * from(select project,salesman_id,salesman,id from sd.`order`
+ where customer_id = #{id}
+ group by project
+ ) as a
+ order by id desc
+ </select>
+
<select id="getSelectCustomer">
select
*
@@ -242,7 +250,7 @@
where date(d.create_time) >= #{startDate}
and date(d.create_time) <= #{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