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

@@ -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',
@@ -273,6 +275,7 @@

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

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

    },

@@ -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:{
@@ -411,6 +416,7 @@
        composingOk:'Can Be Typesetter',
        composingNo:'Non Typesetting',
        typesetter:'typesetter',
        revoke:'撤销可排版',
        scheduledStartTime:'Scheduled Start Time',
        planEndTime:'Plan End Time',
        customerId:'Customer Id',
@@ -432,6 +438,7 @@
        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',
@@ -463,6 +470,8 @@

        mergeState:'Merge State',
        merge:'Merge',
        printQuantity:'Print Quantity',
        printWarn1:'The print quantity cannot be greater than the order quantity'
    },
    reportingWorks:{
        page:{
@@ -569,6 +578,7 @@
        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:{
@@ -719,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',
@@ -869,6 +879,8 @@
        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:{
@@ -947,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',
@@ -1137,6 +1149,7 @@
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price'
    },

    glassPrice:{
        glassPriceComputed:'Glass quotation',
        priceSet:'Price setting',