From 8b116fd4f2633194b050a0eca13964ce4f2e18f7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 八月 2025 16:41:22 +0800
Subject: [PATCH] 订单转生产订单根据工艺流程区分不同产品，报工修改逻辑调整
---
north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 c0e41ee..35022ef 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml
@@ -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