From 2c706a5d58e8315980ea92d6b82e0e4959bad8ca Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 11 十二月 2023 17:44:40 +0800
Subject: [PATCH] 1.修改单据导出 2.修改物品信息导入
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 1a90e83..59bd8af 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -307,7 +307,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")})
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public String export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -329,8 +329,7 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
-
- downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ return downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
}
}
--
Gitblit v1.9.1