上装、挂车入库选择车辆优化

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

@@ -274,6 +274,13 @@ public interface BaseVehicleFeign {
     @PostMapping("/selGCVehByStockState")
     public ResultBean<List<BaseExistingCarListVo>> selGCVehByStockState(@RequestParam("createOrgSid") String createOrgSid);
 
+    /**
+     * 根据车辆sid获取销售订单信息
+     */
+    @ApiOperation("根据车辆sid获取销售订单信息")
+    @PostMapping("/fetchByVehSid")
+    public ResultBean<BaseExistingCarListVo> fetchByVehSid(@RequestParam("vehSid") String vehSid);
+
     /**
      * pc排产车详情（新）
      *

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

@@ -157,6 +157,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseExistingCarListVo> fetchByVehSid(String vehSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppPurchaseDetailsVo> getPurchaseDetails(String vinNo) {
         return null;

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

@@ -1071,6 +1071,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.selGCVehByStockState(createOrgSid);
     }
 
+    @Override
+    public ResultBean<BaseExistingCarListVo> fetchByVehSid(String vehSid) {
+        return baseVehicleService.baseVehicleService(vehSid);
+    }
+
     /**
      * 根据车架号查询现车详情
      *

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

@@ -993,14 +993,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param configSid
      * @return
      */
-    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid,String orgPath) {
+    public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid, String orgPath) {
         String useOrg = "";
         if (StringUtils.isNotBlank(useOrgSid)) {
             useOrg = useOrgSid;
         } else {
             useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             useOrg = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
@@ -1994,7 +1994,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
             }
-            if(StringUtils.isNotBlank(params.getPurchaseSystemSid())){
+            if (StringUtils.isNotBlank(params.getPurchaseSystemSid())) {
                 qw.like("bv.purchaseSystemSid", params.getPurchaseSystemSid());
             }
             //结算状态：0未买断
@@ -3868,6 +3868,28 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return rb.success().setData(baseExistingCarListVo);
     }
 
+    public ResultBean<BaseExistingCarListVo> baseVehicleService(String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(vehSid).getData();
+        BaseExistingCarListVo existingCarListVo = new BaseExistingCarListVo();
+        for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
+            String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
+            BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
+            if (busSalesOrderDetailsVo != null) {
+                if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
+                    existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
+                    existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
+                    existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid());
+                    existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName());
+                    existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid());
+                    existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName());
+                    break;
+                }
+            }
+        }
+        return rb.success().setData(existingCarListVo);
+    }
+
     public PagerVo<BaseVehicleQKKPVo> vehicleQKKPList(PagerQuery<BaseVehicleQKKPQuery> pagerQuery) {
         IPage<BaseVehicleQKKPVo> page = vehicleQKKPPageList(pagerQuery);
         List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
@@ -3875,9 +3897,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         List<BaseVehicleQKKPVo> recordsNew1 = new ArrayList<>();
         List<BaseVehicleQKKPVo> recordsNew = new ArrayList<>();
         for (BaseVehicleQKKPVo record : records) {
-            if (StringUtils.isNotBlank(record.getVehSid())){
+            if (StringUtils.isNotBlank(record.getVehSid())) {
                 FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
-                if (finBillVehicleDetailsVo == null){
+                if (finBillVehicleDetailsVo == null) {
                     recordsNew1.add(record);
                 }
             }
@@ -3885,14 +3907,14 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew1) {
             String vehSid = baseVehicleQKKPVo.getVehSid();
             BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyFeign.selSubmitLc(vehSid).getData();
-            if (busArrearsCarryVehicleApply == null){
+            if (busArrearsCarryVehicleApply == null) {
                 recordsNew.add(baseVehicleQKKPVo);
             }
         }
         for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {
-            TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(),baseVehicleQKKPVo.getContractNo()).getData();
+            TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(), baseVehicleQKKPVo.getContractNo()).getData();
             List<TrailerVo> trailerVos = data.getList();
-            if (trailerVos != null && trailerVos.size() > 0){
+            if (trailerVos != null && trailerVos.size() > 0) {
                 for (TrailerVo trailerVo : trailerVos) {
                     BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo();
                     baseVehicleQKKPTrailerVo.setVinNo(baseVehicleQKKPVo.getVinNo());
@@ -3914,7 +3936,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<BaseVehicleQKKPVo> page = PagerUtil.queryToPage(pagerQuery);
         BaseVehicleQKKPQuery params = pagerQuery.getParams();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        qw.eq("bso.contractNo",params.getContractNo());
+        qw.eq("bso.contractNo", params.getContractNo());
         if (StringUtils.isNotBlank(params.getVinNo())) {
             qw.like("bsov.linkNo", params.getVinNo());
         }
@@ -3923,9 +3945,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         //查询是否存在应收未收款项
         ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
-        if(!listResultBean.getData().isEmpty()){
+        if (!listResultBean.getData().isEmpty()) {
             listResultBean.getData().removeAll(Collections.singleton(null));
-            qw.notIn("bsov.sid",listResultBean.getData());
+            qw.notIn("bsov.sid", listResultBean.getData());
         }
         return baseMapper.vehicleQKKPPageList(page, qw);
     }