Merge remote-tracking branch 'origin/devlop' into devlop

zjj

7 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/i18n/en.js

@@ -207,8 +207,12 @@
    },
    table: {
        field: {
            outBound: {
                stockWithdrawal: 'StockWithdrawal',
                withdrawal: 'Withdrawal'
            },
            basContainer: {
                containerType:'containerType',
                containerType: 'containerType',
                codeType: 'codeType',
                areas: 'areas',
            },
@@ -224,8 +228,8 @@
                isWcs: 'isWcs',
                wcsData: 'wcsData',
                containerType: 'containerType',
                barcode: 'barcode',  
                autoTransfer: 'autoTransfer',          
                barcode: 'barcode',
                autoTransfer: 'autoTransfer',
            },
            host: {

@@ -983,11 +987,14 @@
                wkType: "wkType",
                aggType: "Agg Type",
                matnrId: "matnrId",
                wareArea: 'Warehouse Areas',
                maktx: "maktx",
                matnrCode: "matnrCode",
                trackCode: "trackCode",
                unit: "unit",
                anfme: "anfme",
                qty: 'Qty',
                workQty: 'Work Qty',
                batch: "batch",
                splrBatch: "splrBatch",
                spec: "spec",
@@ -1113,6 +1120,7 @@
        locInit: 'loc init',
        siteInit: 'site init',
        batch: 'batch',
        pick: 'Pick',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
@@ -1150,6 +1158,8 @@
        error: {
            stock: "Insufficient inventory to deliver ！！",
            select_error_order: "Please Select Asn Orders",
            out_stock_qty: "The outbound quantity cannot be greater than the inventory quantity",

        }

    }