修改库存查询

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

@@ -45,7 +45,6 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.base.common.enums.CertificState;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
@@ -56,7 +55,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@@ -3414,7 +3412,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             qw.eq("bv.isDelete", 0);
             //库存状态：库存
-            qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.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.OUT_STOCK.getCode())
+                    .or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode())
+                    .or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode())
+                    .or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())
+            );
         }
         return qw;
     }