From 0ebe129f9e26d41dd0f4e837f465faaa2a9f4a42 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 30 七月 2025 08:30:24 +0800
Subject: [PATCH] 提交玻璃工艺审核单片拱高计算
---
north-glass-erp/northglass-erp/src/lang/en.js | 3 ++-
north-glass-erp/northglass-erp/src/lang/ar.js | 3 ++-
north-glass-erp/northglass-erp/src/lang/ru.js | 3 ++-
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 5 ++++-
north-glass-erp/northglass-erp/src/lang/zh.js | 3 ++-
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 6 ++++++
6 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/ar.js b/north-glass-erp/northglass-erp/src/lang/ar.js
index e5ab2cc..ea253d3 100644
--- a/north-glass-erp/northglass-erp/src/lang/ar.js
+++ b/north-glass-erp/northglass-erp/src/lang/ar.js
@@ -358,7 +358,8 @@
xMargin:'賴丕賲卮 丕賱賲丨賵乇 X',
yMargin:'賴丕賲卮 丕賱賲丨賵乇 Y',
location:'賲賵賯毓 丕賱毓賱丕賲丞 丕賱鬲噩丕乇賷丞',
- sort:'鐜荤拑鍙嶅集'
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮'
},
diff --git a/north-glass-erp/northglass-erp/src/lang/en.js b/north-glass-erp/northglass-erp/src/lang/en.js
index 88dd0cd..95e45f7 100644
--- a/north-glass-erp/northglass-erp/src/lang/en.js
+++ b/north-glass-erp/northglass-erp/src/lang/en.js
@@ -359,7 +359,8 @@
xMargin:'X axis margin',
yMargin:'Y-axis margin',
location:'Trademark position',
- sort:'鐜荤拑鍙嶅集'
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮'
},
diff --git a/north-glass-erp/northglass-erp/src/lang/ru.js b/north-glass-erp/northglass-erp/src/lang/ru.js
index 17f5aab..45a3aed 100644
--- a/north-glass-erp/northglass-erp/src/lang/ru.js
+++ b/north-glass-erp/northglass-erp/src/lang/ru.js
@@ -358,7 +358,8 @@
xMargin:'袚褉邪薪懈褑褘 芯褋懈 X',
yMargin:'袠薪褌械褉胁邪谢 芯褋懈 Y',
location:'袪邪褋锌芯谢芯卸械薪懈械 褌芯胁邪褉薪芯谐芯 蟹薪邪泻邪',
- sort:'鐜荤拑鍙嶅集'
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮'
},
workOrder:{
diff --git a/north-glass-erp/northglass-erp/src/lang/zh.js b/north-glass-erp/northglass-erp/src/lang/zh.js
index 3138f02..0fa114e 100644
--- a/north-glass-erp/northglass-erp/src/lang/zh.js
+++ b/north-glass-erp/northglass-erp/src/lang/zh.js
@@ -368,7 +368,8 @@
xMargin:'瀹芥柟鍚戝潗鏍�',
yMargin:'楂樻柟鍚戝潗鏍�',
location:'鍟嗘爣浣嶇疆',
- sort:'鐜荤拑鍙嶅集'
+ sort:'鐜荤拑鍙嶅集',
+ archRise:'鎷遍珮'
},
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index c3c873f..a1ec83a 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -67,6 +67,7 @@
{field: 'childWidth',width:120, title: t('craft.childWidth'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'childHeight',width:120, title: t('craft.childHeight'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'arc',width:120, title: t('craft.arc'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'archRise',width:120, title: t('craft.archRise'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'area',width:120, title: t('craft.area'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'orderDetail.quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'process',width:120, title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -245,15 +246,20 @@
)
let widthList = []
let arcList = []
+ let archRiseList = []
sameOrderNumber.forEach((item) =>{
widthList.push(item.childWidth)
arcList.push(item.arc)
+ archRiseList.push(item.archRise)
+ console.log(item.archRise)
})
widthList = widthList.sort();
arcList = arcList.sort();
+ archRiseList = archRiseList.sort();
sameOrderNumber.forEach((item,index) =>{
item.childWidth = widthList[index]
item.arc = arcList[index]
+ item.archRise = archRiseList[index]
})
}
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 a514b77..2af4985 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -93,6 +93,7 @@
<result column="child_width" property="childWidth"/>
<result column="child_height" property="childHeight"/>
<result column="arc" property="arc"/>
+ <result column="arch_rise" property="archRise"/>
<result column="icon" property="icon"/>
<result column="process" property="process"/>
<result column="area" property="area"/>
@@ -133,6 +134,7 @@
a.child_width,
a.child_height,a.arc,
a.icon,
+ a.arch_rise,
a.area,
b.quantity,
a.process,
@@ -156,7 +158,8 @@
a.total_area = #{item.area}*b.quantity,
a.icon = #{item.icon},
a.process = #{item.process},
- a.arc = #{item.arc}
+ a.arc = #{item.arc},
+ a.arch_rise = #{item.archRise}
where
a.order_id = b.order_id
and a.order_id = #{item.orderId}
--
Gitblit v1.8.0