From 39b565ab0ea5e98a2bb0eb5c78b3c23247dbc2fe Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 七月 2024 15:22:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 6f92c36..297c536 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -17,7 +17,8 @@
total_area,
process,
- `group`)
+ `group`
+ ,arc)
select
od.order_id,
od.order_number,
@@ -25,14 +26,26 @@
if(pd.glass_sort=1,'(澶�)',if(pd2.glass_sort=pd.glass_sort,'(鍐�)','')),
pd.detail,
if( od.bend_radius!='',
- round(od.width*(od.bend_radius-round(sum(t.thicknessCount),2))/od.bend_radius,1),
+ round(od.width*
+ (od.bend_radius-round(
+ sum(t.thicknessCount)-t1.thicknessCount/2
+ ,2))
+ /od.bend_radius
+ ,1),
od.width
- ),
+ )
+ ,
+
od.height,
od.area,
od.gross_area,
pd.process,
- pd.glass_group
+ pd.glass_group,
+ if( od.bend_radius!='',
+ round((od.width*(od.bend_radius-(sum(t.thicknessCount)-t1.thicknessCount)))/od.bend_radius,1)
+ ,null) as 'arc'
+
+
from sd.product_detail as pd
left join order_detail as od
on od.product_id = pd.prod_id and pd.detail_type='glass'
@@ -43,18 +56,23 @@
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'
+ left(detail,LOCATE('mm',detail)-1) 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
+ left join (
+ select
+ a.prod_id,
+ a.sort_num,
+ a.glass_sort,
+ left(detail,LOCATE('mm',detail)-1) as 'thicknessCount'
+ from product_detail as a
+ group by prod_id,a.sort_num
+ ) as t1
+ ON t1.prod_id = od.product_id and t1.sort_num =pd.sort_num
where od.order_id = #{orderId}
group by od.order_number,pd.glass_sort
@@ -82,6 +100,7 @@
<association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
<result column="building_number" property="buildingNumber"/>
+ <result column="product_id" property="productId"/>
<result column="product_name" property="productName"/>
<result column="width" property="width"/>
<result column="height" property="height"/>
@@ -100,6 +119,7 @@
a.order_id,
a.order_number,
b.building_number,
+ b.product_id,
b.product_name,
a.glass_address,
a.technology_number,
--
Gitblit v1.8.0