From dfcafdd1856b502303822d5765f1a6085e93a163 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 26 Dec 2022 10:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=B8=8A?= =?UTF-8?q?=E8=A3=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderModelService.java | 435 +++++++++++------- 1 file changed, 268 insertions(+), 167 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 1c51d12074..7623a38c39 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -219,20 +219,162 @@ public class BusSalesOrderModelService extends MybatisBaseService 0) { - String topSid = topSidList.get(0); - String topSidVin = ""; - if ("0".equals(dto.getState())) {//现车 - //判断是否与之前的相同，若相同则不用修改，若不同，则需要删除上装信息，重新添加一条 - List nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); - nowCarList.removeAll(Collections.singleton(null)); - if (!nowCarList.isEmpty()) { - List 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 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 nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); + nowCarList.removeAll(Collections.singleton(null)); + if (!nowCarList.isEmpty()) { + List 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 appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); - appReadyCarList.removeAll(Collections.singleton(null)); - if (!appReadyCarList.isEmpty()) { - List 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 appReadyCarList = busSalesVehicleOrderService.selectAppDetailsVoBySaleOrderSid(salesOrderSid); + appReadyCarList.removeAll(Collections.singleton(null)); + if (!appReadyCarList.isEmpty()) { + List 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