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

@@ -69,8 +69,16 @@
        partiallySelected:'partially selected',
        unchecked :'unchecked',
        copy:'Copy',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            max10:"最多输入10个字符",
            range99999Dec2:
                "Please enter a number between 0 and 99999 with a maximum of two decimals",
            range99999Dec3:
@@ -95,6 +103,10 @@
            range9999Dec: "Please enter a four digit integer",
            quantityError: "Quantity Error",
            dataDoesNotExist: "Data Does Not Exist",
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -141,7 +153,7 @@
            hollowUpdate:'Hollow spacers modified',
            interlayerThickness:'*Lamination thickness',
            interlayerType:'* Type',
            interlayerColor:'* Color',
            interlayerColor:'Color',
            interlayer:'Lamination  spacer',
            interlayerUpdate:'Lamination  spacer modified',
            glassAttribute:'Monolithic glass properties',
@@ -165,6 +177,8 @@

            productAbbreviation:'Product abbreviation',
            productDuplication:'Product repetition',
            msg1:'创建人是：',
            msg2:'无法操作！',
        }
    },
    order:{
@@ -252,6 +266,35 @@
        allAmount:'面积金额（总金额）',
        orderTransfer:'订单报工转移',

        graphic:'graphic',
        drawingNo:'drawingNo',
        upper:'upper',
        down:'down',
        horizontal:'horizontal',
        vertical:'vertical',
        exportDXF:'exportDXF',
        selectFile:'选择文件',
        left:'左',
        right:'右',
        edgeAngleCurvature:'边角弧度',
        cuttingCorners:'切边角',
        fourCornerExcavation:'四角挖缺',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
            oldOrderNumber:'原订单序号',
            newOrderNumber:'新订单序号',
            confirmTitle:'确实转移此序号的流程卡报工数据?',
            errorToMes:'与mes通讯异常'

        },

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

        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'
        glassSizeRange:'玻璃尺寸范围',
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',

    },
    searchOrder:{
@@ -356,7 +403,11 @@
        xMargin:'X axis margin',
        yMargin:'Y-axis margin',
        location:'Trademark position',
        sort:'玻璃反弯'
        sort:'玻璃反弯',
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },

@@ -388,6 +439,13 @@
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        yesTitle:'有标题打印',
        noTitle:'无标题打印',
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'Process Card Number',
        founder:'Divider',
        layoutStatus:'Type Setting',
@@ -415,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',
@@ -485,8 +544,6 @@
        selectFill:'Selected fill',
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',


        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
@@ -505,6 +562,37 @@
        shelfNumber:'架号',
        totalSequenceNumber:'总序号',
        cancelMerger:'取消合并',
        projectMsg1:'请选择工程对应的版图号',
        orderPrint:'订单打印',
        numberLabelPrintingOperations:'标签打印次数',
        numberTimesProcessCardPrinted:'流程卡打印次数',
        projectMsg2:'请选择标签模板',
        layoutNumber:'版图号',
        addFlowCardMsg1:'请选择已分架订单打印',
        addFlowCardMsg2:'请选择未分架订单打印',
        okFlowCard:'已分架',
        noFlowCard:'未分架',
        mainWidth:'宽高',
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -512,6 +600,9 @@
            addReportingWork:"New Work Reporting",
            qualityInspectionReview:"Quality Inspection Review",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'Code',
        glassAddress:'Glass Address',
        WorkReportingManagement:'Work Reporting Management ',
@@ -586,7 +677,10 @@
        passAudit:'Pass The Audit',
        patchCondition:'Patch Condition',
        changeFailed:'修改失败，请检查是否为报工转移订单',
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
        successfulModificationOfWorkApplication:'Report modification succeeded',
@@ -613,7 +707,22 @@
        pleaseNumber8:'Please enter serial number',
        pleaseNumber9:'Correct number of completions or breakdowns',
        pleaseNumber10:'The number of completions cannot be greater than the number of process cards',
        pleaseNumber11:'完工+次破数量不能大于可完工数量',
        pleaseNumber12:'本工序报工数:',
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -719,7 +828,13 @@
        boxNumber:'Case number',
        msg1:'The invoice is out of the warehouse. Please refresh the interface',
        msg2:'Invoice inventory number does not exist',
        msg3:'The quantity of incoming orders shall not exceed the total number of orders'
        msg3:'The quantity of incoming orders shall not exceed the total number of orders',
        boxingPrinting:'装箱打印',
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -758,7 +873,6 @@
            shipmentProductClassificationReport:"Category report of shipped products ",
            createDelivery:'Create delivery',
            deliveryReport:'Delivery report',

        },
        delivery:'Delivery',
        place :'Place',
@@ -798,6 +912,8 @@
        freightQuantity:'Freight Quantity',
        freight:'Freight Money',
        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',

    },
    replenish:{
@@ -806,12 +922,16 @@
            addReplenish:"Add Patches",
            printReplenishFlowCard:"Print Patches"
        },

        patchManagement:'Patch Management',
        addPatches:"Add Patches ",
        printPatches:'Print Patches',
        patchNumber:'Patch Number',
        mark:'Mark',
        sliceMarking:'Slice Marking',
        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'

    },
    rework:{
@@ -833,6 +953,7 @@
        PleaseSelectAReworkTeam:'Please select a rework team',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'The rework quantity cannot be greater than the second break quantity',
        reworkQuantityCannotBeEmptyOr0:'Rework quantity cannot be empty or 0',
        msg1:'请填入需要合并的层',
    },


@@ -861,6 +982,7 @@
        userId:'User ID',
        user:'User',
        setUpRoles:'Set a role',
        setProcess:'设置工序',
        changePassword:'Change password',
        OldPassword:'Old password',
        TheNewPassword:'New password',
@@ -982,7 +1104,12 @@
            productionScheduling:'Production scheduling report',
            yield:'Yield report',
            finishedProductReport :'Finished product report',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
        productionReport:'Production report',
        workInProgressReport:'Product in process report',
        processToBeCompleted:'Process to be completed report',
@@ -998,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',
@@ -1026,6 +1155,10 @@
        finished :'Rate of finished product',
        finishedProductReport :'Finished product report',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
        page:{
@@ -1060,6 +1193,7 @@
        pleaseEnter :'Please enter',
        msg1 :'This material is already in stock and cannot be deleted',
        unit :'unit',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1113,7 +1247,11 @@
        surplusMaterialManagement :'Waste material management',
        additionOfSurplusMaterials :'Surplus addition',
        excessMaterialOutflow :'Residual materials out of storage',
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type',
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1141,6 +1279,8 @@
        materialReturnReport:"Material return report",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'Add label name',
@@ -1191,7 +1331,8 @@
        role :'Role',
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1209,7 +1350,63 @@
        hollow:'hollow',
        process:'process',
        addProduce:'Select product',
        reorder:'reorder'
        reorder:'reorder',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }