From a9ffa322f0cf794a7da8182e1be4ca34f5ea19b6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 25 七月 2025 13:34:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml | 12 ++++++++----
1 files changed, 8 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 a5777a3..edcf65d 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -890,7 +890,7 @@
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
+ left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work where this_process='鍖呰' group by process_id) aaa on aaa.process_id=fol.process_id
@@ -926,13 +926,14 @@
<select id="getDetailLists">
SELECT
- od.building_number,
+ ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,
od.width,
od.height,
fol.quantity,
od.product_name,
od.product_id,
- ROUND( od.width * od.height * fol.quantity / 1000000, 2 ) as area
+ ROUND( od.width * od.height * fol.quantity / 1000000, 2 ) as area,
+ ROUND( od.width * od.height * fol.quantity / 1000000, 2 )*#{thickness}*2.5 as weight
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
@@ -948,11 +949,14 @@
<select id="getDetailList2">
SELECT
od.product_id,
- od.product_name
+ od.product_name,
+ pro.thickness
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.product as pro
+ on pro.id = od.product_id
LEFT JOIN sd.`order` o ON o.order_id = fol.order_id
WHERE
o.order_id=#{orderId} and fol.remarks=#{remarks}
--
Gitblit v1.8.0