From aa37827cd723f46b2697017afac1ad2f95fbfbf1 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 1 Sep 2024 21:15:20 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/oms/web/Oms2cWarehouseInController.java | 5 ++++- .../com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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 2f0a973..12488e0 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 @@ -23,6 +23,7 @@ import com.xdadan.erp.oms.service.IEmisWarehouseInService; import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc; import com.xdadan.erp.oms.service.svc.IRpcWaybillSvc; import feign.Response; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -42,6 +43,7 @@ import java.util.List; * @author linfso * @date 2024-05-22 00:20:31 */ +@Slf4j @RestController @RequestMapping("/oms2c/emisWarehouseIn") public class Oms2cWarehouseInController extends BaseController @@ -109,12 +111,13 @@ public class Oms2cWarehouseInController extends BaseController * @return */ @Log(title = "导出进仓单文件", businessType = BusinessType.EXPORT) - @GetMapping("/exportWarehouseInTpl") + @PostMapping("/exportWarehouseInTpl") public void exportWarehouseInTpl(HttpServletResponse servletResponse, String orderSn) throws IOException { Response response = this.iRpcWarehouseInSvc.exportWarehouseInTpl(orderSn); 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); 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 905632c..5c54ced 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 @@ -39,7 +39,7 @@ public interface IRpcWarehouseInSvc { public AjaxResult getWarehouseInByInNo(@RequestParam("customerCode") String customerCode,@RequestParam("inNo")String inNo); - @GetMapping(value = "/apiweb/emisWarehouseIn/exportWarehouseInTpl") + @PostMapping(value = "/apiweb/emisWarehouseIn/exportWarehouseInTpl") public Response exportWarehouseInTpl(@RequestParam("orderSn") String orderSn); } \ No newline at end of file