diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java index 40c568e..912b342 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java @@ -13,6 +13,7 @@ package com.xdadan.erp.oms.web; import java.io.*; import java.util.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -37,6 +38,7 @@ import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc; import com.xdadan.erp.oms.service.svc.IRpcWmsWarehouseSvc; import com.xdadan.erp.oms.system.domain.SysOmsUserRole; import com.xdadan.erp.oms.system.service.ISysOmsUserService; +import feign.Response; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -128,8 +130,31 @@ public class Oms2cWaybillController extends BaseController */ @Log(title = "导出进仓单", businessType = BusinessType.EXPORT) @PostMapping("/exportWarehouseInTpl") - public void exportWarehouseInTpl(WaybillOrder waybillOrder) { - this.iRpcWaybillSvc.exportWarehouseInTpl(waybillOrder); + public void exportWarehouseInTpl(HttpServletResponse servletResponse, @RequestBody WaybillOrder waybillOrder) throws IOException { + + Response response = this.iRpcWaybillSvc.exportWarehouseInTpl(waybillOrder); + Response.Body body = response.body(); + for (Object key : response.headers().keySet()) { + List kList = (List) response.headers().get(key); + for (String val : kList) { + servletResponse.setHeader(key.toString(), val); + } + } + InputStream inputStream = null; + OutputStream outputStream = null; + try { + inputStream = body.asInputStream(); + outputStream = servletResponse.getOutputStream(); + byte[] b = new byte[inputStream.available()]; + inputStream.read(b); + outputStream.write(b); + outputStream.flush(); + } catch (IOException e) { + System.out.println("失败了"); + }finally { + inputStream.close(); + outputStream.close(); + } } /** diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java index 8bc7bb1..fc17463 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java @@ -4,6 +4,7 @@ package com.xdadan.erp.oms.service.svc; import com.xdadan.erp.oms.common.core.domain.AjaxResult; import com.xdadan.erp.oms.domain.EmisWaybill; import com.xdadan.erp.oms.domain.vo.WaybillOrder; +import feign.Response; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -70,6 +71,6 @@ public interface IRpcWaybillSvc { @PostMapping(value = "/apiweb/emisWaybill/exportWarehouseInTpl") - public void exportWarehouseInTpl(@RequestBody WaybillOrder waybillOrder); + public Response exportWarehouseInTpl(@RequestBody WaybillOrder waybillOrder); } \ No newline at end of file