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,6 +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: "Quantity Error",
            dataDoesNotExist: "Data Does Not Exist",
        }
    },
    product:{
@@ -133,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',
@@ -218,6 +220,7 @@
        areaAmountPerPiece:'Area amount (single piece)',
        areaAmountAge:'Area amount (total area)',
        errorValue:'Error value',

        details:'Details',
        workmanship:'Technology',
        processCard:'Flow card',
@@ -242,8 +245,11 @@
        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',
            tableLengthNot:'No table data',
@@ -268,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:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

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

    },

    workOrder:{
        page:{
            selectWorkOrder:'Work order'
            selectWorkOrder:'Work order',
            addWorkOrder:'Forward production order'
        },
        productionId:'Production Order Number',
        convert:'Convert',
@@ -344,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:{
@@ -353,7 +363,11 @@
            selectAddProcess:'Rack Allocation',
            productionScheduling:'Production Scheduling',
            selectPrintProject:'Engineering Printing',
            selectPrintFlowCard:"print"
            selectPrintFlowCard:"print",
            splittingDetails:"Frame query",
            addProcessCard:"Split-frame addition",
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        processId:'Process Card Number',
        founder:'Divider',
@@ -368,6 +382,7 @@
        weight:'Weight',
        selectedQuantity:'Select Quantity',
        establishProcessCards:'Add',
        createBySequenceNumber:'By Sequence Number',
        return:'Return',
        ProductionSchedulingOk:'Scheduled Production',
        ProductionSchedulingNo:'Unscheduled Production',
@@ -401,6 +416,7 @@
        composingOk:'Can Be Typesetter',
        composingNo:'Non Typesetting',
        typesetter:'typesetter',
        revoke:'撤销可排版',
        scheduledStartTime:'Scheduled Start Time',
        planEndTime:'Plan End Time',
        customerId:'Customer Id',
@@ -422,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',
@@ -439,11 +458,27 @@
        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'
        engineeringPrinting:'Engineering Printing',
        pleaseSelectProject:'Please Select Project',


        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
        printWarn1:'The print quantity cannot be greater than the order quantity'
    },
    reportingWorks:{
        page:{
            selectReportingWorks:"Work Reporting Management",
            addReportingWork:"New Work Reporting",
            qualityInspectionReview:"Quality Inspection Review",
        },
        glassNumber:'Code',
        glassAddress:'Glass Address',
        WorkReportingManagement:'Work Reporting Management ',
@@ -516,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',
@@ -543,10 +578,20 @@
        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:"Entry and exit records",
            orderAllocation:'Order Allocation',
            finishedProductOut:'Finished Product Out Of Stock',
            finishedGoodsIssue:'Finished Goods Delivery',
            transferRecord:'Mutual Exchange Records',
            takeOutRecord:'Take Out Records'
        },
        inventoryQuery:'Stock Inquiry',
        finishedProductWarehousing:"Finished product Into Stock ",
        finishedProductOutbound:'Finished Product Out Of Stock',
@@ -622,7 +667,6 @@
        singlePieceArea:'Single Piece Area',
        perimeter:'Perimeter',
        returnToWarehouse:'Return To Warehouse',

        entryFailure:'Put in storage failure',
        entry:'Put in storage',
        failedToRetrieve:'Take out failure',
@@ -636,10 +680,12 @@
        staterOperationOrderNumber:'Transfer the sales order number',
        endOperationOrderNumber:'Transfer sequence number',
        typeClaim:'Take out type',

        pleaseEnterTheBoxNumber:'Please enter the box number',


        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:{
@@ -683,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',
@@ -714,11 +760,15 @@
        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:{
        page:{
            selectReplenish:"Patch Management",
            addReplenish:"Add Patches",
            printReplenishFlowCard:"Print Patches"
        },
        patchManagement:'Patch Management',
        addPatches:"Add Patches ",
        printPatches:'Print Patches',
@@ -728,6 +778,11 @@

    },
    rework:{
        page:{
            selectRework:"Rework Management",
            addRework:"Add Rework",
            printReworkFlowCard:"Print Rework"
        },
        reworkManagement:'Rework Management',
        addRework:"Add Rework ",
        printRework:'Print Rework',
@@ -737,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',
@@ -748,6 +804,7 @@
            roleList:'Role Home',
        },
        id:'ID',
        characterHomepage:'Role Home',
        role:'Character',
        roleAdd:'Role addition',
        menu:'Menu',
@@ -777,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',
@@ -787,6 +845,7 @@
            searchOrderBasicData:'Base type',
            searchGlassType:'Type of glass',
        },
        glassCategory:'Type of glass',
        order:'Order',
        orderType:'Order type',
        orderClassify:'Order classification',
@@ -820,8 +879,16 @@
        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:'Equipment management',
            addMachine:"Device addition",
            maintenanceAndRepair:"Maintenance and repair",
            addMaintenanceAndRepair:"Maintenance and repair added"
        },
        basicId:'Equipment number',
        basicName:'Device name',
        basicCategory:'Working procedure',
@@ -858,6 +925,24 @@
        tempering:'Tempering',
    },
    report:{
        page:{
            productionReport:'Production report',
            workInProgress:'Product in process report',
            processToBeCompleted:'Process to be completed report',
            productionSchedule:'Production and delivery progress report',
            processCardProgress:'Flow card progress report',
            orderPlanDecomposition:'Flow card progress report',
            damageReport:'Breakage statement',
            crossProcessBreaking:'Cross process breakage report',
            teamOutput:'Team production report',
            splittingDetailsOutside:'Separate frame detail report',
            taskCompletionStatus:'Task completion report',
            rawMaterialRequisition:'Raw material requisition report',
            qualityReport:'Quality statement',
            productionScheduling:'Production scheduling report',
            yield:'Yield report',
            finishedProductReport :'Finished product report',
        },
        productionReport:'Production report',
        workInProgressReport:'Product in process report',
        processToBeCompleted:'Process to be completed report',
@@ -874,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',
@@ -902,6 +987,12 @@
        finishedProductReport :'Finished product report',
    },
    productionBasicData:{
        page:{
            selectProductionBasicData:"Basic data query",
            addBreakageType:"New secondary break type",
            addBreakageReason:"Secondary failure cause added",
            addTeamGroup:"Group Added Added"
        },
        basicDataQuery :'Basic data query',
        newTypeOfSecondaryDamageAdded :'New secondary break type',
        reasonForSecondaryFailureAdded :'Secondary failure cause added',
@@ -912,7 +1003,11 @@
        teamName:'Squad name',
        processInvolved:'Working procedure',
    },
    mainIngredient:{
    ingredients:{
        page:{
            selectIngredients:"Material data",
            createIngredients:"Material addition"
        },
        materialInformation :'Material data',
        materialAddition :'Material addition',
        originalFilm :'Original glass',
@@ -922,8 +1017,18 @@
        films :'Coating Type',
        pleaseEnterData :'Please enter data',
        pleaseEnter :'Please enter',
        msg1 :'This material is already in stock and cannot be deleted',
        unit :'unit',
    },
    mainIngredientStock:{
    ingredientsStock:{
        page:{
            selectIngredientsStock:"Material inventory",
            materialOutbound:"Material delivery",
            returnToStorage:"Return to the warehouse",
            selectSurplusMaterials:"Waste material management",
            createOutbound:'New material delivery',
            returnToStorageCreate:'Returned warehouse addition'
        },
        materialName :'Material name',
        producer :'Place of origin',
        dateOfManufacture :'Production date',
@@ -963,13 +1068,36 @@
        returnQuantity :'Quantity returned to storage',
        materialReturnType :'Material return type',
        createTime :'Returned warehouse date',

        surplusMaterialManagement :'Waste material management',
        additionOfSurplusMaterials :'Surplus addition',
        excessMaterialOutflow :'Residual materials out of storage',
        pleaseSelectTheTypeOfReturnToStock:'Please select a return type'
    },
    mainBasicData:{
    warehouseBasicData:{
        page:{
            warehouseSearchBasicData:"Warehouse Basic Data"
        },
        BasicData :'Basic data',
        operateTypeName :'Name',
        operateType :'Another name',
        type :'Type',
        takeOut :'Take out',
    },
    stockReport:{
        page:{
            warehouseReport:"Warehouse Basic Data",
            finishedProductReport:"Finished product report",
            materialReport:"Material statement",

        },
        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',
@@ -1019,6 +1147,25 @@
        user :'User',
        role :'Role',
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price'
    },

    glassPrice:{
        glassPriceComputed:'Glass quotation',
        priceSet:'Price setting',
        priceList:'Price list',
        msg:{
            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:'glass',
        interlayer:'gum',
        hollow:'hollow',
        process:'process',
        addProduce:'Select product',
        reorder:'reorder'
    }