采购退库选择车辆修改排除已选择的车辆

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")
+//    @ApiModelProperty(value = "采购退库主表sid")
-    private String vehicleOutSid;
+//    private String vehicleOutSid;
+
+    @ApiModelProperty(value = "已选择的车辆的车架号")
+    private List<String> vinNoList = new ArrayList<>();
 
 
 }

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<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(params.getModelName())) {
                 qw.like("bvm.modelName", params.getModelName());
             }
-            if (StringUtils.isNotBlank(params.getVehicleOutSid())) {
+            if (params.getVinNoList().size() > 0) {
-                //查询采购退库申请的sid下的车辆的车架号
+                qw.notIn("bv.vinNo", params.getVinNoList());
-                ResultBean<List<String>> stringList = scmVehicleReturnDetailsFeign.selectVinNoList(params.getVehicleOutSid());
-                if (stringList.getSuccess()) {
-                    if (stringList.getData().size() > 0) {
-                        qw.notIn("bv.vinNo", stringList.getData());
-                    }
-                }
             }
             //锁定状态
             qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));