From 46724b2e6fd2106b9931c8d971d301fc71475e03 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 27 Dec 2024 13:30:24 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/apiweb/WarehouseInController.java | 4 ++-- .../main/java/com/xdadan/erp/apiweb/WaybillController.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java index fb246c2..56bcf9d 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java @@ -135,10 +135,10 @@ public class WarehouseInController extends BaseController */ @Log(title = "导出进仓单", businessType = BusinessType.EXPORT) @PostMapping("/exportWarehouseInTpl") - public AjaxResult exportWarehouseInTpl(HttpServletResponse response,String orderSn) { + public AjaxResult exportWarehouseInTpl(HttpServletResponse response,String orderSn,String fileType) { try{ - emisWaybillService.genWarehouseInTplFile(response,orderSn); + emisWaybillService.genWarehouseInTplFile(response,orderSn,fileType); return AjaxResult.success("下载成功"); } catch(EmisBizError ex){ diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java index 273c60c..954e180 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java @@ -455,17 +455,13 @@ public class WaybillController extends BaseController @Log(title = "API获取寄件面单信息", businessType = BusinessType.OTHER) @GetMapping("/getSendTplImageUrl") - public String getSendTplImage(HttpServletRequest request, HttpServletResponse response, String billCode, String customerCode ) + public String getSendTplImageUrl(HttpServletRequest request, HttpServletResponse response, String billCode, String customerCode ) { if(!StringUtils.isEmpty(billCode)){ try { // 非客户的单子不允许获取 - - - - String uuid = UUID.fastUUID().toString(); String printManCode="LP";