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

chenlu

2024-03-18 723edfdd07208ec27409d1cffb70b9a4eac69446

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

@@ -23,6 +23,8 @@
        add:'Add',
        delete:'Delete',
        edit:'Edit',
        cancel:'cancel',
        restore:'restore',
        selectSame:'Select same',
        sameAfterwards:'Same afterwards',
        clearSelection:'Clear selection',
@@ -102,7 +104,8 @@
            importMaxCheckFailFirst:'Import ',
            importMaxCheckFailMid:' the data can not exceed ',
            importMaxCheckFailLast:' pieces, please import in multiple orders',
            updateAmountSuccessfully:'Updated amount successfully'
            updateAmountSuccessfully:'Updated amount successfully',
            updateOrderState:'Order status update succeeded',
        }

    },
@@ -302,6 +305,7 @@
        finishedProductInventory:"Finished Product Stock ",
        confirmOutbound:'Delivery Confirmation',
        confirmReceiptOfGoods:'Warehousing Confirmation',
        quantityToBeStockedIn:'Quantity To Be Stocked In',

        receivedSuccessfully:'Successfully entered the warehouse',
        deliverySuccessful:"Successfully transferred out of warehouse ",
@@ -318,6 +322,8 @@
        transferRecords:'Mutual Exchange Records',
        reworkConfirmation:'Rework Confirmation',
        reworkRecords:'Rework Records',
        warehousingRecords:'Warehousing Records',
        outboundRecords:'Outbound Records',


        pleaseSelectTheTypeOfWithdrawal:'Please select the type of withdrawal',