From 723edfdd07208ec27409d1cffb70b9a4eac69446 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:13:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
index bf7705b..fe328f7 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml
@@ -24,7 +24,10 @@
pd.glass_sort,
if(pd.glass_sort=1,'(澶�)',if(pd2.glass_sort=pd.glass_sort,'(鍐�)','')),
pd.detail,
- od.width,
+ if( od.bend_radius!='',
+ round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,0),
+ od.width
+ ),
od.height,
od.area,
od.gross_area,
@@ -35,8 +38,26 @@
on od.product_id = pd.prod_id and pd.detail_type='glass'
LEFT JOIN (SELECT max(id) as id ,max(glass_sort) as glass_sort from product_detail GROUP BY prod_id)as pd2
on pd2.id=pd.id
+ left join (
+ select
+ a.prod_id,
+ a.sort_num,
+ a.glass_sort,
+ (case
+ when a.sort_num=1
+ then left(detail,LOCATE('mm',detail)-1)/2
+ else
+ left(detail,LOCATE('mm',detail)-1)
+ end) as 'thicknessCount'
+
+ from product_detail as a
+ group by prod_id,a.sort_num
+ ) as t
+ ON t.prod_id = od.product_id and t.sort_num <=pd.sort_num
+
where od.order_id = #{orderId}
+ group by od.order_number,pd.glass_sort
ORDER BY od.order_number
</insert>
--
Gitblit v1.8.0