|
|
|
@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; |
|
|
|
@ -41,6 +42,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; |
|
|
|
import com.yxt.anrui.base.common.enums.BillTypeEnum; |
|
|
|
import com.yxt.anrui.base.common.enums.VehicleState; |
|
|
|
import com.yxt.anrui.base.common.utils.Rule; |
|
|
|
import com.yxt.anrui.base.common.utils.domain.BillNo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; |
|
|
|
@ -57,6 +59,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeQuery |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; |
|
|
|
@ -67,6 +70,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery; |
|
|
|
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; |
|
|
|
import com.yxt.anrui.flowable.api.flow2.FlowFeign; |
|
|
|
@ -152,6 +156,8 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
private BusSalesOrderVehicleService busSalesOrderVehicleService; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleStateFeign baseVehicleStateFeign; |
|
|
|
@Autowired |
|
|
|
private FinVehicleInvoiceFeign finVehicleInvoiceFeign; |
|
|
|
|
|
|
|
public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) { |
|
|
|
BusSalesOrderReturnVehApplyQuery query = pq.getParams(); |
|
|
|
@ -290,38 +296,84 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) { |
|
|
|
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid()); |
|
|
|
for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { |
|
|
|
spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid()); |
|
|
|
//------------------ 8.30优化退车申请注释--------------------------
|
|
|
|
// spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
|
|
|
|
spVehSids.add(busSalesOrderReturnVehDetailsVo.getBusVinSid()); |
|
|
|
//-------------------------------------------------------------------
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for (VinListsVo vinListsVo : vinListsVos) { |
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { |
|
|
|
//--------------------------------8.30优化退车申请注释----------------------------------
|
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getSid())) { |
|
|
|
BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo(); |
|
|
|
String vinSid = vinListsVo.getVinSid(); |
|
|
|
if (spVehSids.contains(vinSid)) { |
|
|
|
// String vinSid = vinListsVo.getVinSid();
|
|
|
|
if (spVehSids.contains(vinListsVo.getSid())) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData(); |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData(); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVehSid(vinSid); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor()); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setBusVinSid(vinListsVo.getSid()); |
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { |
|
|
|
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinListsVo.getVinSid()).getData(); |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData(); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVehSid(vinListsVo.getVinSid()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue()); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
} else { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-"); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-"); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-"); |
|
|
|
} |
|
|
|
// ------------查询车架号---------------
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
|
|
|
|
BusSalesOrderVehicleDetailsVo busSalesOrderVehicleDetailsVo = busSalesOrderVehicleService.selectVinNoBySid(vinListsVo.getSid()); |
|
|
|
if (null != busSalesOrderVehicleDetailsVo) { |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderVehicleDetailsVo.getLinkNo())) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setVinNo(busSalesOrderVehicleDetailsVo.getLinkNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInsureStateKey(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInsureStateValue(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue()); |
|
|
|
|
|
|
|
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo); |
|
|
|
} |
|
|
|
//-------------------------------------------------------------------------------------
|
|
|
|
// if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
|
|
|
|
// BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
|
|
|
|
// String vinSid = vinListsVo.getVinSid();
|
|
|
|
// if (spVehSids.contains(vinSid)) {
|
|
|
|
// continue;
|
|
|
|
// }
|
|
|
|
// BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
|
|
|
|
// BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
|
|
|
|
// if (baseVehicleCertificateVo != null) {
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
|
|
|
|
// } else {
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
|
|
|
|
// }
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
|
|
|
|
// busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
|
|
|
|
// }
|
|
|
|
} |
|
|
|
if (busSalesOrderReturnVehApplyECTJ != null) { |
|
|
|
if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) { |
|
|
|
@ -443,7 +495,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
return rb.setMsg("当前所在的组织机构不存在"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(sysOrganization.getManagerSid())) { |
|
|
|
// return rb.setMsg("当前所在的组织机构未设置主管人员");
|
|
|
|
// return rb.setMsg("当前所在的组织机构未设置主管人员");
|
|
|
|
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId()); |
|
|
|
} |
|
|
|
BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dto.getSid()); |
|
|
|
@ -574,6 +626,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
} |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
|
|
|
|
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(businessSid); |
|
|
|
//---------------------修改车辆持久状态-------------------------
|
|
|
|
String orderSid = busSalesOrderReturnVehApply.getOrderSid(); |
|
|
|
@ -582,10 +635,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
BusSalesOrder finalBusSalesOrderOne = busSalesOrderService.fetchBySid(orderSid); |
|
|
|
//---------------------修改车辆持久状态-------------------------
|
|
|
|
for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { |
|
|
|
String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid(); |
|
|
|
baseVehicleFeign.updateLockedState(vehSid); |
|
|
|
//8.30优化退车申请---如果车辆sid不为空-----
|
|
|
|
if (StringUtils.isNotBlank(busSalesOrderReturnVehDetailsVo.getVehSid())) { |
|
|
|
String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid(); |
|
|
|
baseVehicleFeign.updateLockedState(vehSid); |
|
|
|
//------修改车辆台账库存状态为库存、销售日期清空、成交价清空、锁定状态未锁定
|
|
|
|
baseVehicleFeign.updateStateForReturnVeh(vehSid); |
|
|
|
//对应车辆开票作废
|
|
|
|
finVehicleInvoiceFeign.updateBillingState(busSalesOrderReturnVehApply.getContractNo(), vehSid); |
|
|
|
} |
|
|
|
//------------------------修改车辆持久状态--------------------------
|
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vehSid, orderSid); |
|
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid()); |
|
|
|
vehicleList.add(busSalesOrderVehicle); |
|
|
|
} |
|
|
|
//------------------------修改车辆持久状态--------------------------
|
|
|
|
@ -895,38 +955,82 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) { |
|
|
|
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid()); |
|
|
|
for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { |
|
|
|
spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid()); |
|
|
|
// spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
|
|
|
|
spVehSids.add(busSalesOrderReturnVehDetailsVo.getBusVinSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for (VinListsVo vinListsVo : vinListsVos) { |
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { |
|
|
|
//--------------------------------8.30优化退车申请注释----------------------------------
|
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getSid())) { |
|
|
|
BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo(); |
|
|
|
String vinSid = vinListsVo.getVinSid(); |
|
|
|
if (spVehSids.contains(vinSid)) { |
|
|
|
// String vinSid = vinListsVo.getVinSid();
|
|
|
|
if (spVehSids.contains(vinListsVo.getSid())) { |
|
|
|
continue; |
|
|
|
} |
|
|
|
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData(); |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData(); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVehSid(vinSid); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor()); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setBusVinSid(vinListsVo.getSid()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setContractNo(appOrderDetailsVo.getContractId()); |
|
|
|
if (StringUtils.isNotBlank(vinListsVo.getVinSid())) { |
|
|
|
BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinListsVo.getVinSid()).getData(); |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData(); |
|
|
|
busSalesOrderReturnVehDetailsVo.setVehSid(vinListsVo.getVinSid()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue()); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
} else { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-"); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-"); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-"); |
|
|
|
} |
|
|
|
// ------------查询车架号---------------
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
|
|
|
|
BusSalesOrderVehicleDetailsVo busSalesOrderVehicleDetailsVo = busSalesOrderVehicleService.selectVinNoBySid(vinListsVo.getSid()); |
|
|
|
if (null != busSalesOrderVehicleDetailsVo) { |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderVehicleDetailsVo.getLinkNo())) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setVinNo(busSalesOrderVehicleDetailsVo.getLinkNo()); |
|
|
|
} |
|
|
|
} |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInvoicingStateKey(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInvoicingStateValue(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInsureStateKey(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setInsureStateValue(""); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState()); |
|
|
|
busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue()); |
|
|
|
|
|
|
|
busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo); |
|
|
|
} |
|
|
|
// if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
|
|
|
|
// BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
|
|
|
|
// String vinSid = vinListsVo.getVinSid();
|
|
|
|
// if (spVehSids.contains(vinSid)) {
|
|
|
|
// continue;
|
|
|
|
// }
|
|
|
|
// BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
|
|
|
|
// BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
|
|
|
|
// if (baseVehicleCertificateVo != null) {
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
|
|
|
|
// } else {
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
|
|
|
|
// }
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
|
|
|
|
// busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
|
|
|
|
// busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
|
|
|
|
// }
|
|
|
|
} |
|
|
|
if (busSalesOrderReturnVehApplyECTJ != null) { |
|
|
|
if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) { |
|
|
|
@ -1005,6 +1109,11 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa |
|
|
|
vo.setModelImage(fileUploadComponent.getUrlPrefix() + modelInfo.getModelImage()); |
|
|
|
vo.setConfigSid(modelInfo.getConfigSid()); |
|
|
|
List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(sid); |
|
|
|
if (!busSalesOrderReturnVehDetailsVos.isEmpty()) { |
|
|
|
for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) { |
|
|
|
busSalesOrderReturnVehDetailsVo.setContractNo(appOrderDetailsVo.getContractId()); |
|
|
|
} |
|
|
|
} |
|
|
|
vo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVos); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
God
2 years ago