From 424a19bf101e901e82703be17b6fb5be0f598942 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 29 七月 2024 16:21:45 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/order/index.vue | 4 +++-
zy-asrs-admin/src/views/in/order/index.vue | 2 +-
zy-asrs-admin/src/views/out/order/index.vue | 17 +++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 13 ++++++++++++-
4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/index.vue b/zy-asrs-admin/src/components/order/index.vue
index 09f2cc0..cb1076e 100644
--- a/zy-asrs-admin/src/components/order/index.vue
+++ b/zy-asrs-admin/src/components/order/index.vue
@@ -186,7 +186,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/order/export', {}).then(result => {
+ postBlob('/api/order/export', {
+ ioModel: props.ioModel
+ }).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
diff --git a/zy-asrs-admin/src/views/in/order/index.vue b/zy-asrs-admin/src/views/in/order/index.vue
index 0430a4f..1389dd2 100644
--- a/zy-asrs-admin/src/views/in/order/index.vue
+++ b/zy-asrs-admin/src/views/in/order/index.vue
@@ -4,7 +4,7 @@
<script>
export default {
- name: '璁㈠崟'
+ name: '鍏ュ簱璁㈠崟'
}
</script>
diff --git a/zy-asrs-admin/src/views/out/order/index.vue b/zy-asrs-admin/src/views/out/order/index.vue
new file mode 100644
index 0000000..217c437
--- /dev/null
+++ b/zy-asrs-admin/src/views/out/order/index.vue
@@ -0,0 +1,17 @@
+<script setup>
+import OrderView from '@/components/order/index.vue';
+</script>
+
+<script>
+export default {
+ name: '鍑哄簱璁㈠崟'
+}
+</script>
+
+<template>
+ <div>
+ <OrderView ioModel="out" />
+ </div>
+</template>
+
+<style></style>
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..b2f8209 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
@@ -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