From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 2477586..5a7f36e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -258,7 +258,7 @@
<select id="exportOrderSummary" >
SELECT *
from sd.`order` as b
- where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]} and b.create_order>0
+ where date(b.create_time)>=#{dates[0]} and date(b.create_time) <= #{dates[1]} and b.order_review>0
order by b.id desc
</select>
@@ -565,7 +565,7 @@
on d.type_id = c.type_id
left join sd.basic_glass_type as e
on e.type_id = d.belong
- where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]} and b.create_order>0
+ where date(a.create_time)>=#{dates[0]} and date(a.create_time) <= #{dates[1]} and b.order_review>0
</select>
@@ -978,7 +978,7 @@
left join sd.basic_glass_type as e
on e.type_id = d.belong
where date(b.create_time) >= #{dates[0]}
- and date(b.create_time) <= #{dates[1]} and b.create_order>0
+ and date(b.create_time) <= #{dates[1]} and b.order_review>0
group by b.order_id, a.product_id
order by b.order_id desc
</select>
--
Gitblit v1.8.0