From a32b3258f2c60f57211e5d953f10dabc4f87bdaf Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 23 Mar 2023 09:49:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/constant/Constant.java         | 1 +
 .../api/req/inout/FilterOrderDetailResultRequest.java     | 2 ++
 .../service/basic/impl/BasicBussinessTypeServiceImpl.java | 8 ++++++--
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml       | 6 ++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java
index dbf8400d..8d496d8d 100644
--- a/src/main/java/com/glxp/api/constant/Constant.java
+++ b/src/main/java/com/glxp/api/constant/Constant.java
@@ -229,5 +229,6 @@ public class Constant {
     public static final String ORDER_ACTION_NOR_DETAIL = "norDetail";
     public static final String ORDER_ACTION_PRE_DETAIL = "preDetail";
     public static final String ORDER_ACTION_SUP_DELIVERY = "supDelivery";
+    public static final String ORDER_ACTION_SUP_INVOICE = "supInvoice";
 
 }
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 fe9c1b53..700c315c 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -43,5 +43,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String endAduditTime;       //结束日期
     private String fromCorp;
     private String actionType;
+    private String manufacturer;
+    private String zczbhhzbapzbh;
     private List<String> actions;
 }
diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
index 25aacefb..b6438482 100644
--- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
@@ -209,10 +209,14 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService
             case Constant.ORDER_ACTION_SUP_DELIVERY:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
-                        .eq("spUse", true));
+                        .eq("spUse", true).eq("inStock", false));
 
                 break;
-
+            case Constant.ORDER_ACTION_SUP_INVOICE:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .eq("mainAction", ConstantType.TYPE_PUT).eq("corpType", ConstantStatus.CORP_TYPE_OUT)
+                        .eq("spUse", true).eq("actionType", 1));
+                break;
             default:
                 break;
         }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index c29a8ef6..de295c9b 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -47,6 +47,12 @@
             <if test="fromCorpName != null and fromCorpName != ''">
                 AND b1.name = #{fromCorpName}
             </if>
+            <if test="manufacturer != null and manufacturer != ''">
+                AND a2.manufacturer = #{manufacturer}
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND a2.certCode = #{zczbhhzbapzbh}
+            </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>