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

zhou zhou

11 小时以前 ae70754daf7c8542677d05506b066a7499ca95ad

 rsf-admin/src/i18n/zh.js

@@ -278,7 +278,7 @@
                isWcs: '是否WCS站站点',
                wcsData: 'wcs数据',
                containerType: '容器类型',
                barcode: '条码',
                barcode: '容器编码',
                autoTransfer: '自动调拨',
            },
            host: {
@@ -465,7 +465,7 @@
                flagMix: "允许混放",
            },
            warehouseAreasItem: {
                asnCode: '单号',
                asnCode: '单据编码',
                areaId: "库区ID",
                areaName: "库区名称   ",
                matnrId: "物料标识",
@@ -1163,8 +1163,8 @@
                sourceCode: "源单据",
            },
            taskItemLog: {
                taskItemId: "taskItemId",
                taskId: "taskId",
                taskItemId: "任务明细号",
                taskId: "任务号",
                orderId: "订单ID",
                orderType: "单据类型",
                orderItemId: "订单明细ID",