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

skyouc

74 分钟以前 6324285c0a898885b11fdbfb9ff3f4a911d7f587

 rsf-admin/src/i18n/en.js

@@ -79,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',
@@ -330,6 +332,7 @@
                err: "error",
                result: "result",
                userId: "user",
                detail: "detail"
            },
            customer: {
                uuid: "uuid",
@@ -435,6 +438,7 @@
                col: "Col",
                lev: "Lev",
                channel: "Channel",
                startChannel: "startChannel",
                maxParts: "MaxParts",
                maxPack: "MaxPack",
                flagLabelMange: "FlagLabelMange",
@@ -602,6 +606,21 @@
                rleStatus: "Release",
                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",
@@ -835,8 +854,10 @@
                type: "type",
                exceStatus: "exceStatus",
                anfme: "anfme",
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
            },
            waveItem: {
                waveId: "waveId",
@@ -845,6 +866,7 @@
                matnrName: "matnrName",
                matnrCode: "matnrCode",
                batch: "batch",
                exceStatus: 'Exce Status',
                splrBatch: "splrBatch",
                orderCode: "orderCode",
                orderItemId: "orderItemId",
@@ -1144,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',
@@ -1158,16 +1183,20 @@
        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: {