From 48bd9e20aa649145c9bf643e375c0cd86f7bb800 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 九月 2025 08:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 f2ca37e..dc32372 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -3114,7 +3114,7 @@
group by opd.process_id,opd.technology_number,opd.process) as bb
GROUP BY bb.process_id,bb.technology_number) as b
on a.process_id = b.process_id and a.technology_number = b.technology_number
- order by a.process_id
+ order by a.process_id,a.order_number,a.technology_number
</select>
@@ -3214,7 +3214,7 @@
IFNULL(dd.breakageQuantity,0) as breakageQuantity,
rw.completedArea,
IFNULL(dd.breakageArea,0) as breakageArea,
- CONCAT(ROUND(TRUNCATE(rw.completedQuantity/(rw.completedQuantity + IFNULL(dd.breakageArea,0)),2)*100), '%') as finished
+ CONCAT(ROUND(TRUNCATE(rw.completedArea/(rw.completedArea + IFNULL(dd.breakageArea,0)),2)*100), '%') as finished
from
(
select
--
Gitblit v1.8.0