diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
index 461b00a009..9b5fe8fe03 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
@@ -122,5 +122,6 @@ public class BaseVehicleQuery implements Query {
     private String multimediaKey;
     @ApiModelProperty(value = "常用配置名称")
     private String configName;
-
+    @ApiModelProperty("配置编码")
+    private String configCode;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
index d348393e5c..fa8c03098f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
@@ -64,6 +64,4 @@ public class BaseVehmodelConfigQuerys implements Query {
     private String carBrandSid;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
-    @ApiModelProperty(value = "编码")
-    private String code;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index d3b8de9880..785d47b1d8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -408,6 +408,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
                 qw.eq("bmc.configName", pagerQuery.getConfigName());
             }
+            if (StringUtils.isNotBlank(pagerQuery.getConfigCode())) {//配置编码
+                qw.eq("bmc.configCode", pagerQuery.getConfigCode());
+            }
             qw.orderByDesc("bv.priceDate");
         }
         return qw;
@@ -1064,7 +1067,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath) {
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath);
@@ -2018,7 +2021,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         List<String> carSidList = baseVehicleTempstateService.selectAll("001");
         if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         if (StringUtils.isNotBlank(orgPath)) {
@@ -2354,7 +2357,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
 
         //调出分公司车辆台账更新库存状态和销售成交价
-        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(), VehicleState.StockEnum.DC_STOCK.getRemarks(),baseVehicle.getSalePrice(), baseVehicle.getVinNo());
+        baseMapper.updateCallOutVehicleState(VehicleState.StockEnum.DC_STOCK.getCode(), VehicleState.StockEnum.DC_STOCK.getRemarks(), baseVehicle.getSalePrice(), baseVehicle.getVinNo());
 
         //新建调入分公司车辆台账，设置调入分公司sid
         BaseVehicle new_baseVehicle = new BaseVehicle();
@@ -2556,41 +2559,41 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getManufSaleAccessName())) {
             baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
         }
-        if (StringUtils.isNotBlank(dto.getManufacturerSid())){
+        if (StringUtils.isNotBlank(dto.getManufacturerSid())) {
             baseVehicle.setManufacturerSid(dto.getManufacturerSid());
         }
-        if (StringUtils.isNotBlank(dto.getSupplierSid())){
+        if (StringUtils.isNotBlank(dto.getSupplierSid())) {
             baseVehicle.setSupplierSid(dto.getSupplierSid());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandSid())){
+        if (StringUtils.isNotBlank(dto.getCarBrandSid())) {
             baseVehicle.setCarBrandSid(dto.getCarBrandSid());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandName())){
+        if (StringUtils.isNotBlank(dto.getCarBrandName())) {
             baseVehicle.setCarBrandName(dto.getCarBrandName());
         }
 
-        if (StringUtils.isNotBlank(dto.getLocationCode())){
+        if (StringUtils.isNotBlank(dto.getLocationCode())) {
             baseVehicle.setLocationCode(dto.getLocationCode());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemCode())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemCode())) {
             baseVehicle.setPurchaseSystemCode(dto.getPurchaseSystemCode());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessKey())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessKey())) {
             baseVehicle.setManufSaleAccessKey(dto.getManufSaleAccessKey());
         }
-        if (StringUtils.isNotBlank(dto.getPaymentAccessNoKey())){
+        if (StringUtils.isNotBlank(dto.getPaymentAccessNoKey())) {
             baseVehicle.setPaymentAccessNoKey(dto.getPaymentAccessNoKey());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandCode())){
+        if (StringUtils.isNotBlank(dto.getCarBrandCode())) {
             baseVehicle.setCarBrandCode(dto.getCarBrandCode());
         }
-        if (StringUtils.isNotBlank(dto.getManufacturerCode())){
+        if (StringUtils.isNotBlank(dto.getManufacturerCode())) {
             baseVehicle.setManufacturerCode(dto.getManufacturerCode());
         }
-        if (StringUtils.isNotBlank(dto.getSupplierCode())){
+        if (StringUtils.isNotBlank(dto.getSupplierCode())) {
             baseVehicle.setSupplierCode(dto.getSupplierCode());
         }
-        if (StringUtils.isNotBlank(dto.getOrgCode())){
+        if (StringUtils.isNotBlank(dto.getOrgCode())) {
             baseVehicle.setOrgCode(dto.getOrgCode());
         }
     }
@@ -2719,40 +2722,40 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(dto.getManufSaleAccessName())) {
             baseVehicle.setManufSaleAccessName(dto.getManufSaleAccessName());
         }
-        if (StringUtils.isNotBlank(dto.getManufacturerSid())){
+        if (StringUtils.isNotBlank(dto.getManufacturerSid())) {
             baseVehicle.setManufacturerSid(dto.getManufacturerSid());
         }
-        if (StringUtils.isNotBlank(dto.getSupplierSid())){
+        if (StringUtils.isNotBlank(dto.getSupplierSid())) {
             baseVehicle.setSupplierSid(dto.getSupplierSid());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandSid())){
+        if (StringUtils.isNotBlank(dto.getCarBrandSid())) {
             baseVehicle.setCarBrandSid(dto.getCarBrandSid());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandName())){
+        if (StringUtils.isNotBlank(dto.getCarBrandName())) {
             baseVehicle.setCarBrandName(dto.getCarBrandName());
         }
-        if (StringUtils.isNotBlank(dto.getLocationCode())){
+        if (StringUtils.isNotBlank(dto.getLocationCode())) {
             baseVehicle.setLocationCode(dto.getLocationCode());
         }
-        if (StringUtils.isNotBlank(dto.getPurchaseSystemCode())){
+        if (StringUtils.isNotBlank(dto.getPurchaseSystemCode())) {
             baseVehicle.setPurchaseSystemCode(dto.getPurchaseSystemCode());
         }
-        if (StringUtils.isNotBlank(dto.getManufSaleAccessKey())){
+        if (StringUtils.isNotBlank(dto.getManufSaleAccessKey())) {
             baseVehicle.setManufSaleAccessKey(dto.getManufSaleAccessKey());
         }
-        if (StringUtils.isNotBlank(dto.getPaymentAccessNoKey())){
+        if (StringUtils.isNotBlank(dto.getPaymentAccessNoKey())) {
             baseVehicle.setPaymentAccessNoKey(dto.getPaymentAccessNoKey());
         }
-        if (StringUtils.isNotBlank(dto.getCarBrandCode())){
+        if (StringUtils.isNotBlank(dto.getCarBrandCode())) {
             baseVehicle.setCarBrandCode(dto.getCarBrandCode());
         }
-        if (StringUtils.isNotBlank(dto.getManufacturerCode())){
+        if (StringUtils.isNotBlank(dto.getManufacturerCode())) {
             baseVehicle.setManufacturerCode(dto.getManufacturerCode());
         }
-        if (StringUtils.isNotBlank(dto.getSupplierCode())){
+        if (StringUtils.isNotBlank(dto.getSupplierCode())) {
             baseVehicle.setSupplierCode(dto.getSupplierCode());
         }
-        if (StringUtils.isNotBlank(dto.getOrgCode())){
+        if (StringUtils.isNotBlank(dto.getOrgCode())) {
             baseVehicle.setOrgCode(dto.getOrgCode());
         }
     }
@@ -2977,7 +2980,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             String orgPath = params.getOrgPath();
             if (StringUtils.isBlank(orgPath)) {
                 orgPath = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
-            }else{
+            } else {
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             }
             params.setUseOrgSid(orgPath);
@@ -3114,10 +3117,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
 
     public void updateSalePrice(String witPinMoney, String vinNo, String callOutOrgSid) {
-        baseMapper.updateSalePrice(witPinMoney,vinNo,callOutOrgSid);
+        baseMapper.updateSalePrice(witPinMoney, vinNo, callOutOrgSid);
     }
 
     public void updateConAndCostPrice(String witPinMoney, String vinNo, String callInOrgSid) {
-        baseMapper.updateConAndCostPrice(witPinMoney,vinNo,callInOrgSid);
+        baseMapper.updateConAndCostPrice(witPinMoney, vinNo, callInOrgSid);
     }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index 48a4d66822..a8b0716bad 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -638,10 +638,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             }
         }
         if (StringUtils.isNotBlank(query.getVehicleAlias())) {
-            qw.like("bvm.vehicleAlias", query.getVehicleAlias());
+            qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", query.getVehicleAlias()).or().like("bvm.vehicleTypeCode", query.getVehicleAlias()));
         }
         if (StringUtils.isNotBlank(query.getConfigName())) {
-            qw.like("bmc.configName", query.getConfigName());
+            qw.and(wrapper -> wrapper.like("bmc.configName", query.getConfigName()).or().like("bmc.configCode", query.getConfigName()));
         }
         if (StringUtils.isNotBlank(query.getCarBrandSid())){
             qw.eq("bvm.carBrand", query.getCarBrandSid());
@@ -649,9 +649,6 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         if (StringUtils.isNotBlank(query.getInsideCode())){
             qw.like("bvc.insideCode",query.getInsideCode());
         }
-        if (StringUtils.isNotBlank(query.getCode())){
-            qw.and(wrapper -> wrapper.like("bvm.vehicleTypeCode", query.getCode()).or().like("bmc.configCode", query.getCode()));
-        }
         qw.eq("bvm.isDelete", 0);
         qw.eq("bmc.isDelete", 0);
         IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java
index 308dda2228..5df10a5ecb 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java
@@ -108,6 +108,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
     @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ")
     int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath);
 
-    @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid}")
+    @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid} AND inspectionResult = 1")
     int selectCountByBusSid(String businessSid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
index 652d1bb80a..907c1f7add 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
@@ -660,6 +660,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                             }
                         } else if (depositUseRuleKey.equals("001")) {
                             int i = baseMapper.selectCountByBusSid(scmVehicleExamine.getBusinessSid());
+                            i = i+1;
                             if (i > 1) {
                                 finPaymentrecordDto.setCost(price);//付款金额
                             } else if (i == 1) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
index 20b5e56c36..9b82a622e3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
@@ -145,8 +145,10 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             }
             String locationSid = record.getLocationSid();
             ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
-            record.setLiableSid(scmWarehouse.getLibTubeSid());
-            record.setLiableName(scmWarehouse.getLibTubeName());
+            if (scmWarehouse != null){
+                record.setLiableSid(scmWarehouse.getLibTubeSid());
+                record.setLiableName(scmWarehouse.getLibTubeName());
+            }
             String sid1 = record.getSid();
             AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(sid1);
             if (appScmVehiclePatrolinspectionsheetInfoVo != null) {