From ae5a0421846584e31d3c3572217f2bd8a9adff3e Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 七月 2025 14:01:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 5855af5..672a9b3 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -872,6 +872,7 @@
fol.remarks,
SUM(fol.quantity) as quantity,
ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
+ ROUND( sum(od.width * od.height * fol.quantity*p.total_thickness*2.5) / 1000000, 2 ) as weight,
fol.process_id,
aaa.teams_groups_name,
aaa.previous_process,
@@ -880,6 +881,7 @@
from mm.finished_operate_log aa where aa.operate_type = '鍏ュ簱' and aa.status!='宸蹭綔搴�') fol
left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
left join sd.`order` o on o.order_id=fol.order_id
+ left join sd.product p on od.product_id=p.id
left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='鍖呰') aaa on aaa.process_id=fol.process_id
--
Gitblit v1.8.0