Merge remote-tracking branch 'origin/master'

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("上装/挂车配置")

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("上装/挂车成交价")

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<BaseTrailerMapper, Ba
             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.setTrailerModel(trailerModel.toString());
+            record.setGuidePrice(baseTrailerModel.getSaleGuidancePrice());
         }
         PagerVo<BaseTrailerVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

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());

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<BaseVehicleOutMapp
         if (StringUtils.isNotBlank(trailerOrInstall)){
             SalOutStock salOutStock = createSzOrGcSalOutStock(baseVehicle, dto);
             finKingDeeFeign.draftSalOutStock(salOutStock);
+            List<SalOutStock.FEntity> 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();
     }