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

zjj

7 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/i18n/en.js

@@ -202,10 +202,35 @@
        deviceBind: 'Device Bind',
        tasks: 'Tasks',
        wave: 'Wave Manage',

        basStation: 'BasStation',
        basContainer: 'BasContainer',
    },
    table: {
        field: {
            outBound: {
                stockWithdrawal: 'StockWithdrawal',
                withdrawal: 'Withdrawal'
            },
            basContainer: {
                containerType: 'containerType',
                codeType: 'codeType',
                areas: 'areas',
            },
            basStation: {
                stationName: 'stationName',
                inAble: 'inAble',
                outAble: 'outAble',
                useStatus: 'useStatus',
                status: 'status',
                area: 'area',
                isCrossZone: 'isCrossZone',
                crossZoneArea: 'crossZoneArea',
                isWcs: 'isWcs',
                wcsData: 'wcsData',
                containerType: 'containerType',
                barcode: 'barcode',
                autoTransfer: 'autoTransfer',
            },
            host: {

            },
@@ -603,6 +628,9 @@
                poDetlCode: "poDetlCode",
                matnrId: "matnrId",
                maktx: "maktx",
                platOrderCode: 'Customer Order Code',
                platWorkCode: 'Work Code',
                projectCode: 'Project Code',
                spec: "Spec",
                model: "Model",
                anfme: "anfme",
@@ -826,6 +854,7 @@
                taskCode: "TaskCode",
                taskStatus: "Status",
                taskType: "Type",
                warehType: "Warehouse Type",
                orgLoc: "orgLoc",
                orgSite: "orgSite",
                targLoc: "targLoc",
@@ -872,6 +901,36 @@
                batch: "batch",
                spec: "spec",
                model: "model",
            },
            stock: {
                code: "Code",
                sourceCode: "Resource",
                sourceId: "Resource ID",
                type: "Order Type",
                wkType: "Work Type",
                anfme: "Qty",
            },
            stockItem: {
                orderId: "Order ID",
                orderCode: "Order Code",
                sourceItemId: "Resource Item ID",
                matnrId: "Mat ID",
                matnrCode: "Mat Code",
                maktx: "Maktx",
                anfme: "Anfme",
                stockUnit: "Unit",
                workQty: "Work Qty",
                purQty: "Purchase Qty",
                purUnit: "Purchase Unit",
                qty: "Qty",
                splrCode: "Supplier Code",
                batch: "Batch",
                splrBatch: "Supplier Batch",
                splrName: "Supplier Name",
                trackCode: "Track Code",
                barcode: "Bar Code",
                prodTime: "Prod Time",
                packName: "Pakcage",
            },
            taskItemLog: {
                taskItemId: "taskItemId",
@@ -928,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",
@@ -952,6 +1014,7 @@
                unit: 'Unit',
                anfme: 'Stock Qty',
                matnrCode: "Matnr Code",
                warehouse: 'Warehouse',
                workQty: 'Work Qty',
                qty: 'Non Stock Qty',
                splrId: 'supplier',
@@ -1057,6 +1120,7 @@
        locInit: 'loc init',
        siteInit: 'site init',
        batch: 'batch',
        pick: 'Pick',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
@@ -1094,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",

        }

    }