From 0a17ffa00806fc7dd48783b98c9e10a1d0b5f5ea Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 4 Aug 2022 10:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/base/BaseApplication.java   |   1 -
 .../BaseManufacturerRetwareService.java       |  10 +-
 .../BaseModelConfigMapper.java                |   3 +-
 .../basemodelconfig/BaseModelConfigMapper.xml | 298 ++++++++++--------
 .../basemodelconfig/BaseModelConfigRest.java  |   2 +-
 .../BaseModelConfigService.java               |   4 +-
 .../biz/basevehicle/BaseVehicleService.java   |   2 +-
 .../BaseVehicleModelMapper.java               |   3 +-
 .../BaseVehicleModelMapper.xml                |   5 +
 .../BaseVehicleModelService.java              |   2 +-
 10 files changed, 178 insertions(+), 152 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
index 436a4764b3..ee3c30fe90 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
@@ -16,7 +16,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 public class BaseApplication {
 
     public static void main(String[] args) {
-
         SpringApplication.run(BaseApplication.class, args);
     }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
index 05d1d7f857..c6d53658e5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
@@ -227,7 +227,13 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
     public ResultBean confirm(BaseManufacturerRetwareVehDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String manApprovalType = dto.getManApprovalType();
+        if (StringUtils.isBlank(manApprovalType)){
+            return rb.setMsg("请选择审批结果");
+        }
         String refundMoney = dto.getRefundMoney();
+        if (StringUtils.isBlank(refundMoney)){
+            return rb.setMsg("请填写退款金额");
+        }
         String vinNo = dto.getVinNo();
         String mainSid = dto.getMainSid();
         BaseVehicle baseVehicle = baseVehicleService.selectByVinNo(vinNo);
@@ -235,12 +241,12 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
         if (StringUtils.isNotBlank(s)){
             return rb.setMsg("该车辆已确认");
         }
-        if (manApprovalType.equals("0")){
+        if (manApprovalType.equals("成功")){
             baseVehicle.setVehicleState(VehicleState.StockEnum.RETURN_STOCK.getCode());
             baseVehicle.setVehicleStateValue(VehicleState.StockEnum.RETURN_STOCK.getRemarks());
             baseVehicleService.updateVeh(baseVehicle);
             baseManufacturerRetwareVehService.updateByVinNo(manApprovalType,refundMoney,vinNo);
-        }else if (manApprovalType.equals("1")){
+        }else if (manApprovalType.equals("失败")){
             baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
             baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
             baseVehicleService.updateVeh(baseVehicle);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
index 7f80caa122..2ffc575c2c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.java
@@ -210,6 +210,5 @@ public interface BaseModelConfigMapper extends BaseMapper<BaseModelConfig> {
 
     List<String> fetchConfigName(String createOrgSid);
 
-    @Select("SELECT COUNT(*) FROM base_model_config WHERE isDelete = 0 AND createOrgSId = #{sid}")
-    int selectCountByOrgSid(String sid);
+    int selectCount();
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
index 248701fb8f..a4910423b8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
@@ -142,7 +142,9 @@
         <!--备注-->
         bmc.remarks,
         <!--创建组织名称-->
-        bmc.createOrg
+        bmc.createOrg,
+        <!--配置编码-->
+        bmc.configCode
         FROM base_model_config bmc
         <where>
             ${ew.sqlSegment}
@@ -174,7 +176,7 @@
     <select id="selectDown" resultType="com.yxt.anrui.base.api.basemodelconfig.BaseVehicleModelConfigDownVo">
         SELECT bmc.sid<!--, bmc.vehicleCode-->
         FROM base_model_config bmc
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getAppChooseListByModelSid"
@@ -192,7 +194,7 @@
         bmc.otherConfig,
         bmc.remarks
         FROM base_model_config bmc
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectAppConfigListByModelSid"
@@ -223,8 +225,8 @@
                bmc.multimedia,
                bv.guidedPrice
         FROM base_vehicle bv
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
     <select id="selectAppConfigListByModelSid2"
@@ -258,16 +260,16 @@
                 FROM base_vehmodel_config bvc
                 WHERE bvc.configurationItemsSid = bmc.sid) AS priceValidity
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
 
     <select id="selectVehicleQuantity" resultType="java.lang.String">
         SELECT count(*)
         FROM base_model_config bmc
-                 LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_vehmodel_config bvc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bmc.sid = #{sid}
           AND bvm.sid = #{modelSid}
     </select>
@@ -295,8 +297,8 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
+                     LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid
+                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -443,10 +445,10 @@
         <!-- 更多配置-->
         bc.otherConfig
         from base_model_config bc
-                 left join base_vehmodel_config bv on bv.configurationItemsSid = bc.sid
-                 left join base_vehicle_model bm on bm.sid = bv.modelSid
+        left join base_vehmodel_config bv on bv.configurationItemsSid = bc.sid
+        left join base_vehicle_model bm on bm.sid = bv.modelSid
         where bc.sid = #{sid}
-          and bm.sid = #{modelSid}
+        and bm.sid = #{modelSid}
     </select>
     <select id="getAppProductionSchedulingDetailsVo"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo">
@@ -471,17 +473,19 @@
                bmc.multimedia,
                bmc.otherConfig
         FROM bus_vehicle_apply_detail bvad
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
+                     LEFT JOIN base_model_config bmc ON bmc.sid = bvad.configSid
+                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bvad.vehicleSid
         WHERE bmc.sid = #{configSid}
           AND bvm.sid = #{modelSid}
     </select>
 
     <select id="getModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.ModelConfigVo">
-        SELECT bvm.vehicleAlias                                        AS modelName,
+        SELECT bvm.vehicleAlias                                                   AS modelName,
                bvm.brandName,
                bvm.vehicleVersionValue,
-               if(MIN(bvc.guidedPrice)=MAX(bvc.guidedPrice),convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)),CONCAT(convert(MIN(bvc.guidedPrice)/10000,decimal(10,2)), '-', convert(MAX(bvc.guidedPrice)/10000,decimal(10,2)))) AS price,
+               if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)),
+                  CONCAT(convert(MIN(bvc.guidedPrice) / 10000, decimal (10, 2)), '-',
+                         convert(MAX(bvc.guidedPrice) / 10000, decimal (10, 2)))) AS price,
                bvm.vehicleTypeValue,
                bvm.productLineValue,
                bvm.powerValue,
@@ -496,51 +500,53 @@
                bvm.specifications,
                bvm.insideCode
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
         where bvm.sid = #{modelSid}
           and bvc.useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getModelConfigPageList"
             resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid                       as configSid,
-               bmc.carColor,
-               bmc.slowMachine,
-               bmc.rearViewMirror,
-               bmc.tireSize,
-               bmc.specification,
-               bmc.rearAxleRatio,
-               bmc.airConditioner,
-               bmc.hubMaterial,
-               bmc.baffleModel,
-               bmc.suspension,
-               bmc.seat,
-               bmc.tireCover,
-               bmc.saddle,
-               bmc.wheelbase,
-               bmc.bumper,
-               bmc.configuringBao,
-               bmc.independentSources,
-               bmc.fuelTank,
-               bmc.multimedia,
-               convert(bvc.guidedPrice/10000,decimal(10,2))               as price,
-               bvc.priceValidity,
-               bvm.sid                       as modelSid,
-               bvm.vehicleAlias              as modelName,
-               bvm.brandName                 as brand,
-               bvm.carBrand                  as brandSid,
-               (SELECT count(*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvc.modelSid
-                  AND bv.modelConfigSid = bvc.configurationItemsSid
-                  AND bv.lockedState = #{lockedStateKey}
-                  and bv.useOrgSid = #{orgSid}) AS nowCarNum,
-               (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
+        SELECT bmc.sid as configSid,
+        bmc.carColor,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.tireSize,
+        bmc.specification,
+        bmc.rearAxleRatio,
+        bmc.airConditioner,
+        bmc.hubMaterial,
+        bmc.baffleModel,
+        bmc.suspension,
+        bmc.seat,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.wheelbase,
+        bmc.bumper,
+        bmc.configuringBao,
+        bmc.independentSources,
+        bmc.fuelTank,
+        bmc.multimedia,
+        convert(bvc.guidedPrice/10000,decimal(10,2)) as price,
+        bvc.priceValidity,
+        bvm.sid as modelSid,
+        bvm.vehicleAlias as modelName,
+        bvm.brandName as brand,
+        bvm.carBrand as brandSid,
+        (SELECT count(*)
+        FROM base_vehicle bv
+        WHERE bv.modelSid = bvc.modelSid
+        AND bv.modelConfigSid = bvc.configurationItemsSid
+        AND bv.lockedState = #{lockedStateKey}
+        and bv.useOrgSid = #{orgSid}) AS nowCarNum,
+        (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
+        as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
-        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid)               AS produceCarNum
+        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid) AS
+        produceCarNum
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
@@ -556,10 +562,14 @@
                 WHERE bv.modelSid = #{modelSid}
                   and bv.modelConfigSid = #{configSid}
                   AND bv.lockedState = #{state}
-                  and bv.useOrgSid = bvc.useOrgSid)     AS nowCarNum,
-               (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
-        LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
-        where bo.useOrgSid =bvc.useOrgSid and bd.vehicleSid = #{modelSid} and bd.configSid = #{configSid}) AS produceCarNum
+                  and bv.useOrgSid = bvc.useOrgSid) AS nowCarNum,
+               (select SUM(distinct cast((cast(bo.platformNo as signed) -
+                                          IFNULL(cast(bo.lockingNum as signed), '0')) as signed)) as quantity
+                from bus_vehicle_order bo
+                             LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
+                where bo.useOrgSid = bvc.useOrgSid
+                  and bd.vehicleSid = #{modelSid}
+                  and bd.configSid = #{configSid})  AS produceCarNum
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
@@ -593,51 +603,53 @@
 --                bv.salePrice as price,
                bmc.otherConfig
         FROM base_vehicle bv
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
     <select id="getNowConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid                           as configSid,
-               bmc.carColor,
-               bmc.slowMachine,
-               bmc.rearViewMirror,
-               bmc.tireSize,
-               bmc.specification,
-               bmc.rearAxleRatio,
-               bmc.airConditioner,
-               bmc.hubMaterial,
-               bmc.baffleModel,
-               bmc.suspension,
-               bmc.seat,
-               bmc.tireCover,
-               bmc.saddle,
-               bmc.wheelbase,
-               bmc.bumper,
-               bmc.configuringBao,
-               bmc.independentSources,
-               bmc.fuelTank,
-               bmc.multimedia,
-               bvc.guidedPrice                   as price,
-               bvc.priceValidity,
-               bvm.sid                           as modelSid,
-               bvm.vehicleAlias                  as modelName,
-               bvm.brandName                     as brand,
-               bvm.carBrand                      as brandSid,
-               (SELECT
-                    count(*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvc.modelSid
-                  AND bv.modelConfigSid = bvc.configurationItemsSid
-                  AND bv.lockedState = #{state}
-                  and bv.useOrgSid = #{orgSid})     AS nowCarNum,
-               (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
+        SELECT bmc.sid as configSid,
+        bmc.carColor,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.tireSize,
+        bmc.specification,
+        bmc.rearAxleRatio,
+        bmc.airConditioner,
+        bmc.hubMaterial,
+        bmc.baffleModel,
+        bmc.suspension,
+        bmc.seat,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.wheelbase,
+        bmc.bumper,
+        bmc.configuringBao,
+        bmc.independentSources,
+        bmc.fuelTank,
+        bmc.multimedia,
+        bvc.guidedPrice as price,
+        bvc.priceValidity,
+        bvm.sid as modelSid,
+        bvm.vehicleAlias as modelName,
+        bvm.brandName as brand,
+        bvm.carBrand as brandSid,
+        (SELECT
+        count(*)
+        FROM base_vehicle bv
+        WHERE bv.modelSid = bvc.modelSid
+        AND bv.modelConfigSid = bvc.configurationItemsSid
+        AND bv.lockedState = #{state}
+        and bv.useOrgSid = #{orgSid}) AS nowCarNum,
+        (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
+        as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
-        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid) AS produceCarNum
+        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid) AS
+        produceCarNum
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
@@ -658,7 +670,7 @@
 
 
         ORDER BY
-            nowCarNum DESC
+        nowCarNum DESC
     </select>
 
     <select id="checkByConfigName" resultType="int">
@@ -677,46 +689,48 @@
     </select>
 
     <select id="getPcModelConfigList" resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
-        SELECT bmc.sid                       as configSid,
-               bmc.carColor,
-               bmc.slowMachine,
-               bmc.rearViewMirror,
-               bmc.tireSize,
-               bmc.specification,
-               bmc.rearAxleRatio,
-               bmc.airConditioner,
-               bmc.hubMaterial,
-               bmc.baffleModel,
-               bmc.suspension,
-               bmc.seat,
-               bmc.tireCover,
-               bmc.saddle,
-               bmc.wheelbase,
-               bmc.bumper,
-               bmc.configuringBao,
-               bmc.independentSources,
-               bmc.fuelTank,
-               bmc.multimedia,
-               convert(bvc.guidedPrice/10000,decimal(10,2))               as price,
-               bvc.priceValidity,
-               bvc.manufactorSettlementPrice,
-               bvm.sid                       as modelSid,
-               bvm.vehicleAlias              as modelName,
-               bvm.brandName                 as brand,
-               bvm.carBrand                  as brandSid,
-               bvc.sid vehModelConfigSid,
-               (SELECT count(*)
-                FROM base_vehicle bv
-                WHERE bv.modelSid = bvc.modelSid
-                  AND bv.modelConfigSid = bvc.configurationItemsSid
-                  AND bv.lockedState = #{lockedStateKey}
-                  and bv.useOrgSid = #{orgSid}) AS nowCarNum,
-               (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed)) as quantity from bus_vehicle_order bo
+        SELECT bmc.sid as configSid,
+        bmc.carColor,
+        bmc.slowMachine,
+        bmc.rearViewMirror,
+        bmc.tireSize,
+        bmc.specification,
+        bmc.rearAxleRatio,
+        bmc.airConditioner,
+        bmc.hubMaterial,
+        bmc.baffleModel,
+        bmc.suspension,
+        bmc.seat,
+        bmc.tireCover,
+        bmc.saddle,
+        bmc.wheelbase,
+        bmc.bumper,
+        bmc.configuringBao,
+        bmc.independentSources,
+        bmc.fuelTank,
+        bmc.multimedia,
+        convert(bvc.guidedPrice/10000,decimal(10,2)) as price,
+        bvc.priceValidity,
+        bvc.manufactorSettlementPrice,
+        bvm.sid as modelSid,
+        bvm.vehicleAlias as modelName,
+        bvm.brandName as brand,
+        bvm.carBrand as brandSid,
+        bvc.sid vehModelConfigSid,
+        (SELECT count(*)
+        FROM base_vehicle bv
+        WHERE bv.modelSid = bvc.modelSid
+        AND bv.modelConfigSid = bvc.configurationItemsSid
+        AND bv.lockedState = #{lockedStateKey}
+        and bv.useOrgSid = #{orgSid}) AS nowCarNum,
+        (select SUM(distinct cast((cast(bo.platformNo as signed)-IFNULL(cast(bo.lockingNum as signed),'0')) as signed))
+        as quantity from bus_vehicle_order bo
         LEFT JOIN bus_vehicle_apply_detail bd on bo.purchaseRequisitionSid = bd.applySid
-        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid)               AS produceCarNum
+        where bo.useOrgSid =#{orgSid} and bd.vehicleSid = bvc.modelSid and bd.configSid = bvc.configurationItemsSid) AS
+        produceCarNum
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
@@ -727,9 +741,13 @@
     </select>
 
     <select id="fetchConfigName" resultType="java.lang.String">
-        SELECT
-                CONCAT(configName,otherConfig) configName
-        FROM  base_model_config
+        SELECT CONCAT(configName, otherConfig) configName
+        FROM base_model_config
         WHERE createOrgSId = #{createOrgSid}
     </select>
+
+    <select id="selectCount" resultType="int">
+        SELECT IFNULL(MAX(configCode),0) CODE
+        FROM base_model_config
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
index 50cd5dde65..625d78a284 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
@@ -166,7 +166,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         }
         entity.setCreateOrgSId(sid);
         // 配置编码
-        int i1 = baseModelConfigService.selectCountByOrgSid(sid);
+        int i1 = baseModelConfigService.selectCount();
         String num = String.format("%04d", i1 + 1); // 不足4位补0
         entity.setConfigCode(num);
         boolean isSave = baseModelConfigService.save(entity);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
index 7b0d2d0b22..d6e2918fb7 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@@ -850,7 +850,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         return baseMapper.fetchConfigName(createOrgSid);
     }
 
-    public int selectCountByOrgSid(String sid) {
-        return baseMapper.selectCountByOrgSid(sid);
+    public int selectCount() {
+        return baseMapper.selectCount();
     }
 }
\ No newline at end of file
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 7cfbad5332..01b6fcaef2 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
@@ -1089,7 +1089,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
             //买断
             qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
-            //t调车
+            //调车
             qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
         }
         return qw;
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
index 78498173a2..e64816e32b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.java
@@ -158,6 +158,5 @@ public interface BaseVehicleModelMapper extends BaseMapper<BaseVehicleModel> {
 
     int checkByCreateOrgAndModelSid(@Param("sid1") String sid1, @Param("sid") String sid);
 
-    @Select("SELECT COUNT(*) FROM base_vehicle_model WHERE isDelete = 0 AND createOrg = #{sid}")
-    int selectCountByOrgSid(String sid);
+    int selectCount();
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
index 12642df4dc..a7053c4dc3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
@@ -434,4 +434,9 @@
           AND sid = #{sid}
           AND isDelete = 0
     </select>
+
+    <select id="selectCount" resultType="int">
+        SELECT IFNULL(MAX(vehicleTypeCode),0) CODE
+        FROM base_vehicle_model
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
index 22199a1209..29a2c6f8a3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
@@ -508,7 +508,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             }
             entity.setCreateOrg(sid2);
             // 配置编码
-            int i1 = baseMapper.selectCountByOrgSid(sid2);
+            int i1 = baseMapper.selectCount();
             String num = String.format("%04d", i1 + 1); // 不足4位补0
             entity.setVehicleTypeCode(num);
             boolean isSave = save(entity);