From 656d84011dfae275cb8209dad601fcb61a22ee17 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:34:35 +0800
Subject: [PATCH] feat: 退回单增加机构字段
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 4cceb53..0640508 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -161,6 +161,7 @@
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
+ lWhFormOutputExtendVO.setDoc(lWhFormOutput.getOutputDoc());
String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
+ "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
@@ -226,17 +227,11 @@
}
Workbook workbook = ExcelExportUtil.exportExcel(params, map);
- downLoadExcel("111", response, workbook);
+ downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
-// try (OutputStream outputStream = response.getOutputStream()) {
-// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-// response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("閲囪喘閫�璐у崟1.xlsx", "utf-8"));
-// workbook.write(outputStream);
-// workbook.close();
-// }
}
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
+ private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
try (OutputStream out = response.getOutputStream()) {
response.setCharacterEncoding("UTF-8");
response.setHeader("content-Type", "application/vnd.ms-excel");
@@ -246,11 +241,7 @@
response.setHeader("Content-Length", String.valueOf(baos.size()));
out.write(baos.toByteArray());
} catch (Exception e) {
- try {
- throw new Exception(e.getMessage());
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ logger.error("瀵煎嚭鏂囦欢澶辫触", e);
}
}
--
Gitblit v1.9.1