From 98f36fdc9d8f66e8be805a0cb7eca247e98a1bdd Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Tue, 10 Dec 2024 09:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultController.java  | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

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 34d979e78..79e616266 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -138,6 +138,7 @@ public class IoOrderDetailResultController extends BaseController {
         PageInfo<IoOrderDetailDeptResultResponse> pageInfo = new PageInfo<>(getOrderDeptResult(orderDetailResultRequest));
         return ResultVOUtils.page(pageInfo);
     }
+
     /**
      * 查询单据仓库带票出入库明细
      *
@@ -163,6 +164,7 @@ public class IoOrderDetailResultController extends BaseController {
         PageInfo<IoOrderDetailDeptProductResultResponse> pageInfo = new PageInfo<>(getOrderDeptProductResult(orderDetailResultRequest));
         return ResultVOUtils.page(pageInfo);
     }
+
     /**
      * 查询单据仓库产品出库科室明细
      *
@@ -244,7 +246,6 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
-
     public List<IoOrderDetailResultResponse> getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) {
         if (CollUtil.isNotEmpty(orderDetailResultRequest.getList())) {
             return orderDetailResultRequest.getList();
@@ -562,7 +563,7 @@ public class IoOrderDetailResultController extends BaseController {
         List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
         LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
-        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId());
+        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
         qw.last("limit 1");
         SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
 
@@ -621,7 +622,7 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
- /**
+    /**
      * 物资盘点统计报表打印
      *
      * @param filterInvCountOrderSumResultRequest
@@ -633,7 +634,7 @@ public class IoOrderDetailResultController extends BaseController {
         List<InvCountOrderSumResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterInvCountOrderSumResultRequest.getTemplateId());
         LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
-        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId());
+        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
         qw.last("limit 1");
         SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
 
@@ -674,7 +675,7 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("employeeName", filterInvCountOrderSumResultRequest.getEmployeeName() == null ? ' ' : filterInvCountOrderSumResultRequest.getEmployeeName());
             ioOrderDetailResultData.put("exportTime", dateStr);
 
-            if (sysPdfTemplateRelevanceBizEntity != null){
+            if (sysPdfTemplateRelevanceBizEntity != null) {
                 ioOrderDetailResultData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1());
                 ioOrderDetailResultData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2());
                 ioOrderDetailResultData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3());
@@ -692,7 +693,6 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
-
     /**
      * 仓库出入库明细打印
      *
@@ -705,7 +705,7 @@ public class IoOrderDetailResultController extends BaseController {
         List<IoOrderDetailDeptResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
         LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
-        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId());
+        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
         qw.last("limit 1");
         SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
 
@@ -776,7 +776,7 @@ public class IoOrderDetailResultController extends BaseController {
         List<IoOrderDetailDeptProductResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailDeptResultRequest.getTemplateId());
         LambdaQueryWrapper<SysPdfTemplateRelevanceBizEntity> qw = new LambdaQueryWrapper<>();
-        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId,systemPDFTemplateEntity.getId());
+        qw.eq(SysPdfTemplateRelevanceBizEntity::getTemplateId, systemPDFTemplateEntity.getId());
         qw.last("limit 1");
         SysPdfTemplateRelevanceBizEntity sysPdfTemplateRelevanceBizEntity = systemPDFTemplateRelevanceBizService.getOne(qw);
 
@@ -837,7 +837,6 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
-
     /**
      * 入账库明细打印
      *
@@ -883,15 +882,15 @@ public class IoOrderDetailResultController extends BaseController {
             Map<String, Object> ioOrderDetailResultData = new HashMap<>();
             ioOrderDetailResultData.put("index", String.valueOf(i));
             ioOrderDetailResultData.put("cpmctymc", item.getCpmctymc() == null ? "" : item.getCpmctymc());
-            ioOrderDetailResultData.put("ggxh",item.getGgxh() == null ? "" : item.getGgxh());
-            ioOrderDetailResultData.put("inCount",item.getInCount());
-            ioOrderDetailResultData.put("outCount",item.getOutCount());
-            ioOrderDetailResultData.put("reCount",item.getReCount());
-            ioOrderDetailResultData.put("measname",item.getMeasname() == null ? "" : item.getMeasname());
-            ioOrderDetailResultData.put("batchNo",item.getBatchNo() == null ? "" : item.getBatchNo());
-            ioOrderDetailResultData.put("price",item.getPrice() == null ? "" : item.getPrice());
-            ioOrderDetailResultData.put("supName",item.getSupName() == null ? "" : item.getSupName());
-            ioOrderDetailResultData.put("ylqxzcrbarmc",item.getYlqxzcrbarmc() == null ? "" : item.getYlqxzcrbarmc());
+            ioOrderDetailResultData.put("ggxh", item.getGgxh() == null ? "" : item.getGgxh());
+            ioOrderDetailResultData.put("inCount", item.getInCount());
+            ioOrderDetailResultData.put("outCount", item.getOutCount());
+            ioOrderDetailResultData.put("reCount", item.getReCount());
+            ioOrderDetailResultData.put("measname", item.getMeasname() == null ? "" : item.getMeasname());
+            ioOrderDetailResultData.put("batchNo", item.getBatchNo() == null ? "" : item.getBatchNo());
+            ioOrderDetailResultData.put("price", item.getPrice() == null ? "" : item.getPrice());
+            ioOrderDetailResultData.put("supName", item.getSupName() == null ? "" : item.getSupName());
+            ioOrderDetailResultData.put("ylqxzcrbarmc", item.getYlqxzcrbarmc() == null ? "" : item.getYlqxzcrbarmc());
 
             ioOrderDetailResultData.put("locInvName", filterInvProductRequest.getLocInvName() == null ? ' ' : filterInvProductRequest.getLocInvName());
             list.add(ioOrderDetailResultData);