From 87b083b36127e2ef9b632e5901cb9fc055aea4ba Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 28 Jul 2022 11:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplication.java | 2 ++ .../BaseOutsourcingApplicationDto.java | 2 ++ .../base/api/basevehicle/BaseVehicleDto.java | 4 +++ .../BaseManufactorSubscriptionService.java | 2 +- .../basemodelconfig/BaseModelConfigRest.java | 29 ++-------------- .../BaseOutsourcingApplicationService.java | 34 ++++++++++++++++++- .../base/biz/basevehicle/BaseVehicleRest.java | 15 +++++++- .../ScmVehicleExamineFeign.java | 5 +++ .../ScmVehicleExamineFeignFallback.java | 5 +++ .../ScmVehinspectItemFeign.java | 4 +++ .../ScmVehinspectItemFeignFallback.java | 5 +++ .../ScmVehicleExamineRest.java | 6 ++++ .../ScmVehinspectItemRest.java | 5 +++ 13 files changed, 88 insertions(+), 30 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index 54748b8f80..2b5c390a9b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -70,6 +70,8 @@ public class BaseOutsourcingApplication extends BaseEntity { private String modelSid; // 车型sid @ApiModelProperty("车型名称") private String modelName; // 车型名称 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid @ApiModelProperty("常用配置名称") private String configName; // 常用配置名称 @ApiModelProperty("采购价格") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 37989c36df..e38d993a7a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -80,6 +80,8 @@ public class BaseOutsourcingApplicationDto implements Dto { private String modelSid; // 车型sid @ApiModelProperty("车型名称") private String modelName; // 车型名称 + @ApiModelProperty("常用配置sid") + private String configSid; // 常用配置sid @ApiModelProperty("常用配置名称") private String configName; // 常用配置名称 @ApiModelProperty("采购价格") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index eaae33771d..97b2c0b0d2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -105,4 +105,8 @@ public class BaseVehicleDto implements Dto { private String insideCode; @ApiModelProperty(value = "运费") private Integer freight; + @ApiModelProperty(value = "合格证状态key") + private String certificateState = "0001"; + @ApiModelProperty(value = "合格证状态value") + private String certificateStateValue = "虚拟"; } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java index 566b0839e3..8a354fde17 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java @@ -235,7 +235,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService createQueryWrapper(BaseOutsourcingApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -417,7 +423,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService rb = flowableFeign.handleProsess(bv); @@ -440,6 +446,32 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(bv.getBusinessSid()); + for (BaseOutsourcingApplicationVehicleVo baseOutsourcingApplicationVehicleVo : baseOutsourcingApplicationVehicleVos) { + ScmEntryVehicleExamineDto scmEntryVehicleExamineDto = new ScmEntryVehicleExamineDto(); + //配置的名称 + scmEntryVehicleExamineDto.setConfigName(booad.getConfigName()); + scmEntryVehicleExamineDto.setConfigSid(booad.getConfigSid()); + scmEntryVehicleExamineDto.setModelName(booad.getModelName()); + scmEntryVehicleExamineDto.setModelSid(booad.getModelSid()); + //订单类型 + scmEntryVehicleExamineDto.setPurchaseTypeKey("03"); + scmEntryVehicleExamineDto.setPurchaseType("排产"); + scmEntryVehicleExamineDto.setUserSid(bv.getUserSid()); + scmEntryVehicleExamineDto.setVinNo(baseOutsourcingApplicationVehicleVo.getVinNo()); + scmEntryVehicleExamineDto.setInspectionResult("1"); + ResultBean resultBean1 = scmVehicleExamineFeign.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); + if (!resultBean1.getSuccess()) { + return rb.setMsg("验车业务模块的数据推送失败!"); + } + ScmVehinspectItemDto scmVehinspectItemDto = new ScmVehinspectItemDto(); + scmVehinspectItemDto.setVehInspectSid(resultBean1.getData()); + ResultBean resultBean = scmVehinspectItemFeign.saveItem(scmVehinspectItemDto); + if (!resultBean.getSuccess()) { + return rb.setMsg("验车单业务模块的数据推送失败!"); + } + } } return rb; } else { 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 1e80be4e0d..e4faf9dfc8 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 @@ -7,9 +7,11 @@ import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; +import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService; import com.yxt.anrui.base.common.enums.VehicleState; @@ -81,6 +83,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Autowired private BusVehicleInquiryService busVehicleInquiryService; + @Autowired + private BaseVehicleCertificateService baseVehicleCertificateService; + @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -111,7 +116,15 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); boolean isSave = baseVehicleService.save(baseVehicle); - + BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); + if (StringUtils.isNotBlank(dto.getVinNo())){ + baseVehicleCertificate.setVinNo(dto.getVinNo()); + baseVehicleCertificate.setCertificateState(dto.getCertificateState()); + baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue()); + baseVehicleCertificateService.save(baseVehicleCertificate); + }else { + return rb.setMsg("车架号不能为空"); + } return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功"); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java index 34cc9f2047..008228acf7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java @@ -74,6 +74,11 @@ public interface ScmVehicleExamineFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("PC端-推送验车数据") + @PostMapping("/saveEntryCarInspectedInfo") + @ResponseBody + public ResultBean saveEntryCarInspectedInfo(@RequestBody ScmEntryVehicleExamineDto scmEntryVehicleExamineDto); + @ApiOperation("PC端-获取验车管理列表") @PostMapping("/selectCarInspectedList") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java index ac8e2eb089..09ee70ffad 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java @@ -68,6 +68,11 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign { return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问"); } + @Override + public ResultBean saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) { + return null; + } + @Override public ResultBean> selectCarInspectedList(PagerQuery pagerQuery) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java index 9f5c0f7a20..15dc0ba4af 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java @@ -62,6 +62,10 @@ public interface ScmVehinspectItemFeign { @ResponseBody public ResultBean save(@RequestBody ScmVehinspectItemDto dto); + @ApiOperation("推送验车单数据") + @PostMapping("/saveItem") + @ResponseBody + public ResultBean saveItem(@RequestBody ScmVehinspectItemDto dto); /** * Pc端根据验车单sid初始化车辆检查表 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java index 9b022187da..d7278568d3 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java @@ -54,6 +54,11 @@ public class ScmVehinspectItemFeignFallback implements ScmVehinspectItemFeign { return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehinspectitem/save无法访问"); } + @Override + public ResultBean saveItem(ScmVehinspectItemDto dto) { + return null; + } + @Override public ResultBean> getVehinspectItemInfo(String vehInspectSid) { return null; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java index e4dc2514a8..fc4b40544b 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmvehicleexamine; import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehicleexamine.*; +import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -95,6 +96,11 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign { return rb.success().setData(vo); } + @Override + public ResultBean saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) { + return scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto); + } + @Override @ApiOperation("PC端-获取验车管理列表") @PostMapping("/selectCarInspectedList") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java index ad677bf6dc..e6737bac7d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java @@ -65,6 +65,11 @@ public class ScmVehinspectItemRest implements ScmVehinspectItemFeign { return scmVehinspectItemService.saveItem(dto); } + @Override + public ResultBean saveItem(ScmVehinspectItemDto dto) { + return scmVehinspectItemService.saveItem(dto); + } + @Override public ResultBean> getVehinspectItemInfo(String vehInspectSid) { ResultBean rb = ResultBean.fireFail();