采购退库查询车架号列表及完善选择车辆列表时排除已选择的采购退库的车架号

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java

@@ -36,5 +36,8 @@ public class BaseVehicleReturnQuery implements Query {
     @ApiModelProperty(value = "快捷检索车型")
     private String modelName;
 
+    @ApiModelProperty(value = "采购退库主表sid")
+    private String vehicleOutSid;
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -14,6 +14,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -66,6 +67,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     @Autowired
     private FileUploadComponent fileUploadComponent;
 
+    @Autowired
+    private ScmVehicleReturnDetailsFeign scmVehicleReturnDetailsFeign;
+
     /**
      * 车辆信息分页列表
      *
@@ -902,6 +906,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return baseMapper.vehicleReturnPageList(page, qw);
     }
 
+    /**
+     * 采购退库构造查询条件
+     *
+     * @param params 查询条件
+     * @return
+     */
     private QueryWrapper<BaseVehicle> vehicleReturnWrapper(BaseVehicleReturnQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
@@ -949,13 +959,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(params.getModelName())) {
                 qw.like("bvm.modelName", params.getModelName());
             }
+            if (StringUtils.isNotBlank(params.getVehicleOutSid())) {
+                //查询采购退库申请的sid下的车辆的车架号
+                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", ""));
-
-            // 虚拟订单选择车辆查询现车库存列表参数
-//            if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态
-//                qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存"));
-//            }
+            qw.eq("bv.vehicleStateValue", "现车");
         }
         return qw;
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -1,21 +1,15 @@
 package com.yxt.anrui.buscenter.biz.busdeposit;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yxt.anrui.buscenter.api.busdeposit.*;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
+import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
-import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
-import com.yxt.anrui.buscenter.biz.flow.FlowableService;
-import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer;
 import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
-import com.yxt.anrui.flowable.api.utils.procDefEnum;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
-import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -27,7 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Project: anrui-buscenter(车辆订单) <br/>

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.scm.api.scmvehiclereturndetails;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 15:30
+ * @Description
+ */
+@FeignClient(
+        contextId = "anrui-scm-ScmVehicleReturnDetails",
+        name = "anrui-scm",
+        path = "v1/scmvehiclereturndetails",
+        fallback = ScmVehicleReturnDetailsFeignFallback.class)
+public interface ScmVehicleReturnDetailsFeign {
+
+    @ApiOperation("查询车架号列表")
+    @GetMapping("/selectVinNoList")
+    @ResponseBody
+    ResultBean<List<String>> selectVinNoList(@PathVariable(value = "sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.scm.api.scmvehiclereturndetails;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 15:30
+ * @Description
+ */
+@Component
+public class ScmVehicleReturnDetailsFeignFallback {
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java

@@ -28,4 +28,6 @@ public interface ScmVehicleReturnDetailsMapper extends BaseMapper<ScmVehicleRetu
      * @return
      */
     int deleteByReturnSid(String sid);
+
+    List<String> selectVinNoList(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml

@@ -12,4 +12,10 @@
         from scm_vehicle_return_details
         where vehicleOutSid = #{sid}
     </delete>
+
+    <select id="selectVinNoList" resultType="java.lang.String">
+        select vinNo
+        from scm_vehicle_return_details
+        where vehicleOutSid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.scm.biz.scmvehiclereturndetails;
+
+import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 15:29
+ * @Description
+ */
+@Api(tags = "车辆采购退库详细管理")
+@RequestMapping("v1/scmvehiclereturndetails")
+@Controller
+public class ScmVehicleReturnDetailsRest implements ScmVehicleReturnDetailsFeign {
+
+    @Autowired
+    private ScmVehicleReturnDetailsService scmVehicleReturnDetailsService;
+
+    @Override
+    public ResultBean<List<String>> selectVinNoList(String sid) {
+        return scmVehicleReturnDetailsService.selectVinNoList(sid);
+    }
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java

@@ -3,6 +3,7 @@ package com.yxt.anrui.scm.biz.scmvehiclereturndetails;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails;
 import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,4 +55,10 @@ public class ScmVehicleReturnDetailsService extends MybatisBaseService<ScmVehicl
         baseMapper.deleteByReturnSid(sid);
         saveDetails(detailsList, sid);
     }
+
+    public ResultBean<List<String>> selectVinNoList(String sid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> vinNoList = baseMapper.selectVinNoList(sid);
+        return rb.success().setData(vinNoList);
+    }
 }