#

Junjie

2024-07-30 9870b9e10e1d0abcbc91fa2840c9ed6cc2854b68

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

@@ -145,7 +145,7 @@
            wrapper.like(Order::getId, condition);
        }
        orderService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
                item -> vos.add(new KeyValVo(item.getId(), item.getOrderNo()))
        );
        return R.ok().add(vos);
    }
@@ -153,7 +153,18 @@
    @PreAuthorize("hasAuthority('asrs:order:list')")
    @PostMapping("/order/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(orderService.list(), Order.class), response);
        String ioModel = map.getOrDefault("ioModel", "").toString();
        List<Order> list = orderService.list();
        if (!Cools.isEmpty(ioModel)) {
            LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
            ArrayList<Long> types = new ArrayList<>();
            for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, ioModel.equals("in") ? 1 : 2))) {
                types.add(orderType.getId());
            }
            wrapper.in(Order::getOrderType, types);
            list = orderService.list(wrapper);
        }
        ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
    }

}