From 70acd807894267c677fa3f41346b48e767c8e689 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 1 Jun 2023 16:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E8=A3=85=E3=80=81=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 7 +++ .../basevehicle/BaseVehicleFeignFallback.java | 5 +++ .../base/biz/basevehicle/BaseVehicleRest.java | 5 +++ .../biz/basevehicle/BaseVehicleService.java | 44 ++++++++++++++----- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 111e224ce7..789fe0ec15 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/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> selGCVehByStockState(@RequestParam("createOrgSid") String createOrgSid); + /** + * 根据车辆sid获取销售订单信息 + */ + @ApiOperation("根据车辆sid获取销售订单信息") + @PostMapping("/fetchByVehSid") + public ResultBean fetchByVehSid(@RequestParam("vehSid") String vehSid); + /** * pc排产车详情（新） * diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index eda7cf4e39..dd143e841a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/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 fetchByVehSid(String vehSid) { + return null; + } + @Override public ResultBean getPurchaseDetails(String vinNo) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 9528d55fa1..5e5660f6ed 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/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 fetchByVehSid(String vehSid) { + return baseVehicleService.baseVehicleService(vehSid); + } + /** * 根据车架号查询现车详情 * 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 0ba62b1476..80a9fb0e95 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 @@ -993,14 +993,14 @@ public class BaseVehicleService extends MybatisBaseService 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 baseVehicleService(String vehSid) { + ResultBean rb = ResultBean.fireFail(); + List 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 vehicleQKKPList(PagerQuery pagerQuery) { IPage page = vehicleQKKPPageList(pagerQuery); List baseVehicleQKKPTrailerVos = new ArrayList<>(); @@ -3875,9 +3897,9 @@ public class BaseVehicleService extends MybatisBaseService recordsNew1 = new ArrayList<>(); List 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 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 page = PagerUtil.queryToPage(pagerQuery); BaseVehicleQKKPQuery params = pagerQuery.getParams(); QueryWrapper 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> 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); }