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

skyouc

昨天 7f7491da89fdec2ccf678c104b449213ea4fdbef

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

 rsf-admin/src/i18n/en.js

@@ -979,6 +979,7 @@
                batch: "batch",
                spec: "spec",
                model: "model",
                sourceCode: "sourceCode",
            },
            stock: {
                code: "Code",

 rsf-admin/src/i18n/zh.js

@@ -1012,6 +1012,7 @@
                batch: "批次",
                spec: "规格",
                model: "型号",
                sourceCode: "源单据",
            },
            taskItemLog: {
                taskItemId: "taskItemId",

 rsf-admin/src/page/statistics/stockManage/WarehouseStockList.jsx

@@ -52,18 +52,21 @@
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-name': {
    },
    
    '& .MuiTableCell-root': {
    whiteSpace: 'nowrap',
    overflow: 'visible',
    textOverflow: 'unset'
  },
  '& .opt': {
    },
    '& .opt': {
        width: 180,
        whiteSpace: 'normal',
    }
    },
    '& .column-maktx': {        
        maxWidth: '15em',
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        whiteSpace: 'nowrap',    
    },
}));



 rsf-admin/src/page/task/TaskPanel.jsx

@@ -58,12 +58,13 @@
                        bulkActionButtons={false}
                        rowClick={false}
                        expandSingle
                        omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
                        omit={['id', 'createTime', 'createBy$', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
                    >
                        <NumberField source="id" />
                        <NumberField source="taskId" label="table.field.taskItem.taskId" />
                        <NumberField source="orderId" label="table.field.taskItem.orderId" />
                        <NumberField source="orderType$" label="table.field.taskItem.orderType" />
                        <TextField source="sourceCode" label="table.field.taskItem.sourceCode" />
                        <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" />
                        <NumberField source="matnrId" label="table.field.taskItem.matnrId" />
                        <TextField source="maktx" label="table.field.taskItem.maktx" />

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java

@@ -199,6 +199,9 @@
            return R.error("物料码为空");
        }
        Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, matnrCode));
        if (null == matnr){
            return R.error("未找到编码对应的明细");
        }
        CheckDiffItem checkDiffItem = new CheckDiffItem()
                .setMatnrCode(matnr.getCode())
                .setMaktx(matnr.getName())