From 851c68a22da5e9e953a4916652494cd3f8053dd3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 9 Jan 2023 11:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseVehicleVo.java | 2 ++ .../api/basevehicleout/BaseVehicleOutDto.java | 2 ++ .../biz/basetrailer/BaseTrailerService.java | 1 + .../base/biz/basevehicle/BaseVehicleRest.java | 2 ++ .../basevehicleout/BaseVehicleOutService.java | 23 +++++++++++++++++++ 5 files changed, 30 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index e9d8291661..c312fcf1b2 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -240,6 +240,8 @@ public class BaseVehicleVo implements Vo { @ApiModelProperty(value = "细分市场") private String marketSegmentsValue; + @ApiModelProperty("上装/挂车sid") + private String szOrGCSid; @ApiModelProperty("上装/挂车") private String szOrGC; @ApiModelProperty("上装/挂车配置") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java index 8cbdd6dbaa..a53a06fb69 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java @@ -70,6 +70,8 @@ public class BaseVehicleOutDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("上装/挂车sid") + private String szOrGCSid; @ApiModelProperty("上装/挂车") private String trailerOrInstall; @ApiModelProperty("上装/挂车成交价") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index 503958db6f..5e3c137acf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -152,6 +152,7 @@ public class BaseTrailerService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 717d8cacbc..78ae1dd03e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -223,6 +223,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { String trailerTypeValue = baseTrailerModel.getTrailerTypeValue(); StringBuilder trailerModel = new StringBuilder(); trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")"); + record.setSzOrGCSid(baseTrailerDetailsVo.getSid()); record.setSzOrGC("挂车"); record.setTrailerOrInstall(trailerModel.toString()); record.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice()); @@ -234,6 +235,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { String installName = baseVehinstallmodel.getInstallNameValue(); StringBuilder vehinstallmodel = new StringBuilder(); vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")"); + record.setSzOrGCSid(baseVehinstallDetailsVo.getSid()); record.setSzOrGC("上装"); record.setTrailerOrInstall(vehinstallmodel.toString()); record.setTrailerOrInstallDealPrice(baseVehinstallDetailsVo.getGuidePrice()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 54e3b29720..a7e7e03a04 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -5,10 +5,12 @@ import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman; +import com.yxt.anrui.base.api.basetrailer.BaseTrailer; import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicleout.*; +import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo; import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDto; import com.yxt.anrui.base.biz.basemiddleman.BaseMiddlemanService; @@ -225,6 +227,27 @@ public class BaseVehicleOutService extends MybatisBaseService fEntity = salOutStock.getFEntity(); + for (SalOutStock.FEntity entity : fEntity) { + String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1); + if ("G".equals(substring)){ + String gcSid = dto.getSzOrGCSid(); + BaseTrailer baseTrailer = baseTrailerService.fetchBySid(gcSid); + baseTrailer.setStockStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); + baseTrailer.setStockStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); + BigDecimal dealPrice = new BigDecimal(dto.getTrailerOrInstallDealPrice()); + baseTrailer.setDealPrice(dealPrice); + baseTrailer.setIssueDate(DateUtil.formatDate(new Date())); + baseTrailerService.saveOrUpdate(baseTrailer); + }else if ("Z".equals(substring)){ + String szSid = dto.getSzOrGCSid(); + BaseVehinstall baseVehinstall = baseVehinstallService.fetchBySid(szSid); + baseVehinstall.setVehicleStateKey(VehicleState.StockEnum.OUT_STOCK.getCode()); + baseVehinstall.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks()); + baseVehinstall.setSalesDate(DateUtil.formatDate(new Date())); + baseVehinstallService.saveOrUpdate(baseVehinstall); + } + } } return rb.success(); }