带票出入库明细 增加查询条件等

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

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

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

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>