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

chenlu

2024-03-22 bd8f3a15f17facd2f77521da844eaf76dca22bad

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

@@ -90,7 +90,8 @@
        shape:'Shape',
        bendRadius:'Bend Radius',
        edgingType:'Edging Type',
        import:'import',
        import:'Import',
        template:'Template',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -144,6 +145,7 @@
        oldProcess:'Old Process',
        newProcess:'New Process',
        reset:'Reset',
        sure:'Sure',
    },
    workOrder:{
        workOrder:'Work Order Management',
@@ -306,6 +308,8 @@
        confirmOutbound:'Delivery Confirmation',
        confirmReceiptOfGoods:'Warehousing Confirmation',
        quantityToBeStockedIn:'Quantity To Be Stocked In',
        return:'Return',
        reverseReviewList:'Reverse Review List',

        receivedSuccessfully:'Successfully entered the warehouse',
        deliverySuccessful:"Successfully transferred out of warehouse ",
@@ -388,7 +392,7 @@
        customerName:"Customer",
        customerHomePage:'Customer Homepage',
        increaseCustomers:'Increase Customers',
        resetting:'Resetting',
        resetting:'Revoke',

    },
    delivery:{