yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yxt_djz 3 years ago
parent
a14a4094e4 87b083b361
commit
6ccf8d0e67
13 changed files with 88 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
  5. 29
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
  6. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  7. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  8. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
  9. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java
  10. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java
  11. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java
  12. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java
  13. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
View File

@ -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("采购价格")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
View File

@ -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("采购价格")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
View File

@ -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 = "虚拟";
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java
View File

@ -235,7 +235,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
listDto.setOrderTypeKey("001");
listDto.setInsideCode(vo.getInsideCode());
listDto.setOrderStatus("待办");
listDto.setSubscriptionDate(baseManufactorSubscription.getSubscriptionDate());
listDto.setSubscriptionDate(DateUtil.today());
dtoList.add(listDto);
}
busVehicleOrderService.saveVehicleOrder(dtoList);

29
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java
View File

@ -84,8 +84,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getCarColor() + "/";
}
//缓速器
if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
configName += "缓速器/";
if (StringUtils.isNotBlank(dto.getSlowMachine())) {
configName += dto.getSlowMachine() + "/";
}
//后视镜
if (StringUtils.isNotBlank(dto.getRearViewMirror())) {
@ -104,9 +104,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
@ -127,9 +124,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
/*if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
@ -150,9 +144,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
@ -206,9 +197,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getCarColor() + "/";
}
//缓速器
/*if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) {
configName += "缓速器/";
}*/
if (StringUtils.isNotBlank(dto.getSlowMachine())) {
configName += dto.getSlowMachine() + "/";
}
@ -229,9 +217,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getRearAxleRatio() + "/";
}
//空调
/*if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) {
configName += "空调/";
}*/
if (StringUtils.isNotBlank(dto.getAirConditioner())) {
configName += dto.getAirConditioner() + "/";
}
@ -252,9 +237,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getSeat() + "/";
}
//护轮罩
/* if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) {
configName += "护轮罩/";
}*/
if (StringUtils.isNotBlank(dto.getTireCover())) {
configName += dto.getTireCover() + "/";
}
@ -275,9 +257,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getConfiguringBao() + "/";
}
//独立热源
/*if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) {
configName += "独立热源/";
}*/
if (StringUtils.isNotBlank(dto.getIndependentSources())) {
configName += dto.getIndependentSources() + "/";
}
@ -286,9 +265,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
configName += dto.getFuelTank() + "/";
}
//多媒体
/*if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) {
configName += "多媒体/";
}*/
if (StringUtils.isNotBlank(dto.getMultimedia())) {
configName += dto.getMultimedia() + "/";
}
@ -427,7 +403,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
/**
* 更多配置分页列表(非本公司的)
*
* @param pagerQuery
* @return
*/
/* @Override

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -70,7 +70,9 @@ import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto;
import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto;
import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemFeign;
import com.yxt.common.base.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -119,6 +121,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
private FinPaymentrecordFeign finPaymentrecordFeign;
@Autowired
private CommonAppendixService commonAppendixService;
@Autowired
private ScmVehicleExamineFeign scmVehicleExamineFeign;
@Autowired
private ScmVehinspectItemFeign scmVehinspectItemFeign;
private QueryWrapper<BaseOutsourcingApplication> createQueryWrapper(BaseOutsourcingApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -417,7 +423,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
* @return
*/
public ResultBean complete(BusinessVariables bv) {
BaseOutsourcingApplicationDto booad = baseMapper.getBySid(bv.getBusinessSid());
BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
String businessTaskid = booad.getTaskId();
if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
ResultBean<UpdateFlowFieldVo> rb = flowableFeign.handleProsess(bv);
@ -440,6 +446,32 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
finPaymentrecordDto.setCost(Integer.parseInt(booad.getTotalExpenseAmount().toString()));
//finPaymentrecordDto.setBusSid();
finPaymentrecordFeign.save(finPaymentrecordDto);
//验车数据推送
List<BaseOutsourcingApplicationVehicleVo> 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<String> 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 {

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

@ -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<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
ResultBean<PagerVo<BaseVehicleVo>> 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("保存成功");
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java
View File

@ -74,6 +74,11 @@ public interface ScmVehicleExamineFeign {
@ResponseBody
public ResultBean<ScmVehicleExamineDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("PC端-推送验车数据")
@PostMapping("/saveEntryCarInspectedInfo")
@ResponseBody
public ResultBean<String> saveEntryCarInspectedInfo(@RequestBody ScmEntryVehicleExamineDto scmEntryVehicleExamineDto);
@ApiOperation("PC端-获取验车管理列表")
@PostMapping("/selectCarInspectedList")
@ResponseBody

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java
View File

@ -68,6 +68,11 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign {
return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<String> saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) {
return null;
}
@Override
public ResultBean<PagerVo<ScmVehicleExaminePageVo>> selectCarInspectedList(PagerQuery<ScmVehicleExaminePageQuery> pagerQuery) {
return null;

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeign.java
View File

@ -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初始化车辆检查表

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemFeignFallback.java
View File

@ -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<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
return null;

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java
View File

@ -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<String> saveEntryCarInspectedInfo(ScmEntryVehicleExamineDto scmEntryVehicleExamineDto) {
return scmVehicleExamineService.saveEntryCarInspectedInfo(scmEntryVehicleExamineDto);
}
@Override
@ApiOperation("PC端-获取验车管理列表")
@PostMapping("/selectCarInspectedList")

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemRest.java
View File

@ -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<List<ScmVehinspectItemInfoVo>> getVehinspectItemInfo(String vehInspectSid) {
ResultBean rb = ResultBean.fireFail();

Write Preview
Loading…
Cancel
Save