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 6d8f07839f..97d5d2ba06 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 @@ -2090,8 +2090,8 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", VehicleState.StockEnum.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.ING_STOCK.getCode())); + //库存或调出或内销。2024-03-18添加调出中也允许未售买断 + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.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.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode())); //非外采或非内购 qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode()); qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());