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

zjj

6 天以前 eab76cd34bff799686f68e6b70f86c9001e4913f

 rsf-admin/src/i18n/en.js

@@ -11,6 +11,8 @@
        },
        button: {
            edit: "Edit",
            detail: "Details",
            histories: "Histories",
        },
        field: {
            id: 'ID',
@@ -24,8 +26,15 @@
            memoWrap: 'memo wrap',
            memo: 'memo',
            opt: 'operate',
            supplier: 'Supplier',
            customer: 'Customer',
            shipper: 'Shipper',
            partners: 'Strategic Partners',
        },
        list: {
            titles: {
                stockInfo: 'Stock Details',
            },
            empty: {
                tip: 'No data to display',
            }
@@ -56,6 +65,7 @@
            expand: 'Expand',
            expandAll: 'Expand All',
            collapse: 'Collapse',
            newAddMats: 'New Mats',
            collapseAll: 'Collapse All',
            scope: 'Assign',
            import: {
@@ -70,9 +80,13 @@
            loadMore: 'Load More Data',
            complete: 'Complete',
            deprecate: 'Deprecate',
            stockError: 'Empty',
            inputPlaceholder: 'Use commas to separate',
            resend: 'RESEND',
            selected: 'selected',
            batch: 'batch'
            batch: 'batch',
            batchSafe: 'Bulk Safe',
            batchDef: 'Bulk Def',
        },
        msg: {
            confirm: {
@@ -81,6 +95,14 @@
            },
            placeholder: 'Please enter your search content',
        },
        aside: {
            category: 'Category',
            material: 'Material（default）',
            supplier: 'Supplier',
            warehouse: 'Warehouse',
            batch: 'Batch',
            dynamicFields: 'Dynamic Fields'
        }
    },
    filters: {
        lastCreated: 'Last created',
@@ -167,17 +189,48 @@
        stock: 'Stock Manage',
        histories: 'Histories',
        wareWork: 'Warehouse Working',
        statistics: 'Statistics',
        statistics: 'Stock Statistics',
        logs: 'Logs',
        permissions: 'Permissions',
        delivery: 'Delivery',
        outStock: 'Out Stock',
        stockManage: 'Stock Manage',
        outStockItem: 'Out Stock Item',
        inStockPoces: 'In Stock Pocess',
        outStockPoces: 'Out Stock Pocess',
        warehouseStock: 'Instant Inventory',
        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: {

            },
@@ -339,6 +392,7 @@
                flagMix: "flagMix",
            },
            warehouseAreasItem: {
                asnCode: 'Order NO.',
                areaId: "areaId",
                areaName: "areaName",
                matnrId: "matnrId",
@@ -347,6 +401,9 @@
                fieldsIndex: "fieldsIndex",
                barcode: "barcode",
                anfme: "anfme",
                isptResult: 'Ispt Result',
                workQty: 'Work Qty',
                qty: 'Available',
                batch: "batch",
                unit: "unit",
                stockUnit: "stockUnit",
@@ -455,6 +512,7 @@
                rcptQty: "rcptQty",
                dlyQty: "dlyQty",
                disQty: "disQty",
                anfme: 'anfme',
                safeQty: "safeQty",
                picPath: "picPath",
                trackCode: "trackCode",
@@ -470,6 +528,7 @@
                value: "value",
                label: "label",
                sort: "sort",
                group: "Group",
                color: "color",
            },
            companys: {
@@ -527,11 +586,25 @@
                ntyStatus: "Notify",
                exceStatus: 'bill status'
            },
            asnOrderItem: {
                asnId: "asnId",
                asnCode: "asnCode",
            outStock: {
                code: "Code",
                poCode: "poCode",
                poId: "doId",
                type: "Type",
                wkType: "wkType",
                anfme: "anfme",
                qty: "qty",
                logisNo: "logisNo",
                arrTime: "Arrived",
                rleStatus: "Release",
                ntyStatus: "Notify",
                exceStatus: 'bill status'
            },
            outStockItem: {
                asnId: "ID",
                asnCode: "DO Code",
                poDetlId: "poDetlId",
                poDetlCode: "poDetlCode",
                poDetlCode: "DO Detl Code",
                matnrId: "matnrId",
                maktx: "maktx",
                anfme: "anfme",
@@ -546,6 +619,36 @@
                packName: "packName",
                ntyStatus: "ntyStatus",
                platItemId: 'platItemId'
            },
            asnOrderItem: {
                asnId: "asnId",
                asnCode: "asnCode",
                poDetlId: "poDetlId",
                platItemId: 'platItemId',
                poDetlCode: "poDetlCode",
                matnrId: "matnrId",
                maktx: "maktx",
                platOrderCode: 'Customer Order Code',
                platWorkCode: 'Work Code',
                projectCode: 'Project Code',
                spec: "Spec",
                model: "Model",
                anfme: "anfme",
                stockUnit: "stockUnit",
                purQty: "purQty",
                isptResult: "Ispt Result",
                purUnit: "purUnit",
                unit: 'Unit',
                qty: "qty",
                safeQty: 'Safe Qty',
                disQty: 'Def Qty',
                splrCode: "splrCode",
                splrName: "splrName",
                isptResult: "Ispt Result",
                qrcode: "qrcode",
                barcode: "barcode",
                packName: "packName",
                ntyStatus: "ntyStatus",
            },
            asnOrderLog: {
                code: "code",
@@ -616,6 +719,7 @@
            },
            deliveryItem: {
                deliveryId: "deliveryId",
                deliveryCode: "Delivery Code",
                platItemId: "platItemId",
                matnrCode: "matnrCode",
                matnrName: "matnrName",
@@ -667,7 +771,6 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                sites: "sites",
            },
            waitPakin: {
                code: "code",
@@ -687,6 +790,7 @@
                asnCode: "asnCode",
                asnItemId: "asnItemId",
                trackCode: "trackCode",
                isptResult: 'Ispt Result',
                anfme: "anfme",
                workQty: "workQty",
                unit: "unit",
@@ -718,10 +822,39 @@
                qty: "qty",
                batch: "batch",
            },
            wave: {
                code: "code",
                type: "type",
                exceStatus: "exceStatus",
                anfme: "anfme",
                qty: "qty",
                orderNum: "orderNum",
            },
            waveItem: {
                waveId: "waveId",
                waveCode: "waveCode",
                matnrId: "matnrId",
                matnrName: "matnrName",
                matnrCode: "matnrCode",
                batch: "batch",
                splrBatch: "splrBatch",
                orderCode: "orderCode",
                orderItemId: "orderItemId",
                unit: "unit",
                trackCode: "trackCode",
                fieldsIndex: "fieldsIndex",
                anfme: "anfme",
                workQty: "workQty",
                qty: "Qty",
                stockLocs: "Stock Locs",
                stockQty: "Stock Qty",

            },
            task: {
                taskCode: "TaskCode",
                taskStatus: "Status",
                taskType: "Type",
                warehType: "Warehouse Type",
                orgLoc: "orgLoc",
                orgSite: "orgSite",
                targLoc: "targLoc",
@@ -762,11 +895,42 @@
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",
                isptResult: 'Ispt Result',
                unit: "unit",
                anfme: "anfme",
                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",
@@ -821,17 +985,55 @@
                type: "type",
                orderItemId: "orderItemId",
                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",
                model: "model",
                fieldsIndex: "fieldsIndex",
            },
            warehouseStock: {
                locId: "Loc ID",
                locCode: "Code",
                warehouse: 'Warehouse',
                orderId: "Order Id",
                type: "Type",
                orderItemId: "Order Detail ID",
                wkType: "Work Type",
                matnrId: "Matnr Id",
                maktx: "Mats Name",
                unit: 'Unit',
                anfme: 'Stock Qty',
                matnrCode: "Matnr Code",
                warehouse: 'Warehouse',
                workQty: 'Work Qty',
                qty: 'Non Stock Qty',
                splrId: 'supplier',
                batch: "Supplier Batch",
                spec: "Spec",
                model: "Model",
                fieldsIndex: "Fields Index",
            },
            deviceBind: {
                currentRow: "currentRow",
                startRow: "startRow",
                endRow: "endRow",
                deviceQty: "deviceQty",
                startDeviceNo: "startDeviceNo",
                endDeviceNo: "endDeviceNo",
                staList: "staList",
                typeId: "typeId",
                beSimilar: "beSimilar",
                emptySimilar: "emptySimilar",
            },
        }
    },
@@ -918,6 +1120,7 @@
        locInit: 'loc init',
        siteInit: 'site init',
        batch: 'batch',
        pick: 'Pick',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
@@ -938,15 +1141,29 @@
        batchWarehouseAreas: "batchWarehouseAreas",
        batchLocType: "batchLocType",
        batchPrint: "batch print",
        orderPrint: 'Orders Print',
        quality: "quality",
        complete: "complete",
        verifyComfirm: 'Verify Comfirm',
        close: "close",
        asnCreate: "Create By Order",
        poCreate: "Create By PO",
        createTask: "createTask",
        recover: "recover",
        createWave: "Create Wave",
        order: 'Orders',

    },
    request: {
        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",

        }

    }

};

export default customEnglishMessages;