diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java index bf17ece0f1..c5251c369d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java @@ -88,4 +88,7 @@ public class BaseVehicleOut extends BaseEntity { private String trailerOrInstallDealPrice; @ApiModelProperty("总成交价") private String totalDealPrice; + + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java index d927711431..e302a4dd6a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -67,4 +67,7 @@ public class BaseVehicleOutDetailsVo implements Vo { private String trailerOrInstallDealPrice; @ApiModelProperty("总成交价") private String totalDealPrice; + + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 } 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 a53a06fb69..1fe7613b22 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 @@ -79,6 +79,9 @@ public class BaseVehicleOutDto implements Dto { @ApiModelProperty("总成交价") private String totalDealPrice; + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("是否要修改客户") private String isUpdateOrInsertCrm; // 是否要修改客户 } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index d55e14dc71..7eea6a965f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -95,4 +95,7 @@ public class BaseVehicleOutVo implements Vo { @ApiModelProperty("销售指导价") private String guidedPrice; // 销售指导价 + + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index c1c0e3d52a..57ce1d7442 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -30,4 +30,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { BaseVehicleOutDetailsVo details(String sid); int selectCountBySidVin(String vinSid); + + String selectNum(String billNo); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 4541248c6b..6b871db292 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -54,7 +54,8 @@ bvc.guidedPrice from base_vehicle_out bvo left join base_vehicle bv on bv.sid = bvo.vinSid - left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid = bvc.configurationItemsSid and bv.createOrgSid = bvc.useOrgSid + left join base_vehmodel_config bvc on bv.modelSid = bvc.modelSid and bv.modelConfigSid = + bvc.configurationItemsSid and bv.createOrgSid = bvc.useOrgSid LEFT JOIN anrui_portal.sys_organization so ON bvo.createOrgSid = so.sid ${ew.sqlSegment} @@ -95,4 +96,12 @@ from base_vehicle_out where vinSid = #{vinSid} + + \ No newline at end of file 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 a7e7e03a04..1daf9673fa 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 @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.basevehicleout; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,6 +20,7 @@ import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; @@ -180,7 +182,18 @@ public class BaseVehicleOutService extends MybatisBaseService