Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

3 天以前 e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7

 rsf-admin/src/i18n/en.js

@@ -44,6 +44,7 @@
                main: 'Main',
                common: 'Common',
                changePwd: 'Change Password',
                insuffInventory: 'Insufficient inventory'
            },
            side: {
                title: 'More Info'
@@ -78,6 +79,8 @@
                result: 'Contacts import complete. Imported %{success} success, with %{error} errors',
            },
            loadMore: 'Load More Data',
            updateSucc: 'Update Success',
            updateFaild: 'Update Failed',
            complete: 'Complete',
            deprecate: 'Deprecate',
            stockError: 'Empty',
@@ -202,10 +205,37 @@
        deviceBind: 'Device Bind',
        tasks: 'Tasks',
        wave: 'Wave Manage',
        basStation: 'BasStation',
        basContainer: 'BasContainer',
        waveRule: 'Wave Rules',

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

            },
@@ -302,6 +332,7 @@
                err: "error",
                result: "result",
                userId: "user",
                detail: "detail"
            },
            customer: {
                uuid: "uuid",
@@ -407,6 +438,7 @@
                col: "Col",
                lev: "Lev",
                channel: "Channel",
                startChannel: "startChannel",
                maxParts: "MaxParts",
                maxPack: "MaxPack",
                flagLabelMange: "FlagLabelMange",
@@ -575,14 +607,32 @@
                ntyStatus: "Notify",
                exceStatus: 'bill status'
            },
            checkOrder: {
                code: "Check Code",
                poCode: "Po Code",
                poId: "Po Id",
                type: "Type",
                wkType: "Work Type",
                anfme: "Anfme",
                workQty: 'Work Qty',
                qty: "Qty",
                logisNo: "Logis No",
                arrTime: "arrived Time",
                rleStatus: "释放状态",
                ntyStatus: "上报状态",
                exceStatus: '单据状态'
            },
            outStockItem: {
                asnId: "ID",
                asnCode: "DO Code",
                asnCode: "Out Code",
                poCode: 'DO Code',
                poDetlId: "poDetlId",
                poDetlCode: "DO Detl Code",
                matnrId: "matnrId",
                maktx: "maktx",
                workQty: 'Work Qty',
                anfme: "anfme",
                platOrderCode: 'Customer Code',
                stockUnit: "stockUnit",
                purQty: "purQty",
                purUnit: "purUnit",
@@ -603,6 +653,9 @@
                poDetlCode: "poDetlCode",
                matnrId: "matnrId",
                maktx: "maktx",
                platOrderCode: 'Customer Order Code',
                platWorkCode: 'Work Code',
                projectCode: 'Project Code',
                spec: "Spec",
                model: "Model",
                anfme: "anfme",
@@ -616,7 +669,7 @@
                disQty: 'Def Qty',
                splrCode: "splrCode",
                splrName: "splrName",
                isptResult: "Ispt Result",
                isptStatus: "Ispt Status",
                qrcode: "qrcode",
                barcode: "barcode",
                packName: "packName",
@@ -698,7 +751,8 @@
                fieldsIndex: "fieldsIndex",
                unit: "unit",
                anfme: "anfme",
                qty: "qty",
                workQty: 'Work Qty',
                qty: "Qty",
                nromQty: "nromQty",
                printQty: "printQty",
                splrName: "splrName",
@@ -743,6 +797,7 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                channel: "channel",
            },
            waitPakin: {
                code: "code",
@@ -799,8 +854,10 @@
                type: "type",
                exceStatus: "exceStatus",
                anfme: "anfme",
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
            },
            waveItem: {
                waveId: "waveId",
@@ -809,6 +866,7 @@
                matnrName: "matnrName",
                matnrCode: "matnrCode",
                batch: "batch",
                exceStatus: 'Exce Status',
                splrBatch: "splrBatch",
                orderCode: "orderCode",
                orderItemId: "orderItemId",
@@ -826,6 +884,7 @@
                taskCode: "TaskCode",
                taskStatus: "Status",
                taskType: "Type",
                warehType: "Warehouse Type",
                orgLoc: "orgLoc",
                orgSite: "orgSite",
                targLoc: "targLoc",
@@ -860,6 +919,7 @@
            taskItem: {
                taskId: "taskId",
                orderId: "orderId",
                wkType: 'Work Type',
                orderType: "orderType",
                orderItemId: "orderItemId",
                sourceCode: "sourceCode",
@@ -872,6 +932,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 +1018,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",
@@ -942,7 +1035,6 @@
            warehouseStock: {
                locId: "Loc ID",
                locCode: "Code",
                warehouse: 'Warehouse',
                orderId: "Order Id",
                type: "Type",
                orderItemId: "Order Detail ID",
@@ -972,6 +1064,11 @@
                typeId: "typeId",
                beSimilar: "beSimilar",
                emptySimilar: "emptySimilar",
            },
            waveRule: {
                code: "code",
                type: "type",
                name: "name",
            },
        }
    },
@@ -1058,6 +1155,8 @@
        locInit: 'loc init',
        siteInit: 'site init',
        batch: 'batch',
        pick: 'Pick',
        check: 'Check',
        confirm: 'confirm',
        cancel: "cancel",
        query: "Query",
@@ -1067,6 +1166,9 @@
        selectSite: 'Select Site',
        top: "top",
        resort: "sort",
        start: 'Start',
        stopPub: 'Stop Pub',
        pause: 'Pause',
        subzone: 'subzone',
        bindmatnr: 'bind matnr',
        bindloc: 'bind loc',
@@ -1081,20 +1183,27 @@
        orderPrint: 'Orders Print',
        quality: "quality",
        complete: "complete",
        allComfirm: 'All Comfirm',
        verifyComfirm: 'Verify Comfirm',
        close: "close",
        asnCreate: "Create By Order",
        poCreate: "Create By PO",
        createTask: "createTask",
        publicWorking: 'Public Working',
        continuePub: 'Continue Public',
        recover: "recover",
        createWave: "Create Wave",
        order: 'Orders',
        modiftySite: 'Modify SiteNo',
        selectWave: 'Select Wave Rule',

    },
    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",

        }

    }