feat: 打印功能增加字段

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();

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++;
             }

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;
 }