From c6a74080d0e872f76d75e98346cf37f36858a7fd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 25 May 2023 11:53:02 +0800 Subject: [PATCH] =?UTF-8?q?relId=20long=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inv/InvInnerOrderPrintController.java | 2 +- .../com/glxp/api/res/basic/CompanyProductRelevanceResponse.java | 2 +- src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java index 018359a0..28380a50 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvInnerOrderPrintController.java @@ -283,7 +283,7 @@ public class InvInnerOrderPrintController { Map map=new HashMap<>(); map.put("data",printEntities); String param = JSON.toJSONString(map); - JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); + JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/" + FileUtils.getLastFileName(systemPDFTemplateEntity.getPath()), "pdf"); String orderId = ""; for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) { diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index f9f051b7..4c53dcdd 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -6,7 +6,7 @@ import lombok.Data; public class CompanyProductRelevanceResponse { private Long id; - private Integer rlId; + private Long rlId; private String thirdId; private String thirdName; private String uuid; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index d921907e..8ddbfe9b 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -6,7 +6,7 @@ import lombok.Data; public class UdiRlSupResponse { private Long id; - private Integer rlId; + private Long rlId; private String thirdId; private String thirdName; private String uuid;