|
|
@ -219,20 +219,162 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM |
|
|
|
updateById(busSalesOrderModel); |
|
|
|
} |
|
|
|
//添加上装信息===========
|
|
|
|
if (topSidList.size() > 0) { |
|
|
|
String topSid = topSidList.get(0); |
|
|
|
String topSidVin = ""; |
|
|
|
if ("0".equals(dto.getState())) {//现车
|
|
|
|
//判断是否与之前的相同,若相同则不用修改,若不同,则需要删除上装信息,重新添加一条
|
|
|
|
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); |
|
|
|
nowCarList.removeAll(Collections.singleton(null)); |
|
|
|
if (!nowCarList.isEmpty()) { |
|
|
|
List<String> stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
topSidVin = stringList.get(0); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(topSidVin)) { |
|
|
|
if (!topSidVin.equals(topSid)) { |
|
|
|
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid()); |
|
|
|
if (details.getData() != null) { |
|
|
|
String vehicleKey = details.getData().getVehicleType(); |
|
|
|
//(是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启,且为必填)
|
|
|
|
if ("3".equals(vehicleKey) || "005".equals(vehicleKey) || "7".equals(vehicleKey) || "5".equals(vehicleKey)) { |
|
|
|
if (topSidList.size() > 0) { |
|
|
|
String topSid = topSidList.get(0); |
|
|
|
String topSidVin = ""; |
|
|
|
if ("0".equals(dto.getState())) {//现车
|
|
|
|
//判断是否与之前的相同,若相同则不用修改,若不同,则需要删除上装信息,重新添加一条
|
|
|
|
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); |
|
|
|
nowCarList.removeAll(Collections.singleton(null)); |
|
|
|
if (!nowCarList.isEmpty()) { |
|
|
|
List<String> stringList = nowCarList.stream().map(AppNowCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
topSidVin = stringList.get(0); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(topSidVin)) { |
|
|
|
if (!topSidVin.equals(topSid)) { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} else { |
|
|
|
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid); |
|
|
|
if (busSalesOrderMakeupDetailsVo == null) { |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
if (StringUtils.isNotBlank(topSid)) { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
@ -274,111 +416,109 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid,"1"); |
|
|
|
}else{ |
|
|
|
BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid); |
|
|
|
if(busSalesOrderMakeupDetailsVo == null){ |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid,"1"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid,"1"); |
|
|
|
} |
|
|
|
} |
|
|
|
if ("1".equals(dto.getState())) {//采购订单
|
|
|
|
List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); |
|
|
|
appReadyCarList.removeAll(Collections.singleton(null)); |
|
|
|
if (!appReadyCarList.isEmpty()) { |
|
|
|
List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
topSidVin = stringList.get(0); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(topSidVin)) { |
|
|
|
if (!topSidVin.equals(topSid)) { |
|
|
|
if ("1".equals(dto.getState())) {//采购订单
|
|
|
|
List<AppReadyCarListVo> appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); |
|
|
|
appReadyCarList.removeAll(Collections.singleton(null)); |
|
|
|
if (!appReadyCarList.isEmpty()) { |
|
|
|
List<String> stringList = appReadyCarList.stream().map(AppReadyCarListVo::getTopSid).filter(StringUtils::isNotBlank).collect(Collectors.toList()); |
|
|
|
if (stringList.size() > 0) { |
|
|
|
topSidVin = stringList.get(0); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(topSidVin)) { |
|
|
|
if (!topSidVin.equals(topSid)) { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (StringUtils.isNotBlank(topSid)) { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
@ -420,63 +560,24 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid,"1"); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid, "1"); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
//删除上装信息
|
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
//新增上装
|
|
|
|
BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData(); |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup(); |
|
|
|
busSalesOrderMakeup.setSalesOrderSid(salesOrderSid); |
|
|
|
//上装名称
|
|
|
|
busSalesOrderMakeup.setTopName(baseVehinstallmodel.getInstallNameValue()); |
|
|
|
busSalesOrderMakeup.setTopNameKey(baseVehinstallmodel.getInstallNameKey()); |
|
|
|
//委改方式
|
|
|
|
busSalesOrderMakeup.setRefitMethod(baseVehinstallmodel.getRefitMethodValue()); |
|
|
|
busSalesOrderMakeup.setCommissionReformTypeKey(baseVehinstallmodel.getRefitMethodKey()); |
|
|
|
//委改厂
|
|
|
|
busSalesOrderMakeup.setRefitFactory(baseVehinstallmodel.getRefitFactory()); |
|
|
|
//外廓尺寸
|
|
|
|
busSalesOrderMakeup.setSizeLong(baseVehinstallmodel.getWk_long()); |
|
|
|
busSalesOrderMakeup.setSizeWide(baseVehinstallmodel.getWk_wide()); |
|
|
|
busSalesOrderMakeup.setSizeHigh(baseVehinstallmodel.getWk_high()); |
|
|
|
//板材材质
|
|
|
|
busSalesOrderMakeup.setPlateMaterial(baseVehinstallmodel.getPlateMaterialValue()); |
|
|
|
busSalesOrderMakeup.setTextureKey(baseVehinstallmodel.getPlateMaterialKey()); |
|
|
|
//板材厚度
|
|
|
|
busSalesOrderMakeup.setPlateThickness("底:" + baseVehinstallmodel.getPlateThicknessBottom() + "mm,边:" + baseVehinstallmodel.getPlateThicknessEdge() + "mm"); |
|
|
|
busSalesOrderMakeup.setThicknessBottom(baseVehinstallmodel.getPlateThicknessBottom()); |
|
|
|
busSalesOrderMakeup.setThicknessEdge(baseVehinstallmodel.getPlateThicknessEdge()); |
|
|
|
//上装价格
|
|
|
|
//更多配置
|
|
|
|
busSalesOrderMakeup.setMoreConfig(baseVehinstallmodel.getMoreConfig()); |
|
|
|
//颜色
|
|
|
|
busSalesOrderMakeup.setColor(baseVehinstallmodel.getColorValue()); |
|
|
|
busSalesOrderMakeup.setColorKey(baseVehinstallmodel.getColorKey()); |
|
|
|
//篷布滑道
|
|
|
|
busSalesOrderMakeup.setTarpaulinSlide(baseVehinstallmodel.getTarpaulinSlide()); |
|
|
|
//冷藏冷机
|
|
|
|
busSalesOrderMakeup.setRefirgerator(baseVehinstallmodel.getRefrigerator()); |
|
|
|
//自卸液压盖板
|
|
|
|
busSalesOrderMakeup.setSelfUnHyCoPl(baseVehinstallmodel.getSelfUnHyCoPl()); |
|
|
|
//地板加热
|
|
|
|
busSalesOrderMakeup.setFloorHeating(baseVehinstallmodel.getFloorHeating()); |
|
|
|
busSalesOrderMakeup.setBuyTypeKey("01"); |
|
|
|
busSalesOrderMakeup.setBuyTypeValue("公司采购"); |
|
|
|
busSalesOrderMakeupService.insert(busSalesOrderMakeup); |
|
|
|
busSalesOrderService.updateMakeUp(salesOrderSid,"1"); |
|
|
|
busSalesOrderService.updateMakeUp1(salesOrderSid); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
//删除上装信息
|
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
busSalesOrderService.updateMakeUp1(salesOrderSid); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
//删除上装信息
|
|
|
|
busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid); |
|
|
|
busSalesOrderService.updateMakeUp1(salesOrderSid); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//删除现车、采购订单的数据、若类型为现车,添加现车数据,若为采购订单,则新增采购订单数据
|
|
|
|
busSalesOrderVehicleService.deleteByOrderSid(salesOrderSid); |
|
|
|
busSalesVehicleOrderService.deleteByOrderSid(salesOrderSid); |
|
|
|