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

chenlu

2025-03-20 9b9fdcb4711279a303cf8da9ce9e3ff30b1bf6e0

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

@@ -92,8 +92,8 @@
            noProductDataInTheTable:'There is no product data in the table',
            tableDataExceedsMaximumLimit:'The table data exceeds the maximum limit',
            range9999Dec: "Please enter a four digit integer",
            quantityError: "数量错误，请刷新再保存",
            dataDoesNotExist: "数据不存在",
            quantityError: "Quantity Error",
            dataDoesNotExist: "Data Does Not Exist",
        }
    },
    product:{
@@ -135,7 +135,7 @@
            hollowThickness:'* Hollow thickness',
            hollowGasType:'* Inflation mode',
            hollowType:'* Sealing compound',
            hollowGlueDepth:'* Default glue depth',
            hollowGlueDepth:'Default glue depth',
            hollow:'Hollow spacer',
            hollowUpdate:'Hollow spacers modified',
            interlayerThickness:'*Lamination thickness',
@@ -245,8 +245,10 @@
        sheet3:'View shipping information',
        sheet5:'Production and processing of single curved glass (single sheet)',
        oneClickStorage:'One-click completion',
        oneClickReturn:'一键退回',

        quantityMount:'Quantity and Amount',
        allAmount:'面积金额（总金额）',

        msg:{
            productCheck:'Please select a product',
@@ -272,7 +274,8 @@
            calculationAreaPrompt5:'Do you want to continue creating duplicate orders',

            pleaseCancelTheFilteringFirst:'Please cancel the selection first.',
            grossAreaIsNot0:'存在实际总面积等于0',
            grossAreaIsNot0:'There is an actual total area equal to0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },
@@ -334,13 +337,14 @@
        xMargin:'X axis margin',
        yMargin:'Y-axis margin',
        location:'Trademark position',
        sort:'玻璃反弯'

    },

    workOrder:{
        page:{
            selectWorkOrder:'Work order',
            addWorkOrder:'转生产订单'
            addWorkOrder:'Forward production order'
        },
        productionId:'Production Order Number',
        convert:'Convert',
@@ -349,7 +353,8 @@
        transferOrder:'Transfer Order',
        perimeter:'perimeter',
        deleteNo:'Delete failed Check whether the shelf has been splited',
        msg:'Please select all data'
        msg:'Please select all data',
        msgSelect:'请选择订单号'

    },
    processCard:{
@@ -359,10 +364,10 @@
            productionScheduling:'Production Scheduling',
            selectPrintProject:'Engineering Printing',
            selectPrintFlowCard:"print",
            splittingDetails:"分架查询",
            addProcessCard:"分架新增",
            printFlowCard:"流程卡打印",
            selectDetailProcessCard:"流程卡明细查询"
            splittingDetails:"Frame query",
            addProcessCard:"Split-frame addition",
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        processId:'Process Card Number',
        founder:'Divider',
@@ -377,6 +382,7 @@
        weight:'Weight',
        selectedQuantity:'Select Quantity',
        establishProcessCards:'Add',
        createBySequenceNumber:'By Sequence Number',
        return:'Return',
        ProductionSchedulingOk:'Scheduled Production',
        ProductionSchedulingNo:'Unscheduled Production',
@@ -410,6 +416,7 @@
        composingOk:'Can Be Typesetter',
        composingNo:'Non Typesetting',
        typesetter:'typesetter',
        revoke:'撤销可排版',
        scheduledStartTime:'Scheduled Start Time',
        planEndTime:'Plan End Time',
        customerId:'Customer Id',
@@ -431,9 +438,12 @@
        deleteNo:'Failed to delete Check whether the flow card has been reported (feedback)',
        deleteNoProcedure:'Delete failed Check whether the next operation has been reported',
        pleaseCheckTheRequiredData:'Please check the required data',
        notSelectTheOptionData:'请勿勾选已排版数据',
        landingSequence:'Landing sequence',

        labelStyle:'Label Style',
        detailPrinting:'Detail Printing',
        detailsPrintedSeparately:'Details Printed Separately',
        customLabelPrinting:'Custom label printing',
        labelPrinting:'Lable Printing',
        sortingSuccessful:'Sorting successful',
@@ -448,11 +458,20 @@
        mergePrinting:'Merge printing',
        printStatus:'Print times',
        labelPrinting2:'Label printing 2',
        finishedProductPrinting2:'Finished Product Printing2',
        editablePrinting:'Editable Printing',
        invertSelection:'Invert Selection',
        sortSummary:'Sort Summary',
        addAutomatically:'Auto fill',
        selectFill:'Selected fill',
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',

        mergeState:'合并状态',

        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
        printWarn1:'The print quantity cannot be greater than the order quantity'
    },
    reportingWorks:{
        page:{
@@ -532,7 +551,7 @@
        thisCompletedQuantity:'This Completed Quantity',
        thisWornQuantity:'This Worn Quantity',
        passAudit:'Pass The Audit',

        patchCondition:'Patch Condition',

        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
@@ -559,13 +578,14 @@
        pleaseNumber7:'The quantity cannot be greater than the quantity of the previous process',
        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',

    },
    productStock:{
        page:{
            productStockList:"Stock Inquiry",
            createProductStock:"Finished product Into Stock",
            storageRecord:"出入库记录",
            storageRecord:"Entry and exit records",
            orderAllocation:'Order Allocation',
            finishedProductOut:'Finished Product Out Of Stock',
            finishedGoodsIssue:'Finished Goods Delivery',
@@ -662,10 +682,10 @@
        typeClaim:'Take out type',
        pleaseEnterTheBoxNumber:'Please enter the box number',

        boxNumber:'箱号',
        msg1:'发货单已出库请刷新界面',
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过订单总数'
        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'
    },
    customer:{
        page:{
@@ -709,7 +729,7 @@
        produce:'Produce',
        traveler:'Traveler',
        warehousing:'Warehousing',
        unpaidQuantity:"Unpaid  Quantity ",
        unpaidQuantity:"Quantity not shipped",
        availableStock:'Available Stock',
        deliveryQuantity:'Delivery Quantity',
        pleaseEnterTheAmountOfFunds:'Please enter the project name',
@@ -740,7 +760,7 @@
        freightPrice:'Freight Price',
        freightQuantity:'Freight Quantity',
        freight:'Freight Money',
        pleaseMsg1:'订单存在其他金额单价没有填写',
        pleaseMsg1:'There are other amounts in the order and the unit price is not filled in',

    },
    replenish:{
@@ -772,6 +792,7 @@
        reworkProcess:'Rework Process',
        reworkType:'Rework Type',
        reworkArea:'Rework Area',
        responsibilityInformation:'responsibility Information',
        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',
@@ -783,7 +804,7 @@
            roleList:'Role Home',
        },
        id:'ID',
        characterHomepage:'角色首页',
        characterHomepage:'Role Home',
        role:'Character',
        roleAdd:'Role addition',
        menu:'Menu',
@@ -813,6 +834,7 @@
        ConfirmPasswordCannotBeEmpty:'Confirm that the password cannot be empty',
        TheTwoPasswordsAreNotTheSame:'Two different passwords',
        OldPasswordError:'Old password error',
        roleSelection:'Role Selection',

        userName:'User name',
        changeUserName:'Modifying a user name',
@@ -857,10 +879,12 @@
        msg2:'Upload picture can only be JPG or PNG format!',
        selectFile:'Selecting file',
        msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
            selectMachine:'设备管理',
            selectMachine:'Equipment management',
            addMachine:"Device addition",
            maintenanceAndRepair:"Maintenance and repair",
            addMaintenanceAndRepair:"Maintenance and repair added"
@@ -935,7 +959,7 @@
        productionScheduling:'Production scheduling report',
        yieldReport:'Yield report',
        workingProcedure:'Process',
        inventoryArea:'Stock area',
        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',
@@ -993,16 +1017,16 @@
        films :'Coating Type',
        pleaseEnterData :'Please enter data',
        pleaseEnter :'Please enter',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
        msg1 :'This material is already in stock and cannot be deleted',
        unit :'unit',
    },
    ingredientsStock:{
        page:{
            selectIngredientsStock:"Material inventory",
            materialOutbound:"Material delivery",
            returnToStorage:"Return to the warehouse",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            selectSurplusMaterials:"Waste material management",
            createOutbound:'New material delivery',
            returnToStorageCreate:'Returned warehouse addition'
        },
        materialName :'Material name',
@@ -1045,10 +1069,10 @@
        materialReturnType :'Material return type',
        createTime :'Returned warehouse date',

        surplusMaterialManagement :'余料管理',
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型'
        surplusMaterialManagement :'Waste material management',
        additionOfSurplusMaterials :'Surplus addition',
        excessMaterialOutflow :'Residual materials out of storage',
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
    },
    warehouseBasicData:{
        page:{
@@ -1063,17 +1087,17 @@
    stockReport:{
        page:{
            warehouseReport:"Warehouse Basic Data",
            finishedProductReport:"成品报表",
            materialReport:"物料报表",
            finishedProductReport:"Finished product report",
            materialReport:"Material statement",

        },
        finishedProductInventoryReport:"成品入库报表",
        finishedProductOutboundReport:"成品出库报表",
        finishedProductTransferReport:"成品调拨报表",
        finishedProductDeliveryReport:"成品领出报表",
        materialAdditionReport:"物料新增报表",
        materialOutboundReport:"物料出库报表",
        materialReturnReport:"物料返库报表",
        finishedProductInventoryReport:"Finished product receipt report",
        finishedProductOutboundReport:"Finished product delivery report",
        finishedProductTransferReport:"Finished product transfer report",
        finishedProductDeliveryReport:"Finished product take-out report",
        materialAdditionReport:"Material addition report",
        materialOutboundReport:"Material delivery report",
        materialReturnReport:"Material return report",
    },
    components:{
        addNewSignature :'Add label name',
@@ -1125,22 +1149,23 @@
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price'
    },

    glassPrice:{
        glassPriceComputed:'玻璃报价',
        priceSet:'价格设置',
        priceList:'价格列表',
        glassPriceComputed:'Glass quotation',
        priceSet:'Price setting',
        priceList:'Price list',
        msg:{
            error1:'请选择全部参数',
            error2:'此膜系已经存在，请重新选择',
            success:'数据保存成功',
            addProduce:'请先添加产品'
            error1:'Please select all parameters',
            error2:'This membrane system already exists, please re-select',
            success:'Data saved successfully',
            addProduce:'Please add the product first'
        },
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
        glass:'glass',
        interlayer:'gum',
        hollow:'hollow',
        process:'process',
        addProduce:'Select product',
        reorder:'reorder'
    }