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

1

5 天以前 b8a67d701995d8b578e7c87617a5b8cd9b13a9db

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java

@@ -107,10 +107,10 @@
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(WkOrderItem::getAsnCode, condition);
            wrapper.like(WkOrderItem::getOrderCode, condition);
        }
        checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
                item -> vos.add(new KeyValVo(item.getId(), item.getOrderCode()))
        );
        return R.ok().add(vos);
    }