车型简介条件修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -729,6 +729,7 @@
         FROM base_vehicle bv
         WHERE bv.modelSid = bvc.modelSid
         AND bv.modelConfigSid = bvc.configurationItemsSid
+        and (bv.vehicleStateValue = '库存' or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '调入')
         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))

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -773,12 +773,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(pagerQuery.getCarColor())) { // 颜色
             qw.like("bmc.carColor", pagerQuery.getCarColor());
         }
-        if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) { //车辆状态
+      /*  if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) { //车辆状态
             qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0004").or().eq("bv.vehicleState", "0005"));
-        }
-        if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
+        }*/
+        /*if (StringUtils.isNotBlank(pagerQuery.getLockedState())) { //锁定状态
             qw.and(wrapper -> wrapper.eq("bv.lockedState", "0").or().isNull("bv.lockedState").or().eq("bv.lockedStateValue", ""));
-        }
+        }*/
+        qw.eq("bv.lockedState",VehicleState.LockEnum.UN_LOCK.getCode());
+        //库存或调出或内销
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         if (StringUtils.isNotBlank(pagerQuery.getUseOrg())) { // 分公司
             qw.eq("bv.useOrgSid", pagerQuery.getUseOrg());
         }