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

廖井涛

2025-12-01 21eed4f6a8065bb59d0aaf7481dfe145dba74f2a

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

@@ -177,6 +177,8 @@

            productAbbreviation:'Product abbreviation',
            productDuplication:'Product repetition',
            msg1:'创建人是：',
            msg2:'无法操作！',
        }
    },
    order:{
@@ -283,6 +285,16 @@
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
            oldOrderNumber:'原订单序号',
            newOrderNumber:'新订单序号',
            confirmTitle:'确实转移此序号的流程卡报工数据?',
            errorToMes:'与mes通讯异常'

        },

        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -316,7 +328,6 @@
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'

        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
@@ -428,6 +439,8 @@
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        yesTitle:'有标题打印',
        noTitle:'无标题打印',
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
@@ -460,6 +473,7 @@
        reviewedState:'Review Status',
        reviewed:'Reviewer',
        schedulingId:'Production Scheduling Number',
        notes:'Примечания',
        scheduling:'Production Scheduling',
        schedulingOk:'Please select the data on the right first',
        schedulingNo:'Please enter a positive integer',
@@ -530,8 +544,6 @@
        selectFill:'Selected fill',
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',


        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
@@ -564,7 +576,8 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

@@ -587,6 +600,9 @@
            addReportingWork:"New Work Reporting",
            qualityInspectionReview:"Quality Inspection Review",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'Code',
        glassAddress:'Glass Address',
        WorkReportingManagement:'Work Reporting Management ',
@@ -664,7 +680,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
        successfulModificationOfWorkApplication:'Report modification succeeded',
@@ -857,7 +873,6 @@
            shipmentProductClassificationReport:"Category report of shipped products ",
            createDelivery:'Create delivery',
            deliveryReport:'Delivery report',

        },
        delivery:'Delivery',
        place :'Place',
@@ -907,6 +922,7 @@
            addReplenish:"Add Patches",
            printReplenishFlowCard:"Print Patches"
        },

        patchManagement:'Patch Management',
        addPatches:"Add Patches ",
        printPatches:'Print Patches',
@@ -916,6 +932,7 @@
        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'

    },
    rework:{
        page:{
@@ -965,6 +982,7 @@
        userId:'User ID',
        user:'User',
        setUpRoles:'Set a role',
        setProcess:'设置工序',
        changePassword:'Change password',
        OldPassword:'Old password',
        TheNewPassword:'New password',
@@ -1088,7 +1106,10 @@
            finishedProductReport :'Finished product report',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
        productionReport:'Production report',
        workInProgressReport:'Product in process report',
        processToBeCompleted:'Process to be completed report',
@@ -1104,11 +1125,13 @@
        qualityReport:'Quality statement',
        productionScheduling:'Production scheduling report',
        yieldReport:'Yield report',
        yieldProcessReport:'成品率工序汇总报表',
        workingProcedure:'Process',
        inventoryArea:'Stock area（m²）',
        pleaseSelectADateFirst:'Please select the date first',
        pleaseSelectAProcessFirst:'Please select the process first',
        theFilteringTimeForExportCannotExceed180Days:'The export filtering period cannot exceed 180 days',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'Order time',
        deliveryDate:'Delivery date',
        completedQuantity:'Quantity completed',
@@ -1133,7 +1156,9 @@
        finishedProductReport :'Finished product report',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
        page:{