From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期六, 08 三月 2025 09:06:55 +0800 Subject: [PATCH] CUT库条码T开头,截取后10位 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java index 4612928..cf8751e 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java +++ b/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)); } -- Gitblit v1.9.1