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',
@@ -204,6 +207,8 @@
        wave: 'Wave Manage',
        basStation: 'BasStation',
        basContainer: 'BasContainer',
        waveRule: 'Wave Rules',

    },
    table: {
        field: {
@@ -327,6 +332,7 @@
                err: "error",
                result: "result",
                userId: "user",
                detail: "detail"
            },
            customer: {
                uuid: "uuid",
@@ -432,6 +438,7 @@
                col: "Col",
                lev: "Lev",
                channel: "Channel",
                startChannel: "startChannel",
                maxParts: "MaxParts",
                maxPack: "MaxPack",
                flagLabelMange: "FlagLabelMange",
@@ -600,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",
@@ -644,7 +669,7 @@
                disQty: 'Def Qty',
                splrCode: "splrCode",
                splrName: "splrName",
                isptResult: "Ispt Result",
                isptStatus: "Ispt Status",
                qrcode: "qrcode",
                barcode: "barcode",
                packName: "packName",
@@ -726,7 +751,8 @@
                fieldsIndex: "fieldsIndex",
                unit: "unit",
                anfme: "anfme",
                qty: "qty",
                workQty: 'Work Qty',
                qty: "Qty",
                nromQty: "nromQty",
                printQty: "printQty",
                splrName: "splrName",
@@ -771,7 +797,6 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                wcsCode: "wcsCode",
                channel: "channel",
            },
            waitPakin: {
@@ -829,8 +854,10 @@
                type: "type",
                exceStatus: "exceStatus",
                anfme: "anfme",
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
            },
            waveItem: {
                waveId: "waveId",
@@ -839,6 +866,7 @@
                matnrName: "matnrName",
                matnrCode: "matnrCode",
                batch: "batch",
                exceStatus: 'Exce Status',
                splrBatch: "splrBatch",
                orderCode: "orderCode",
                orderItemId: "orderItemId",
@@ -891,6 +919,7 @@
            taskItem: {
                taskId: "taskId",
                orderId: "orderId",
                wkType: 'Work Type',
                orderType: "orderType",
                orderItemId: "orderItemId",
                sourceCode: "sourceCode",
@@ -1006,7 +1035,6 @@
            warehouseStock: {
                locId: "Loc ID",
                locCode: "Code",
                warehouse: 'Warehouse',
                orderId: "Order Id",
                type: "Type",
                orderItemId: "Order Detail ID",
@@ -1036,6 +1064,11 @@
                typeId: "typeId",
                beSimilar: "beSimilar",
                emptySimilar: "emptySimilar",
            },
            waveRule: {
                code: "code",
                type: "type",
                name: "name",
            },
        }
    },
@@ -1133,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',
@@ -1147,14 +1183,19 @@
        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: {