Merge remote-tracking branch 'origin/master'

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

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

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

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>