|
|
@ -780,7 +780,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba |
|
|
|
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()); |
|
|
|