From b97e00dae4fa017c8273e41fb0f24cf7c7c69a33 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 25 十一月 2024 13:28:35 +0800
Subject: [PATCH] 工程打印标签调整
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 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 b72cbad..7f1c91f 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -813,16 +813,17 @@
o.customer_name,
o.project,
fol.remarks,
- fol.quantity
+ SUM(fol.quantity) as quantity,
+ ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area
from (select *
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
where
- o.order_id=#{orderId} and fol.process_id=#{processId} and fol.remarks=#{remarks}
+ o.order_id=#{orderId} and fol.remarks=#{remarks}
and (fol.remarks is not null and fol.remarks !="") and (fol.process_id !="" and fol.process_id is not null)
- group by fol.remarks,od.order_id,fol.process_id
+ group by fol.remarks,od.order_id
order by fol.operate_time desc
</select>
@@ -839,7 +840,7 @@
AND fol.operation_number = od.order_number
LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
WHERE
- o.order_id=#{orderId} and fol.process_id=#{processId} and fol.remarks=#{remarks}
+ o.order_id=#{orderId} and fol.remarks=#{remarks}
ORDER BY
fol.operate_time DESC
--
Gitblit v1.8.0