From f7b699b0da8aa185edeb38dc1abaaf964ba41d95 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 02 八月 2024 09:15:01 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 bd67231..537e784 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
@@ -142,10 +142,10 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(Order::getId, condition);
+ wrapper.like(Order::getOrderNo, 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);
}
}
--
Gitblit v1.9.1