Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

wuyouming666

2025-04-07 ba6b8c6be389e1c76f15f85e43f2d55ff5d34caf

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

@@ -68,6 +68,7 @@
        selected:'selected',
        partiallySelected:'partially selected',
        unchecked :'unchecked',
        copy:'Copy',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            range99999Dec2:
@@ -249,6 +250,7 @@

        quantityMount:'Quantity and Amount',
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        msg:{
            productCheck:'Please select a product',
@@ -275,7 +277,13 @@

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'There is an actual total area equal to0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？',
            updateOrderIdErrorGtMaxId:'输入订单号不能大于最大订单号',
            updateOrderIdErrorIsExist:'输入订单号已存在',
            updateOrderIdErrorIsSame:'输入订单号相同',
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }

    },
@@ -300,8 +308,13 @@
        copy:'Copy',
        copyTitle:'Copy Title',
        msgList:{
            checkOrder:'No order information is found. Please click Order first'
        }
            checkOrder:'No order information is found. Please click Order first',
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
    },
    craft:{
        glassAddress:'Glass Address',
@@ -713,6 +726,9 @@

        customerAbbreviation:'Customer abbreviation',
        pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
@@ -986,6 +1002,7 @@
        patchNum :'Patch number',
        finished :'Rate of finished product',
        finishedProductReport :'Finished product report',
        workProcessName:'在制品名称',
    },
    productionBasicData:{
        page:{