From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index 61f5e42..066f266 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -214,13 +214,24 @@
</select>
<select id="selectShiftQuantitySv">
- select * from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
+ select *
+ <if test="step != null and step != ''">
+ ,sum(e.break) as 'breakage_quantity'
+ ,Round(sum(e.break)*e.area,2) as 'breakage_area'
+ </if>
+ <if test="step == null || step == ''">
+ ,e.break as 'breakage_quantity'
+ ,Round(e.break*e.area,2) as 'breakage_area'
+ </if>
+ from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
c.child_width,
c.child_height,
a.completed_quantity,
- a.breakage_quantity,
+ a.breakage_quantity as break,
a.order_number,
- b.reporting_work_id
+ b.reporting_work_id,
+ round(c.area*a.completed_quantity,2) as finish_area,
+ c.area
from pp.reporting_work as b
left join pp.reporting_work_detail as a
on a.reporting_work_id = b.reporting_work_id
--
Gitblit v1.8.0