From 60b96aaec6804312f8e6a0d259d6d83f22876c2b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 12 Jun 2023 15:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=A6=E7=A5=A8=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoOrderDetailResultController.java        | 13 +++++++------
 .../req/inout/FilterOrderDetailResultRequest.java   |  2 ++
 .../api/res/inout/IoOrderDetailResultResponse.java  | 12 ++++++++++++
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml |  7 +++++++
 4 files changed, 28 insertions(+), 6 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 e77dc42f7..2e2d6227e 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
@@ -9,20 +9,17 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantType;
-import com.glxp.api.constant.FileConstant;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
-import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
-import com.glxp.api.req.basic.FilterOrderPrintRequest;
-import com.glxp.api.req.inout.*;
-import com.glxp.api.req.purchase.purPlanPrintRequest;
-import com.glxp.api.res.inout.IoCodeResponse;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.req.inout.FilterOrderRequest;
+import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
@@ -113,6 +110,10 @@ public class IoOrderDetailResultController extends BaseController {
                 orderDetailResultResponse.setOutCount(0);
                 orderDetailResultResponse.setInCount(orderDetailResultResponse.getReCount());
             }
+            String fromName = orderDetailResultResponse.getFromName();
+            orderDetailResultResponse.setFromName(fromName);
+
+
         }
         PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
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 61e7ef2a2..f7ce7869b 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -50,4 +50,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String templateId;
     private List<String> actions;
     private List<IoOrderDetailResultResponse> list;
+    private String action;
+    private String mainAction;
 }
diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
index 56e2da9f7..8c18e19e1 100644
--- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
+++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java
@@ -1,5 +1,6 @@
 package com.glxp.api.res.inout;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -161,6 +162,17 @@ public class IoOrderDetailResultResponse {
     private String billTypeName;
     private String mainAction;
     private Date auditTime;
+    private String fromInvName;
+    private String fromName;
+
+    public String getFromName() {
+        if (StrUtil.isNotEmpty(fromInvName))
+            return fromInvName;
+        if (StrUtil.isNotEmpty(fromCorpName))
+            return fromCorpName;
+
+        return fromName;
+    }
 
 
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 8b4ccc68a..4069e8825 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -28,6 +28,7 @@
                a1.mainAction,
                a1.auditTime,
                b1.NAME AS                                                               fromCorpName,
+        (select name from auth_warehouse aw where aw.code= a1.fromInvCode)  as fromInvName,
                (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
         FROM io_order_detail_result a2
                      LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
@@ -40,6 +41,12 @@
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>
+            <if test="action != null and action != ''">
+                AND a1.action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND a1.mainAction = #{mainAction}
+            </if>
             <if test="invCode != null and invCode != ''">
                 AND a1.invCode = #{invCode}
             </if>