From 9d0389f521468e959e1d2803c42f69153f160c74 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 02 八月 2024 09:15:37 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 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 2802eed..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
@@ -5,8 +5,10 @@
 import com.zy.asrs.framework.common.Cools;
 import com.zy.asrs.framework.common.R;
 import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.entity.OrderType;
 import com.zy.asrs.wms.asrs.entity.param.CreateOrderParam;
 import com.zy.asrs.wms.asrs.entity.param.UpdateOrderParam;
+import com.zy.asrs.wms.asrs.service.OrderTypeService;
 import com.zy.asrs.wms.common.annotation.OperationLog;
 import com.zy.asrs.wms.common.domain.BaseParam;
 import com.zy.asrs.wms.common.domain.KeyValVo;
@@ -29,6 +31,8 @@
 
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private OrderTypeService orderTypeService;
 
     @PreAuthorize("hasAuthority('asrs:order:list')")
     @PostMapping("/order/page")
@@ -36,6 +40,56 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
         return R.ok().add(orderService.page(pageParam, pageParam.buildWrapper(true)));
+    }
+
+    @PreAuthorize("hasAuthority('asrs:order:list')")
+    @PostMapping("/order/in/page")
+    public R pageIn(@RequestBody Map<String, Object> map) {
+        String condition = map.getOrDefault("condition", "").toString();
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
+//        QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
+        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+
+        ArrayList<Long> types = new ArrayList<>();
+        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 1))) {
+            types.add(orderType.getId());
+        }
+
+        wrapper.in(Order::getOrderType, types);
+
+        if (!Cools.isEmpty(condition)) {
+            wrapper.and(wrapper1 -> {
+                wrapper1.or().like(Order::getOrderNo, condition);
+                wrapper1.or().like(Order::getMemo, condition);
+            });
+        }
+        return R.ok().add(orderService.page(pageParam, wrapper));
+    }
+
+    @PreAuthorize("hasAuthority('asrs:order:list')")
+    @PostMapping("/order/out/page")
+    public R pageOut(@RequestBody Map<String, Object> map) {
+        String condition = map.getOrDefault("condition", "").toString();
+        BaseParam baseParam = buildParam(map, BaseParam.class);
+        PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
+//        QueryWrapper<Order> wrapper = pageParam.buildWrapper(true);
+        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
+
+        ArrayList<Long> types = new ArrayList<>();
+        for (OrderType orderType : orderTypeService.list(new LambdaQueryWrapper<OrderType>().eq(OrderType::getType, 2))) {
+            types.add(orderType.getId());
+        }
+
+        wrapper.in(Order::getOrderType, types);
+
+        if (!Cools.isEmpty(condition)) {
+            wrapper.and(wrapper1 -> {
+                wrapper1.or().like(Order::getOrderNo, condition);
+                wrapper1.or().like(Order::getMemo, condition);
+            });
+        }
+        return R.ok().add(orderService.page(pageParam, wrapper));
     }
 
     @PreAuthorize("hasAuthority('asrs:order:list')")
@@ -88,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);
     }
@@ -99,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