#

pang.jiabao

2025-03-01 bb28c2f09f7fa36b8b80f9d19f23631623b80d1c

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

@@ -64,7 +64,7 @@
        QueryWrapper<Order> wrapper = new QueryWrapper<>();



        ArrayList<Long> types = new ArrayList<>();

        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {

        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().in(OrderType::getType, 1))) {

            types.add(orderType.getId());

        }



@@ -88,13 +88,14 @@
                }

            }

        }

        wrapper.orderByDesc("create_time");



        return R.ok().add(orderService.page(pageParam, wrapper));

    }



    @PreAuthorize("hasAuthority('asrs:order:list')")

    @PostMapping("/order/out/page")

    @CacheData(tableName = {"man_order", "man_order_type"})

//    @CacheData(tableName = {"man_order", "man_order_type"})

    public R pageOut(@RequestBody Map<String, Object> map) {

        String condition = map.getOrDefault("condition", "").toString();

        BaseParam baseParam = buildParam(map, BaseParam.class);

@@ -131,20 +132,20 @@
                }

            }

        }



        wrapper.orderByDesc("create_time");

        return R.ok().add(orderService.page(pageParam, wrapper));

    }



    @PreAuthorize("hasAuthority('asrs:order:list')")

    @PostMapping("/order/list")

    @CacheData(tableName = {"man_order"})

//    @CacheData(tableName = {"man_order"})

    public R list(@RequestBody Map<String, Object> map) {

        return R.ok().add(orderService.list());

    }



    @PreAuthorize("hasAuthority('asrs:order:list')")

    @GetMapping("/order/{id}")

    @CacheData(tableName = {"man_order"})

//    @CacheData(tableName = {"man_order"})

    public R get(@PathVariable("id") Long id) {

        return R.ok().add(orderService.getById(id));

    }