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

skyouc

1 天以前 d51f64c1f0105d4b18aa8344c11e47827730a40c

 rsf-admin/src/i18n/en.js

@@ -214,6 +214,7 @@
        locRevise: 'Loc Revise',
        statisticReport: 'Statistical Report',
        locDeadReport: 'Locs Dead Report',
        stockStatistic: 'Stock Statistic',
    },
    table: {
        field: {
@@ -825,6 +826,18 @@
                startTime: "startTime",
                endTime: "endTime",
            },
          stockStatistic: {
            id: "id",
            dayTime: "dayTime",
            taskType: "taskType",
            taskStatus: "taskStatus",
            maktx: "maktx",
            matnrCode: "matnrCode",
            count: "count",
            batch: "batch",
            anfme: "anfme",
            unit: "unit",
          },
            delivery: {
                code: "code",
                platId: "platId",
@@ -1032,7 +1045,6 @@
                wkType: 'Work Type',
                orderType: "orderType",
                orderItemId: "orderItemId",
                sourceCode: "sourceCode",
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",