From dd3b22bca22373c77843d5ecb96eaa7e7a382461 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 26 九月 2025 10:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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..2116d07 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -118,7 +118,9 @@
<select id="getGlassLRow">
select
max(a.technology_number) as rowCount,
- RowNum
+ RowNum,
+ a.order_number,
+ a.process_id
from pp.flow_card as a
left join
(select min((@i:=@i+1)) AS RowNum,c.*
@@ -130,7 +132,7 @@
on b.id = a.id
where a.order_id = #{orderId}
group by a.order_number,a.process_id
- order by RowNum
+ order by a.process_id,a.order_number
</select>
@@ -214,13 +216,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