diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java index 2aeb1cec85..7593e03d35 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -4,6 +4,9 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/4/12 11:30 @@ -36,8 +39,11 @@ public class BaseVehicleReturnQuery implements Query { @ApiModelProperty(value = "快捷检索车型") private String modelName; - @ApiModelProperty(value = "采购退库主表sid") - private String vehicleOutSid; +// @ApiModelProperty(value = "采购退库主表sid") +// private String vehicleOutSid; + + @ApiModelProperty(value = "已选择的车辆的车架号") + private List vinNoList = new ArrayList<>(); } 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 4fa41758f7..b78626c874 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 @@ -959,14 +959,8 @@ public class BaseVehicleService extends MybatisBaseService> stringList = scmVehicleReturnDetailsFeign.selectVinNoList(params.getVehicleOutSid()); - if (stringList.getSuccess()) { - if (stringList.getData().size() > 0) { - qw.notIn("bv.vinNo", stringList.getData()); - } - } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); } //锁定状态 qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));