From 5f14e63a2400456055086632e027951086114648 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 06 十二月 2024 15:07:04 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlLogController.java | 6
zy-asrs-admin/src/views/loc/loc/index.vue | 5
zy-asrs-admin/src/views/base/loc/index.vue | 5
zy-asrs-admin/src/views/log/viewStayTime/index.vue | 4
zy-asrs-admin/src/components/order/order/order.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserLoginController.java | 6
zy-asrs-admin/src/views/in/waitPakin/index.vue | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlController.java | 6
zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue | 4
zy-asrs-admin/src/components/order/order/orderIn.vue | 4
zy-asrs-admin/src/views/log/viewInOut/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/OperationRecordController.java | 6
zy-asrs-admin/src/views/task/task/index.vue | 5
zy-asrs-framework/src/main/resources/templates/vue/Controller.txt | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java | 6
zy-asrs-admin/src/views/system/operationRecord/index.vue | 4
zy-asrs-admin/src/views/log/viewWorkIn/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 6
zy-asrs-admin/src/views/task/taskLog/index.vue | 5
zy-asrs-admin/src/views/system/language/index.vue | 4
zy-asrs-admin/src/views/system/userLogin/index.vue | 4
zy-asrs-admin/src/views/system/cacheStatistics/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheStatisticsController.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 13 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java | 7
zy-asrs-admin/src/components/orderLog/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java | 6
zy-asrs-framework/src/main/resources/templates/vue/Index.txt | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java | 7
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java | 7
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java | 7
zy-asrs-admin/src/views/log/viewWorkOut/index.vue | 4
zy-asrs-admin/src/views/order/orderLog/index.vue | 4
zy-asrs-admin/src/views/task/taskDetl/index.vue | 4
zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java | 7
zy-asrs-admin/src/views/in/waitPakinLog/index.vue | 5
zy-asrs-admin/src/views/order/orderDetl/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java | 19 ++
zy-asrs-admin/src/views/base/mat/index.vue | 84 ++++++------
zy-asrs-admin/src/views/order/orderDetlLog/index.vue | 4
zy-asrs-admin/src/views/task/taskDetlLog/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 6
zy-asrs-admin/src/components/order/order/orderOut.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.java | 6
zy-asrs-admin/src/views/loc/locDetl/index.vue | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java | 6
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java | 7
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java | 6
52 files changed, 261 insertions(+), 108 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/order.vue b/zy-asrs-admin/src/components/order/order/order.vue
index cf763ec..e991808 100644
--- a/zy-asrs-admin/src/components/order/order/order.vue
+++ b/zy-asrs-admin/src/components/order/order/order.vue
@@ -212,7 +212,9 @@
const handleExport = async (intl) => {
postBlob('/api/order/export', {
- ioModel: props.ioModel
+ ioModel: props.ioModel,
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index 0b9c6f4..2da2d10 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -218,7 +218,9 @@
const handleExport = async (intl) => {
postBlob('/api/order/export', {
- ioModel: props.ioModel
+ ioModel: props.ioModel,
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
diff --git a/zy-asrs-admin/src/components/order/order/orderOut.vue b/zy-asrs-admin/src/components/order/order/orderOut.vue
index 0203e01..91df9f7 100644
--- a/zy-asrs-admin/src/components/order/order/orderOut.vue
+++ b/zy-asrs-admin/src/components/order/order/orderOut.vue
@@ -227,7 +227,9 @@
const handleExport = async (intl) => {
postBlob('/api/order/export', {
- ioModel: props.ioModel
+ ioModel: props.ioModel,
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 6664ec4..8bd0a0e 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -199,7 +199,9 @@
const handleExport = async (intl) => {
postBlob('/api/orderLog/export', {
- ioModel: props.ioModel
+ ioModel: props.ioModel,
+ condition: searchInput.value,
+ _param: searchParam.value,
}).then(result => {
const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index 88e598a..e3cb67b 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -216,7 +216,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/loc/export', {}).then(result => {
+ postBlob('/api/loc/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index 9d9a868..e6e6de7 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -1,11 +1,11 @@
<script setup>
-import {getCurrentInstance, ref, computed, reactive} from 'vue';
-import {useRouter} from "vue-router";
-import {get, post, postBlob, postForm} from '@/utils/request.js'
-import {message, Modal} from 'ant-design-vue';
-import {globalState, logout} from '@/config.js';
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { globalState, logout } from '@/config.js';
import EditView from './edit.vue'
-import {formatMessage} from '@/utils/localeUtils.js';
+import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
import MatPrint from '@/components/print/matPrint/index.vue';
import {
@@ -414,8 +414,11 @@
}
const handleExport = async (intl) => {
- postBlob('/api/mat/export', {}).then(result => {
- const blob = new Blob([result.data], {type: 'application/vnd.ms-excel'});
+ postBlob('/api/mat/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
})
@@ -465,7 +468,7 @@
const exportTemplate = () => {
//妯℃澘瀵煎嚭
postBlob('/api/mat/exportTemplate', {}).then(result => {
- const blob = new Blob([result.data], {type: 'application/vnd.ms-excel'});
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
window.location.href = window.URL.createObjectURL(blob);
return true;
})
@@ -490,20 +493,20 @@
};
const handlePrint = () => {
- if (state.selectedRowKeys.length == 0) {
- message.warning(formatMessage('common.select', '璇烽�夋嫨'));
- return;
+ if (state.selectedRowKeys.length == 0) {
+ message.warning(formatMessage('common.select', '璇烽�夋嫨'));
+ return;
+ }
+ let data = tableData.value.records;
+ let tmp = [];
+ data.forEach((item) => {
+ if (state.selectedRowKeys.indexOf(item.id) != -1) {
+ tmp.push(item);
}
- let data = tableData.value.records;
- let tmp = [];
- data.forEach((item) => {
- if (state.selectedRowKeys.indexOf(item.id) != -1) {
- tmp.push(item);
- }
- })
+ })
- printChild.value.printData = tmp;
- printChild.value.open = true;
+ printChild.value.printData = tmp;
+ printChild.value.open = true;
}
</script>
@@ -516,22 +519,20 @@
<template>
<div>
- <EditView ref="editChild" @tableReload="handleTableReload"/>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
<div class="table-header">
<div>
- <a-input v-model:value="searchParam.matnr"
- :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
- style="width: 140px;margin-right: 10px;"/>
- <a-input v-model:value="searchParam.maktx"
- :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佸悕绉�')"
- style="width: 140px;margin-right: 10px;"/>
+ <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')"
+ style="width: 140px;margin-right: 10px;" />
+ <a-input v-model:value="searchParam.maktx" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ晢鍝佸悕绉�')"
+ style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.specs" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ヨ鏍�')"
- style="width: 140px;margin-right: 10px;"/>
+ style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.model" :placeholder="formatMessage('page.mat.matnr.input', '璇疯緭鍏ュ瀷鍙�')"
- style="width: 140px;margin-right: 10px;"/>
+ style="width: 140px;margin-right: 10px;" />
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
- style="width: 200px;" @search="onSearch"/>
+ style="width: 200px;" @search="onSearch" />
</div>
<div class="table-header-right">
<a-dropdown>
@@ -539,23 +540,23 @@
<a-menu @click="handleSyncMatClick">
<a-menu-item key="import">
<a-upload v-model:file-list="fileList" name="file" action="/api/mat/upload" @change="handleUploadChange"
- :showUploadList="false" :headers="{
+ :showUploadList="false" :headers="{
Authorization: globalState.token
}">
- <UploadOutlined/>
+ <UploadOutlined />
{{ formatMessage('page.mat.import', '鍟嗗搧瀵煎叆') }}
</a-upload>
</a-menu-item>
<a-menu-item key="export">
- <DownloadOutlined/>
+ <DownloadOutlined />
{{ formatMessage('page.mat.export.template', '瀵煎嚭妯℃澘') }}
</a-menu-item>
</a-menu>
</template>
<a-button>
{{ formatMessage('page.mat.sync', '鏁版嵁鍚屾') }}
- <DownOutlined/>
+ <DownOutlined />
</a-button>
</a-dropdown>
<a-button @click="handlePrint()" type="primary">
@@ -566,17 +567,16 @@
</div>
</div>
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
- :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
- :pagination="{ total: tableData.total, showTotal: showTotalPage, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns"
- @resizeColumn="handleResizeColumn"
- :loading="state.loading">
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, showTotal: showTotalPage, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn"
+ :loading="state.loading">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
<a-button type="link" primary @click="handleEdit(record)">{{
- formatMessage('page.edit', '缂栬緫')
- }}
+ formatMessage('page.edit', '缂栬緫')
+ }}
</a-button>
<a-button type="link" danger @click="handleDel([record])">
{{ formatMessage('page.delete', '鍒犻櫎') }}
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index 798f10b..679eab7 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -217,7 +217,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/waitPakin/export', {}).then(result => {
+ postBlob('/api/waitPakin/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/waitPakinLog/index.vue b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
index 3503397..f1fafee 100644
--- a/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakinLog/index.vue
@@ -208,7 +208,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/waitPakinLog/export', {}).then(result => {
+ postBlob('/api/waitPakinLog/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/loc/loc/index.vue b/zy-asrs-admin/src/views/loc/loc/index.vue
index 60be1f0..6ded786 100644
--- a/zy-asrs-admin/src/views/loc/loc/index.vue
+++ b/zy-asrs-admin/src/views/loc/loc/index.vue
@@ -219,7 +219,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/loc/export', {}).then(result => {
+ postBlob('/api/loc/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 7eb6382..d15f07e 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -247,7 +247,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/locDetl/export', {}).then(result => {
+ postBlob('/api/locDetl/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/log/viewInOut/index.vue b/zy-asrs-admin/src/views/log/viewInOut/index.vue
index ec295c0..d3b7859 100644
--- a/zy-asrs-admin/src/views/log/viewInOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewInOut/index.vue
@@ -98,7 +98,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewInOut/export', {}).then(result => {
+ postBlob('/api/viewInOut/export', {
+ condition: searchInput.value
+ }).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/log/viewStayTime/index.vue b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
index 9c957e6..5cf52cc 100644
--- a/zy-asrs-admin/src/views/log/viewStayTime/index.vue
+++ b/zy-asrs-admin/src/views/log/viewStayTime/index.vue
@@ -154,7 +154,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewStayTime/export', {}).then(result => {
+ postBlob('/api/viewStayTime/export', {
+ condition: searchInput.value
+ }).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/log/viewWorkCountIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
index 427d6e4..f6f2cfe 100644
--- a/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkCountIn/index.vue
@@ -98,7 +98,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewWorkCountIn/export', {}).then(result => {
+ postBlob('/api/viewWorkCountIn/export', {
+ condition: searchInput.value
+ }).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/log/viewWorkCountOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
index 6c8f45e..b9bd116 100644
--- a/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkCountOut/index.vue
@@ -98,7 +98,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewWorkCountOut/export', {}).then(result => {
+ postBlob('/api/viewWorkCountOut/export', {
+ condition: searchInput.value
+ }).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/log/viewWorkIn/index.vue b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
index 3254c6a..ed39017 100644
--- a/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkIn/index.vue
@@ -149,7 +149,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewWorkIn/export', {}).then(result => {
+ postBlob('/api/viewWorkIn/export', {
+ condition: searchInput.value
+ }).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/log/viewWorkOut/index.vue b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
index 9772b92..d80fbc6 100644
--- a/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
+++ b/zy-asrs-admin/src/views/log/viewWorkOut/index.vue
@@ -149,7 +149,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/viewWorkOut/export', {}).then(result => {
+ postBlob('/api/viewWorkOut/export', {
+ condition: searchInput.value
+ }).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/order/orderDetl/index.vue b/zy-asrs-admin/src/views/order/orderDetl/index.vue
index 3351972..9d34050 100644
--- a/zy-asrs-admin/src/views/order/orderDetl/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetl/index.vue
@@ -201,7 +201,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/orderDetl/export', {}).then(result => {
+ postBlob('/api/orderDetl/export', {
+ condition: searchInput.value
+ }).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/order/orderDetlLog/index.vue b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
index 16b2661..571895b 100644
--- a/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetlLog/index.vue
@@ -201,7 +201,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/orderDetlLog/export', {}).then(result => {
+ postBlob('/api/orderDetlLog/export', {
+ condition: searchInput.value
+ }).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/order/orderLog/index.vue b/zy-asrs-admin/src/views/order/orderLog/index.vue
index 4b39b39..bcbc764 100644
--- a/zy-asrs-admin/src/views/order/orderLog/index.vue
+++ b/zy-asrs-admin/src/views/order/orderLog/index.vue
@@ -187,7 +187,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/orderLog/export', {}).then(result => {
+ postBlob('/api/orderLog/export', {
+ condition: searchInput.value
+ }).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/system/cacheStatistics/index.vue b/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
index 28c71f9..bcaf332 100644
--- a/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
+++ b/zy-asrs-admin/src/views/system/cacheStatistics/index.vue
@@ -180,7 +180,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/cacheStatistics/export', {}).then(result => {
+ postBlob('/api/cacheStatistics/export', {
+ condition: searchInput.value
+ }).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/system/language/index.vue b/zy-asrs-admin/src/views/system/language/index.vue
index 980687a..5bcc9cd 100644
--- a/zy-asrs-admin/src/views/system/language/index.vue
+++ b/zy-asrs-admin/src/views/system/language/index.vue
@@ -151,7 +151,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/language/export', {}).then(result => {
+ postBlob('/api/language/export', {
+ condition: searchInput.value
+ }).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/system/operationRecord/index.vue b/zy-asrs-admin/src/views/system/operationRecord/index.vue
index 491da91..e314ddd 100644
--- a/zy-asrs-admin/src/views/system/operationRecord/index.vue
+++ b/zy-asrs-admin/src/views/system/operationRecord/index.vue
@@ -200,7 +200,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/operationRecord/export', {}).then(result => {
+ postBlob('/api/operationRecord/export', {
+ condition: searchInput.value
+ }).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/system/userLogin/index.vue b/zy-asrs-admin/src/views/system/userLogin/index.vue
index 1125c4d..630fdf2 100644
--- a/zy-asrs-admin/src/views/system/userLogin/index.vue
+++ b/zy-asrs-admin/src/views/system/userLogin/index.vue
@@ -152,7 +152,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/userLogin/export', {}).then(result => {
+ postBlob('/api/userLogin/export', {
+ condition: searchInput.value
+ }).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/task/task/index.vue b/zy-asrs-admin/src/views/task/task/index.vue
index 3b5a9bb..38e8604 100644
--- a/zy-asrs-admin/src/views/task/task/index.vue
+++ b/zy-asrs-admin/src/views/task/task/index.vue
@@ -226,7 +226,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/task/export', {}).then(result => {
+ postBlob('/api/task/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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/task/taskDetl/index.vue b/zy-asrs-admin/src/views/task/taskDetl/index.vue
index 42f1696..f006b44 100644
--- a/zy-asrs-admin/src/views/task/taskDetl/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetl/index.vue
@@ -223,7 +223,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/taskDetl/export', {}).then(result => {
+ postBlob('/api/taskDetl/export', {
+ condition: searchInput.value
+ }).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/task/taskDetlLog/index.vue b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
index 154a649..8b89704 100644
--- a/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
@@ -223,7 +223,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/taskDetlLog/export', {}).then(result => {
+ postBlob('/api/taskDetlLog/export', {
+ condition: searchInput.value
+ }).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/task/taskLog/index.vue b/zy-asrs-admin/src/views/task/taskLog/index.vue
index 2227509..ad4e31b 100644
--- a/zy-asrs-admin/src/views/task/taskLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskLog/index.vue
@@ -227,7 +227,10 @@
}
const handleExport = async (intl) => {
- postBlob('/api/taskLog/export', {}).then(result => {
+ postBlob('/api/taskLog/export', {
+ condition: searchInput.value,
+ _param: searchParam.value,
+ }).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-framework/src/main/resources/templates/vue/Controller.txt b/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
index 7a7c0c6..d47581e 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Controller.txt
@@ -96,7 +96,11 @@
@PreAuthorize("hasAuthority('@{ITEMNAME}:@{SIMPLEENTITYNAME}:list')")
@PostMapping("/@{SIMPLEENTITYNAME}/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(@{SIMPLEENTITYNAME}Service.list(), @{ENTITYNAME}.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<@{ENTITYNAME}, BaseParam> pageParam = new PageParam<>(baseParam, @{ENTITYNAME}.class);
+ List<@{ENTITYNAME}> data = @{SIMPLEENTITYNAME}Service.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, @{ENTITYNAME}.class), response);
}
}
diff --git a/zy-asrs-framework/src/main/resources/templates/vue/Index.txt b/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
index bf8b96a..1bd5260 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
@@ -110,7 +110,9 @@
}
const handleExport = async (intl) => {
- postBlob('/api/@{SIMPLEENTITYNAME}/export', {}).then(result => {
+ postBlob('/api/@{SIMPLEENTITYNAME}/export', {
+ condition: searchInput.value
+ }).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-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheStatisticsController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheStatisticsController.java
index 043c5f6..13c1916 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheStatisticsController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CacheStatisticsController.java
@@ -96,7 +96,11 @@
@PreAuthorize("hasAuthority('asrs:cacheStatistics:list')")
@PostMapping("/cacheStatistics/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(cacheStatisticsService.list(), CacheStatistics.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<CacheStatistics, BaseParam> pageParam = new PageParam<>(baseParam, CacheStatistics.class);
+ List<CacheStatistics> data = cacheStatisticsService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, CacheStatistics.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
index a649c11..dc979f6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocController.java
@@ -142,7 +142,11 @@
@PreAuthorize("hasAuthority('asrs:loc:list')")
@PostMapping("/loc/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locService.list(), Loc.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
+ List<Loc> data = locService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, Loc.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 1516ea1..984a684 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -184,7 +184,11 @@
@PreAuthorize("hasAuthority('asrs:locDetl:list')")
@PostMapping("/locDetl/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<LocDetl> locDetls = locDetlService.parseLocDetl(locDetlService.list());
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<LocDetl, BaseParam> pageParam = new PageParam<>(baseParam, LocDetl.class);
+ List<LocDetl> data = locDetlService.list(pageParam.buildWrapper(true));
+
+ List<LocDetl> locDetls = locDetlService.parseLocDetl(data);
List<MatField> locFields = matFieldService.getLocFields();
ExcelUtil.build(ExcelUtil.create(locDetls, LocDetl.class, locFields), response);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
index 682c7c2..4274e19 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -135,7 +135,11 @@
@PreAuthorize("hasAuthority('asrs:mat:list')")
@PostMapping("/mat/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<Mat> list = matService.parseMat(matService.list());
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class);
+ List<Mat> data = matService.list(pageParam.buildWrapper(true));
+
+ List<Mat> list = matService.parseMat(data);
List<MatField> matFields = matFieldService.getMatFields();
ExcelUtil.build(ExcelUtil.create(list, Mat.class, matFields), response);
}
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 296c619..4992fa8 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
@@ -199,15 +199,20 @@
@PostMapping("/order/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
String ioModel = map.getOrDefault("ioModel", "").toString();
- List<Order> list = orderService.list();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Order, BaseParam> pageParam = new PageParam<>(baseParam, Order.class);
+ QueryWrapper<Order> queryWrapper = pageParam.buildWrapper(true);
+
+ List<Order> list = orderService.list(queryWrapper);
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);
+ queryWrapper.in("order_type", types);
+ list = orderService.list(queryWrapper);
}
ExcelUtil.build(ExcelUtil.create(list, Order.class), response);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
index 56c7285..792d081 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlController.java
@@ -107,7 +107,11 @@
@PreAuthorize("hasAuthority('asrs:orderDetl:list')")
@PostMapping("/orderDetl/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderDetlService.list(), OrderDetl.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetl, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetl.class);
+ List<OrderDetl> data = orderDetlService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, OrderDetl.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
index e5a7d89..c9b46e8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderDetlLogController.java
@@ -106,7 +106,11 @@
@PreAuthorize("hasAuthority('asrs:orderDetlLog:list')")
@PostMapping("/orderDetlLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderDetlLogService.list(), OrderDetlLog.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderDetlLog.class);
+ List<OrderDetlLog> data = orderDetlLogService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, OrderDetlLog.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
index fcd3611..029052a 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderLogController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.asrs.entity.Order;
import com.zy.asrs.wms.asrs.entity.OrderType;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.common.annotation.CacheData;
@@ -184,7 +185,23 @@
@PreAuthorize("hasAuthority('asrs:orderLog:list')")
@PostMapping("/orderLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(orderLogService.list(), OrderLog.class), response);
+ String ioModel = map.getOrDefault("ioModel", "").toString();
+ map.remove("ioModel");
+
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OrderLog, BaseParam> pageParam = new PageParam<>(baseParam, OrderLog.class);
+ QueryWrapper<OrderLog> queryWrapper = pageParam.buildWrapper(true);
+
+ List<OrderLog> list = orderLogService.list(queryWrapper);
+ if (!Cools.isEmpty(ioModel)) {
+ 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());
+ }
+ queryWrapper.in("order_type", types);
+ list = orderLogService.list(queryWrapper);
+ }
+ ExcelUtil.build(ExcelUtil.create(list, OrderLog.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
index 48cab40..1ecf312 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
@@ -105,7 +105,11 @@
@PreAuthorize("hasAuthority('asrs:task:list')")
@PostMapping("/task/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskService.list(), Task.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
+ List<Task> data = taskService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, Task.class), response);
}
@PreAuthorize("hasAuthority('asrs:task:update')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlController.java
index 6b0cea3..0a0013d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlController.java
@@ -102,7 +102,11 @@
@PreAuthorize("hasAuthority('asrs:taskDetl:list')")
@PostMapping("/taskDetl/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskDetlService.list(), TaskDetl.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskDetl, BaseParam> pageParam = new PageParam<>(baseParam, TaskDetl.class);
+ List<TaskDetl> data = taskDetlService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, TaskDetl.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlLogController.java
index a44d302..2edc9a5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskDetlLogController.java
@@ -107,7 +107,11 @@
@PreAuthorize("hasAuthority('asrs:taskDetlLog:list')")
@PostMapping("/taskDetlLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskDetlLogService.list(), TaskDetlLog.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskDetlLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskDetlLog.class);
+ List<TaskDetlLog> data = taskDetlLogService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, TaskDetlLog.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java
index b75f326..323c3df 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskLogController.java
@@ -106,7 +106,11 @@
@PreAuthorize("hasAuthority('asrs:taskLog:list')")
@PostMapping("/taskLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(taskLogService.list(), TaskLog.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<TaskLog, BaseParam> pageParam = new PageParam<>(baseParam, TaskLog.class);
+ List<TaskLog> data = taskLogService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, TaskLog.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index 06e2ca1..436a0cc 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -125,7 +125,11 @@
@PreAuthorize("hasAuthority('asrs:waitPakin:list')")
@PostMapping("/waitPakin/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
+ List<WaitPakin> data = waitPakinService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, WaitPakin.class), response);
}
@PreAuthorize("hasAuthority('asrs:waitPakin:list')")
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.java
index d6585e8..6d27275 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinLogController.java
@@ -100,7 +100,11 @@
@PreAuthorize("hasAuthority('asrs:waitPakinLog:list')")
@PostMapping("/waitPakinLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinLogService.list(), WaitPakinLog.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WaitPakinLog, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakinLog.class);
+ List<WaitPakinLog> data = waitPakinLogService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, WaitPakinLog.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
index 049b5b0..6924bd9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewInOutController.java
@@ -39,10 +39,11 @@
@PreAuthorize("hasAuthority('asrs:viewInOut:list')")
@PostMapping("/viewInOut/export")
- @CacheData(tableName = {"view_in_out", "man_task", "man_task_log"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewInOut> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewInOutMapper.selectList(wrapper), ViewInOut.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewInOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewInOut.class);
+ QueryWrapper<ViewInOut> queryWrapper = pageParam.buildWrapper(true);
+ ExcelUtil.build(ExcelUtil.create(viewInOutMapper.selectList(queryWrapper), ViewInOut.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java
index e0927f0..d05a6ab 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewStayTimeController.java
@@ -36,10 +36,11 @@
@PreAuthorize("hasAuthority('asrs:viewStayTime:list')")
@PostMapping("/viewStayTime/export")
- @CacheData(tableName = {"view_stay_time", "man_loc_detl", "man_loc"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewStayTime> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewStayTimeMapper.selectList(wrapper), ViewStayTime.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewStayTime, BaseParam> pageParam = new PageParam<>(baseParam, ViewStayTime.class);
+ QueryWrapper<ViewStayTime> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("stay_time"));
+ ExcelUtil.build(ExcelUtil.create(viewStayTimeMapper.selectList(queryWrapper), ViewStayTime.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
index afa390b..8fb27f5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountInController.java
@@ -39,10 +39,11 @@
@PreAuthorize("hasAuthority('asrs:viewWorkCountIn:list')")
@PostMapping("/viewWorkCountIn/export")
- @CacheData(tableName = {"view_work_count_in", "man_task_log", "man_task_detl_log"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewWorkCountIn> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewWorkCountInMapper.selectList(wrapper), ViewWorkCountIn.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountIn.class);
+ QueryWrapper<ViewWorkCountIn> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ ExcelUtil.build(ExcelUtil.create(viewWorkCountInMapper.selectList(queryWrapper), ViewWorkCountIn.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java
index e470d0a..d0267f5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkCountOutController.java
@@ -41,10 +41,11 @@
@PreAuthorize("hasAuthority('asrs:viewWorkCountOut:list')")
@PostMapping("/viewWorkCountOut/export")
- @CacheData(tableName = {"view_work_count_out", "man_task_log", "man_task_detl_log"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewWorkCountOut> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewWorkCountOutMapper.selectList(wrapper), ViewWorkCountOut.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkCountOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkCountOut.class);
+ QueryWrapper<ViewWorkCountOut> queryWrapper = pageParam.buildWrapper(true, wrapper -> wrapper.orderByDesc("oneday"));
+ ExcelUtil.build(ExcelUtil.create(viewWorkCountOutMapper.selectList(queryWrapper), ViewWorkCountOut.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java
index 0495da9..0d54a31 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkInController.java
@@ -50,10 +50,11 @@
@PreAuthorize("hasAuthority('asrs:viewWorkIn:list')")
@PostMapping("/viewWorkIn/export")
- @CacheData(tableName = {"view_work_in", "man_task_log", "man_task_detl_log"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewWorkIn> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewWorkInMapper.selectList(wrapper), ViewWorkIn.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkIn, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkIn.class);
+ QueryWrapper<ViewWorkIn> queryWrapper = pageParam.buildWrapper(true);
+ ExcelUtil.build(ExcelUtil.create(viewWorkInMapper.selectList(queryWrapper), ViewWorkIn.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
index 234821c..7ba92cf 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/statistics/ViewWorkOutController.java
@@ -50,10 +50,11 @@
@PreAuthorize("hasAuthority('asrs:viewWorkOut:list')")
@PostMapping("/viewWorkOut/export")
- @CacheData(tableName = {"view_work_out", "man_task_log", "man_task_detl_log"})
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- QueryWrapper<ViewWorkOut> wrapper = new QueryWrapper<>();
- ExcelUtil.build(ExcelUtil.create(viewWorkOutMapper.selectList(wrapper), ViewWorkOut.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<ViewWorkOut, BaseParam> pageParam = new PageParam<>(baseParam, ViewWorkOut.class);
+ QueryWrapper<ViewWorkOut> queryWrapper = pageParam.buildWrapper(true);
+ ExcelUtil.build(ExcelUtil.create(viewWorkOutMapper.selectList(queryWrapper), ViewWorkOut.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
index 3b9c1da..9af8c23 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/LanguageController.java
@@ -112,7 +112,11 @@
@PreAuthorize("hasAuthority('system:language:list')")
@PostMapping("/language/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(languageService.list(), Language.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Language, BaseParam> pageParam = new PageParam<>(baseParam, Language.class);
+ List<Language> data = languageService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, Language.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/OperationRecordController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/OperationRecordController.java
index 5c73cf1..940e5e2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/OperationRecordController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/OperationRecordController.java
@@ -99,7 +99,11 @@
@PreAuthorize("hasAuthority('system:operationRecord:list')")
@PostMapping("/operationRecord/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(operationRecordService.list(), OperationRecord.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<OperationRecord, BaseParam> pageParam = new PageParam<>(baseParam, OperationRecord.class);
+ List<OperationRecord> data = operationRecordService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, OperationRecord.class), response);
}
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserLoginController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserLoginController.java
index 1516deb..b3d0349 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserLoginController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/UserLoginController.java
@@ -99,7 +99,11 @@
@PreAuthorize("hasAuthority('system:userLogin:list')")
@PostMapping("/userLogin/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(userLoginService.list(), UserLogin.class), response);
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<UserLogin, BaseParam> pageParam = new PageParam<>(baseParam, UserLogin.class);
+ List<UserLogin> data = userLoginService.list(pageParam.buildWrapper(true));
+
+ ExcelUtil.build(ExcelUtil.create(data, UserLogin.class), response);
}
}
--
Gitblit v1.9.1