提交玻璃工艺审核单片拱高计算

guoyujie

2025-07-30 0ebe129f9e26d41dd0f4e837f465faaa2a9f4a42

提交玻璃工艺审核单片拱高计算

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -358,7 +358,8 @@
        xMargin:'هامش المحور X',
        yMargin:'هامش المحور Y',
        location:'موقع العلامة التجارية',
        sort:'玻璃反弯'
        sort:'玻璃反弯',
        archRise:'拱高'

    },


 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:'拱高'

    },


 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -358,7 +358,8 @@
        xMargin:'Границы оси X',
        yMargin:'Интервал оси Y',
        location:'Расположение товарного знака',
        sort:'玻璃反弯'
        sort:'玻璃反弯',
        archRise:'拱高'
    },

    workOrder:{

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -368,7 +368,8 @@
        xMargin:'宽方向坐标',
        yMargin:'高方向坐标',
        location:'商标位置',
        sort:'玻璃反弯'
        sort:'玻璃反弯',
        archRise:'拱高'

    },


 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]
            })

          }

 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}