|
|
@ -2090,8 +2090,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
} |
|
|
|
//结算状态:0未买断
|
|
|
|
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); |
|
|
|
//库存或调出或内销
|
|
|
|
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())); |
|
|
|
//库存或调出或内销。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()); |
|
|
|