Merge branch 'master' of http://47.97.1.152:5880/r/zy-asrs-master

luxiaotao1123

2023-12-30 f28b3a9131d2313a889f4a3156dcfabcefce7a84

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java

@@ -124,7 +124,7 @@
        LambdaQueryWrapper<Mat> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Mat::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(Mat::getId, condition);
            wrapper.like(Mat::getMatnr, condition);
        }
        matService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(item.getMatnr(), item.getId())));
        return R.ok().add(vos);