From e18e439939db59d3c439c4435ab0a2aba55d7441 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 6 Mar 2025 15:41:33 +0800 Subject: [PATCH] md --- .../erp/oms/web/Oms2cCommonController.java | 25 ++++++++-------- .../oms/web/Oms2cWarehouseInController.java | 29 ++++++++++--------- .../oms/service/svc/IRpcWarehouseInSvc.java | 2 +- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index 4435297..ea4f829 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -241,21 +241,22 @@ public class Oms2cCommonController extends BaseController */ @Log(title = "导出进仓单文件", businessType = BusinessType.EXPORT) @RequestMapping("/exportWarehouseInTpl") - public void exportWarehouseInTpl(HttpServletResponse servletResponse, String orderSn) throws IOException { + public void exportWarehouseInTpl(HttpServletResponse servletResponse, String orderSn,String fileType) throws IOException { - Response response = this.iRpcWarehouseInSvc.exportWarehouseInTpl(orderSn); + Response response = this.iRpcWarehouseInSvc.exportWarehouseInTpl(orderSn,fileType); Response.Body body = response.body(); log.error("====>exportWarehouseInTpl==>{}", JSON.toJSONString(response.headers())); -// for (Object key : response.headers().keySet()) { -// List kList = (List) response.headers().get(key); -// for (String val : kList) { -// servletResponse.setHeader(key.toString(), val); -// } -// } - - servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".pdf"); -// servletResponse.setContentType("application/octet-stream"); - servletResponse.setContentType("application/pdf"); + // docx + if("docx".equals(fileType)){ + servletResponse.setContentType("application/octet-stream;charset=UTF-8"); + servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".docx"); + servletResponse.addHeader("Access-Control-Expose-Headers", "Content-disposition"); + } + // pdf + else { + servletResponse.setContentType("application/pdf"); + servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".pdf"); + } InputStream inputStream = null; OutputStream outputStream = null; diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java index eadb3c6..994d8ba 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java @@ -33,9 +33,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -125,19 +123,24 @@ public class Oms2cWarehouseInController extends BaseController */ @Log(title = "导出进仓单文件", businessType = BusinessType.EXPORT) @RequestMapping("/exportWarehouseInTpl") - public void exportWarehouseInTpl(HttpServletResponse servletResponse, String orderSn) throws IOException { + public void exportWarehouseInTpl(HttpServletResponse servletResponse, String orderSn,String fileType) throws IOException { - Response response = this.iRpcWarehouseInSvc.exportWarehouseInTpl(orderSn); + Response response = this.iRpcWarehouseInSvc.exportWarehouseInTpl(orderSn,fileType); Response.Body body = response.body(); log.error("====>exportWarehouseInTpl==>{}", JSON.toJSONString(response.headers())); -// for (Object key : response.headers().keySet()) { -// List kList = (List) response.headers().get(key); -// for (String val : kList) { -// servletResponse.setHeader(key.toString(), val); -// } -// } - servletResponse.setContentType("application/octet-stream"); - servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".pdf"); + + // docx + if("docx".equals(fileType)){ + servletResponse.setContentType("application/octet-stream;charset=UTF-8"); + servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".docx"); + servletResponse.addHeader("Access-Control-Expose-Headers", "Content-disposition"); + } + // pdf + else { + servletResponse.setContentType("application/pdf"); + servletResponse.setHeader("Content-Disposition", "attachment;fileName=" + orderSn + ".pdf"); + } + InputStream inputStream = null; OutputStream outputStream = null; try { diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java index ab4d441..bb63c88 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java @@ -41,7 +41,7 @@ public interface IRpcWarehouseInSvc { @PostMapping(value = "/apiweb/emisWarehouseIn/exportWarehouseInTpl") - public Response exportWarehouseInTpl(@RequestParam("orderSn") String orderSn); + public Response exportWarehouseInTpl(@RequestParam("orderSn") String orderSn,@RequestParam("fileType") String fileType); @PostMapping("/apiweb/emisWarehouseIn/cusConfirmWsIn")