From 8b740b8d33053039007b8e60cd301d6236647040 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 9 Apr 2024 15:41:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderDetailResultController.java | 7 +++++++ .../api/controller/purchase/PurOrderPrintController.java | 1 + .../glxp/api/req/inout/FilterOrderDetailResultRequest.java | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index c874b9cfb..06e8c5ad4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -334,6 +334,11 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName()); ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction()); ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime())); + ioOrderDetailResultData.put("locInvName", filterOrderDetailResultRequest.getLocInvName() == null ? ' ' : filterOrderDetailResultRequest.getLocInvName()); + ioOrderDetailResultData.put("startAduditTime", filterOrderDetailResultRequest.getStartAduditTime()== null ? ' ' : filterOrderDetailResultRequest.getStartAduditTime()); + ioOrderDetailResultData.put("endAduditTime", filterOrderDetailResultRequest.getEndAduditTime()== null ? ' ' : filterOrderDetailResultRequest.getEndAduditTime()); + ioOrderDetailResultData.put("employeeName", filterOrderDetailResultRequest.getEmployeeName()== null ? ' ' : filterOrderDetailResultRequest.getEmployeeName()); + ioOrderDetailResultData.put("fromInvName", ioOrderDetailResultResponse.getFromInvName()== null ? ' ' : ioOrderDetailResultResponse.getFromInvName()); if (thrProductsEntity != null) { ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); } @@ -351,6 +356,8 @@ public class IoOrderDetailResultController extends BaseController { data.put("data", list); + + String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); return ResultVOUtils.success(); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java index 365add0a2..e34e91eab 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java @@ -138,6 +138,7 @@ public class PurOrderPrintController { supData.put("supName", obj.getSupName()); supData.put("ylqxzcrbarmc", obj.getYlqxzcrbarmc()); supData.put("zczbhhzbapzbh", obj.getZczbhhzbapzbh()); + supData.put("createTime", MsDateUtil.formatDate(purReceiveEntity.getCreateTime(), "yyyy-MM-dd")); list.add(supData); i++; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index 80e3e7d56..4bff91714 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -55,4 +55,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String mainAction; private Integer inoutPrintStatus; private String invName; + private String employeeName; + private String fromInvName; + private String locInvName; }