|
|
|
@ -1648,17 +1648,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
} |
|
|
|
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData(); |
|
|
|
//ToDo:排产，需采购
|
|
|
|
/* if("排产".equals(appOrderDetailsVo.getOrderType())){ |
|
|
|
//根据分公司sid查询采购系统，并取第一个
|
|
|
|
List<BasePurchaseSystem> systemList = basePurchaseSystemService.selectByUseOrgSid(appOrderDetailsVo.getUseOrgSid()); |
|
|
|
systemList.removeAll(Collections.singleton(null)); |
|
|
|
if(systemList.size()>0){ |
|
|
|
BasePurchaseSystem basePurchaseSystem = systemList.get(0); |
|
|
|
appOrderDetailsVo.setPurchaseSystemName(basePurchaseSystem.getPurchaseSystemName()); |
|
|
|
appOrderDetailsVo.setPurchaseSystemSid(basePurchaseSystem.getDeptSid()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//甲方
|
|
|
|
String createOrgName = appOrderDetailsVo.getSalesOrg(); |
|
|
|
//乙方
|
|
|
|
@ -1683,11 +1672,152 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid()); |
|
|
|
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appOrderModelInfoVo.getConfigSid()); |
|
|
|
String modelName1 = baseVehicleModelService.appendModelName(baseVehicleModel); |
|
|
|
String modelName = "车型：" + baseVehicleModel.getVehicleAlias()+"。"; |
|
|
|
//配置：后桥/速比/轴距/悬架/鞍座/颜色/驾驶室/保险杠/燃料箱/导流罩/独立热源/缓速器/护轮罩/后视镜/轮胎/轮毂材质/空调/坐骑/多媒体/配置包
|
|
|
|
String configName = baseModelConfigService.configNameSpell(baseModelConfig); |
|
|
|
String modelConfig = "配置：" + modelName1+"/"+configName + "。"; |
|
|
|
//上装
|
|
|
|
String modelName = "车型："; |
|
|
|
StringBuilder modeNameValue = new StringBuilder(); |
|
|
|
//车型名称(小名)：系列+驱动+功能+空格+版本
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getProductLineValue()) && !"-".equals(baseVehicleModel.getProductLineValue())){ |
|
|
|
modeNameValue.append(baseVehicleModel.getProductLineValue()); |
|
|
|
} |
|
|
|
//驱动
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getDriveFormValue()) && !"-".equals(baseVehicleModel.getDriveFormValue())){ |
|
|
|
modeNameValue.append(baseVehicleModel.getDriveFormValue()); |
|
|
|
} |
|
|
|
//功能
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getVehicleTypeValue()) && !"-".equals(baseVehicleModel.getVehicleTypeValue())){ |
|
|
|
modeNameValue.append(baseVehicleModel.getVehicleTypeValue()); |
|
|
|
} |
|
|
|
//版本
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getVehicleVersionValue()) && !"-".equals(baseVehicleModel.getVehicleVersionValue())){ |
|
|
|
modeNameValue.append(baseVehicleModel.getVehicleVersionValue()); |
|
|
|
} |
|
|
|
modelName = modelName+modeNameValue.toString(); |
|
|
|
//车型全名称：发动机型号（空格）xxx马力+燃料+排放标准发动机、变速箱、缓速器、
|
|
|
|
// 后桥(若存在“桥”字样后不带“后桥”)、速比、轴距、悬架(若存在“悬架”字样后不带“悬架”)、
|
|
|
|
// 鞍座(若存在“鞍座”字样后不带“鞍座”)、燃料箱(若存在“油箱”字样后不带“燃料箱”）、轮胎(若存在“胎”字样后不带“轮胎”)、
|
|
|
|
// 轮毂材质、护轮罩。换行
|
|
|
|
//驾驶室+颜色驾驶室、导流罩、保险杠、后视镜、座椅、空调、独立热源、多媒体
|
|
|
|
StringBuilder modelAllName = new StringBuilder(); |
|
|
|
//发动机型号
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getEngineTypeValue()) && !"-".equals(baseVehicleModel.getEngineTypeValue())){ |
|
|
|
modelAllName.append(baseVehicleModel.getEngineTypeValue()); |
|
|
|
} |
|
|
|
//马力
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getPowerValue()) && !"-".equals(baseVehicleModel.getPowerValue())){ |
|
|
|
modelAllName.append(baseVehicleModel.getPowerValue()).append("马力"); |
|
|
|
} |
|
|
|
//燃料
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getFuelTypeValue()) && !"-".equals(baseVehicleModel.getFuelTypeValue())){ |
|
|
|
modelAllName.append(baseVehicleModel.getFuelTypeValue()); |
|
|
|
} |
|
|
|
//排放标准
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getEmissionStandardValue()) && !"-".equals(baseVehicleModel.getEmissionStandardValue())){ |
|
|
|
modelAllName.append(baseVehicleModel.getEmissionStandardValue()); |
|
|
|
} |
|
|
|
modelAllName.append("发动机"); |
|
|
|
//变速箱
|
|
|
|
if (StringUtils.isNotBlank(baseVehicleModel.getGearboxTypeValue()) && !"-".equals(baseVehicleModel.getGearboxTypeValue())){ |
|
|
|
modelAllName.append("、").append(baseVehicleModel.getGearboxTypeValue()).append("变速箱"); |
|
|
|
} |
|
|
|
//缓速器
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSlowMachine()) && !"-".equals(baseModelConfig.getSlowMachine())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getSlowMachine()); |
|
|
|
} |
|
|
|
//后桥
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearAxleValue()) && !"-".equals(baseModelConfig.getRearAxleValue())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getRearAxleValue()); |
|
|
|
if(!baseModelConfig.getRearAxleValue().contains("桥")){ |
|
|
|
modelAllName.append("后桥"); |
|
|
|
} |
|
|
|
} |
|
|
|
//速比
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearAxleRatio()) && !"-".equals(baseModelConfig.getRearAxleRatio())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getRearAxleRatio()).append("速比"); |
|
|
|
} |
|
|
|
//轴距
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getWheelbase()) && !"-".equals(baseModelConfig.getWheelbase())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getWheelbase()).append("mm轴距"); |
|
|
|
} |
|
|
|
//悬架
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSuspension()) && !"-".equals(baseModelConfig.getSuspension())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getSuspension()); |
|
|
|
if(!baseModelConfig.getSuspension().contains("悬架")){ |
|
|
|
modelAllName.append("悬架"); |
|
|
|
} |
|
|
|
} |
|
|
|
//鞍座
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSaddle()) && !"-".equals(baseModelConfig.getSaddle())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getSaddle()); |
|
|
|
if(!baseModelConfig.getSaddle().contains("鞍座")){ |
|
|
|
modelAllName.append("鞍座"); |
|
|
|
} |
|
|
|
} |
|
|
|
//燃料箱
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getFuelTank()) && !"-".equals(baseModelConfig.getFuelTank())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getFuelTank()); |
|
|
|
if(!baseModelConfig.getFuelTank().contains("油箱")){ |
|
|
|
modelAllName.append("燃料箱"); |
|
|
|
} |
|
|
|
} |
|
|
|
//轮胎
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getTireSize()) && !"-".equals(baseModelConfig.getTireSize())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getTireSize()); |
|
|
|
if(!baseModelConfig.getTireSize().contains("胎")){ |
|
|
|
modelAllName.append("轮胎"); |
|
|
|
} |
|
|
|
} |
|
|
|
//轮毂材质
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getHubMaterial()) && !"-".equals(baseModelConfig.getHubMaterial())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getHubMaterial()); |
|
|
|
} |
|
|
|
//护轮罩
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) { |
|
|
|
modelAllName.append("、").append(baseModelConfig.getTireCover()); |
|
|
|
} |
|
|
|
// modelAllName.append("<w:p></w:p>");
|
|
|
|
StringBuilder modelAllName2 = new StringBuilder(); |
|
|
|
modelAllName2.append("\t"); |
|
|
|
//驾驶室
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) { |
|
|
|
modelAllName2.append(baseModelConfig.getSpecification()); |
|
|
|
} |
|
|
|
//颜色
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) { |
|
|
|
modelAllName2.append(baseModelConfig.getCarColor()).append("驾驶室"); |
|
|
|
} |
|
|
|
//导流罩
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getBaffleModel()); |
|
|
|
} |
|
|
|
//保险杠
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getBumper()) && !"-".equals(baseModelConfig.getBumper())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getBumper()); |
|
|
|
} |
|
|
|
//后视镜
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearViewMirror()) && !"-".equals(baseModelConfig.getRearViewMirror())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getRearViewMirror()); |
|
|
|
} |
|
|
|
//座椅
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSeat()) && !"-".equals(baseModelConfig.getSeat())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getSeat()); |
|
|
|
if(!baseModelConfig.getSeat().contains("椅")){ |
|
|
|
modelAllName2.append("座椅"); |
|
|
|
} |
|
|
|
} |
|
|
|
//空调
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getAirConditioner()) && !"-".equals(baseModelConfig.getAirConditioner())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getAirConditioner()); |
|
|
|
} |
|
|
|
//独立热源
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getIndependentSources()) && !"-".equals(baseModelConfig.getIndependentSources())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getIndependentSources()); |
|
|
|
} |
|
|
|
//多媒体
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) { |
|
|
|
modelAllName2.append("、").append(baseModelConfig.getMultimedia()); |
|
|
|
} |
|
|
|
modelAllName2.append("。"); |
|
|
|
String modelConfig = "配置：" +modelAllName.toString() + "。"; |
|
|
|
//上装：外廓尺寸+颜色+上装名称、板材厚度、板材材质、篷布滑道、冷藏冷机、自卸液压盖板、底板加热、更多配置
|
|
|
|
if (appOrderDetailsVo.getTopInfo() != null) { |
|
|
|
AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo(); |
|
|
|
String topName = appOrderDetailsVo.getTopMessage(); |
|
|
|
@ -1767,6 +1897,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
return rb.setMsg("请与出纳人员联系完善开票信息"); |
|
|
|
} |
|
|
|
} |
|
|
|
map.put("modelConfigs",modelAllName2.toString()); |
|
|
|
map.put("customerName", customerName); |
|
|
|
map.put("mobile", mobile); |
|
|
|
map.put("idNo", idNo); |
|
|
|
@ -1792,7 +1923,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); |
|
|
|
if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
|
|
|
|
/* Future<String> future1 = pool.submit(() -> { |
|
|
|
/*Future<String> future1 = pool.submit(() -> { |
|
|
|
return genCarSaleContract(dto, map, appOrderDetailsVo); |
|
|
|
}); |
|
|
|
Future<String> future1_2 = pool.submit(() -> { |
|
|
|
@ -2090,16 +2221,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp |
|
|
|
//获取分公司sid
|
|
|
|
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); |
|
|
|
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); |
|
|
|
// String orgCode = resultBean1.getData().getOrgCode();
|
|
|
|
String orgCode = resultBean1.getData().getOrgAbbre(); |
|
|
|
//根据车型sid查询品牌简称
|
|
|
|
String brandCode = baseVehicleBrandService.selectShortName(modelSid); |
|
|
|
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); |
|
|
|
String bill = brandCode + orgCode + date; |
|
|
|
/* BillNo b = new BillNo(); |
|
|
|
b.setOrgCode(orgCode); |
|
|
|
b.setBillType(BillTypeEnum.XSDD.getBillType()); |
|
|
|
String bill = Rule.getBill(b);*/ |
|
|
|
int i = baseMapper.selectNum(bill); |
|
|
|
String billNo = Rule.getBillNo(bill, i); |
|
|
|
return billNo; |
|
|
|
|
