排产加厂家认款

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java

@@ -31,4 +31,10 @@ public class BusVehicleApplyQuery implements Query {
     private String modelName;
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+
+    @ApiModelProperty("采购类型")
+    private String applyTypeKey;
+
+    @ApiModelProperty("采购原因")
+    private String schedulingTypeKey;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -213,6 +213,9 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         if (baseManufactorSubscription == null) {
             return rb.setMsg("该数据不存在");
         }
+        if (baseManufactorSubscription.getState() == 1) {
+            return rb.setMsg("该数据已认款,请勿重复操作");
+        }
         String witMatUrl = baseManufactorSubscription.getWitMatUrl();
         if (StringUtils.isBlank(witMatUrl)) {
             return rb.setMsg("请优先上传见证材料");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -116,6 +116,13 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getUserSid())) {
                 qw.eq("bva.createBySid", query.getUserSid());
             }
+            if(StringUtils.isNotBlank(query.getApplyTypeKey())){
+                qw.eq("bva.applyTypeKey",query.getApplyTypeKey());
+            }
+            if(StringUtils.isNotBlank(query.getSchedulingTypeKey())){
+                qw.eq("bva.schedulingTypeKey",query.getSchedulingTypeKey());
+            }
+
             //查询分公司sid
 //            if (StringUtils.isNotBlank(query.getUserSid())) {
 //                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();