From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 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 8a6aafe..35022ef 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -142,7 +142,7 @@
</select>
<select id="getProjectList">
- select * from(select project,salesman_id,salesman,contacts,contact_number,id from sd.`order`
+ select * from(select project,salesman_id as salesmanId,salesman,contacts,contact_number as contactNumber,id from sd.`order`
where customer_id = #{id}
group by project
) as a
@@ -279,6 +279,7 @@
and date(d.create_time) <= #{endDate}
and d.customer_id = #{orderDetail.order.customerId}
and om.money is not null
+ and om.money >0
group by d.delivery_id, o.order_id, om.`column`
UNION ALL
@@ -318,7 +319,7 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
- and o.create_order>0
+ and o.order_review>0
group by od.order_id,od.product_id
UNION ALL
@@ -338,7 +339,9 @@
where date(o.create_time) >= #{startDate}
and date(o.create_time) <= #{endDate}
and o.customer_id = #{orderDetail.order.customerId}
+ and o.order_review>0
and om.money is not null
+ and om.money >0
group by o.order_id, om.`column`
</select>
--
Gitblit v1.8.0