From a3ad909e75ddb7a6271d95704dc002cc70337fd5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 27 十月 2025 11:07:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index 44ca3eb..d0359c1 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -275,8 +275,8 @@
from
sd.`order` as o left join sd.order_detail as od on o.order_id=od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
- left join reporting_work as rw on rw.order_id=o.order_id
- left join damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
+ left join pp.reporting_work as rw on rw.order_id=o.order_id
+ left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
and dd.technology_number=ogd.technology_number
where date(rw.reporting_work_time) >= #{startDate}
and date(rw.reporting_work_time) <= #{endDate}
@@ -323,8 +323,8 @@
<select id="getProcessBreakingTotal">
select CEILING(count(dd.id) / #{pageSize}) as 'pageTotal',
count(distinct dd.id) as 'total'
- from damage_details as dd
- left join reporting_work as rw
+ from pp.damage_details as dd
+ left join pp.reporting_work as rw
on rw.reporting_work_id = dd.reporting_work_id
left join sd.order as o
on rw.order_id = o.order_id
--
Gitblit v1.8.0