Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 3 years ago
parent
commit
831f9845fd
  1. 23
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java
  2. 18
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  3. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  4. 39
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java
  5. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java
  6. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
  7. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  9. 34
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  10. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  11. 73
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  12. 611
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java
  13. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  14. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  15. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  16. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
  17. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml
  18. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
  19. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java
  20. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java
  21. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java
  22. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  23. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  24. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java
  25. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemRest.java
  26. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java
  27. 222
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
  28. 34
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
  29. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java
  30. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java
  31. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java
  32. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java
  33. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java
  34. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

23
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java

@ -0,0 +1,23 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Description 车辆台账买断
*/
@Data
public class BaseVehicleBuyBlank implements Vo {
@ApiModelProperty(value = "车辆sid")
private List<String> vehicleSid;
@ApiModelProperty(value = "买断日期")
private String solidDate;
@ApiModelProperty(value = "买断附件信息")
private CommonAppendix commonAppendix;
}

18
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -70,6 +70,24 @@ public interface BaseVehicleFeign {
@PostMapping("/saveAll")
public ResultBean saveAll(@Valid @RequestBody List<BaseVehicleDto> dto);
/**
* 车辆台账出库
*
* @return
*/
@ApiOperation("车辆台账出库")
@PostMapping("/vehicleOutLibrary")
public ResultBean vehicleOutLibrary(@RequestBody BaseVehicleOutLibrary baseVehicleOutLibrary);
/**
* 车辆台账买断
*
* @return
*/
@ApiOperation("车辆台账买断")
@PostMapping("/vehicleBuyBreak")
public ResultBean vehicleBuyBreak(@RequestBody BaseVehicleBuyBlank baseVehicleBuyBlank);
/**
* 修改保存
*

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -46,6 +46,16 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
return null;
}
@Override
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
return null;
}
@Override
public ResultBean update(BaseVehicleDto dto, String sid) {
return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问");

39
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java

@ -0,0 +1,39 @@
package com.yxt.anrui.base.api.basevehicle;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description 车辆台账出库
*/
@Data
public class BaseVehicleOutLibrary implements Vo {
@ApiModelProperty(value = "车辆sid")
private String vehicleSid;
@ApiModelProperty(value = "库存状态value")
private String vehicleStateValue;
@ApiModelProperty(value = "出库类型value")
private String outLibraryValue;
@ApiModelProperty(value = "userSid")
private String userSid;
@ApiModelProperty(value = "合同编号")
private String contractNo;
@ApiModelProperty(value = "成交价")
private String salePrice;
@ApiModelProperty(value = "客户类型key")
private String customerTypeKey;
@ApiModelProperty(value = "客户类型value")
private String customerType;
@ApiModelProperty(value = "客户名称")
private String customerName;
@ApiModelProperty(value = "手机号码")
private String mobile;
@ApiModelProperty(value = "身份证号码")
private String IDNumber;
@ApiModelProperty(value = "联系地址")
private String address;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java

@ -197,6 +197,10 @@ public class BusVehicleOfferDetailVo implements Vo {
private String salePrice;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("换装配置")
private String replacementConfig;
@ApiModelProperty("选装配置")
private String optionalConfig;
@ApiModelProperty("创建组织sid")
private String createOrgSid;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java

@ -51,7 +51,8 @@ public enum CommonAttachTypeEnum {
MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"),
SHUNTINGINVOICINAPPLY("0015", "调车开票附件"),
OUTSOURCINGAPPLY("0016", "外采申请附件"),
INBOUNDAPPLY("0017", "入账申请附件");
INBOUNDAPPLY("0017", "入账申请附件"),
VEHBUYBLANK("0018", "车辆买断附件");
/**
* 附件类型
*/

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -588,7 +588,7 @@
bmc.independentSources,
bmc.fuelTank,
bmc.multimedia,
bv.guidedPrice,
-- bv.salePrice as price,
bmc.otherConfig
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@ -418,4 +418,8 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(IPage<VinByWarehouseQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmWarehouseVinVo> qw, @Param("warehouseSid") String warehouseSid);
ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid);
void updateVehicleOutLibrary(@Param("sid") String sid,@Param("vehicleState") String vehicleState,@Param("vehicleStateValue") String vehicleStateValue,@Param("salesDate") String salesDate,@Param("salePrice") String salePrice,@Param("remarks") String remarks);
void updateVehicleBuyBreak(@Param("sid") String sid,@Param("solidDate") String solidDate,@Param("settlementStatus") String settlementStatus,@Param("settlementStatusValue") String settlementStatusValue);
}

34
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -324,7 +324,7 @@
bvm.fuelTypeValue,
bvm.gearboxTypeValue,
bvm.marketSegmentsValue as marketSegments,
bvm.departmentValue as department,
bvm.departmentValue as department,
bvm.emissionStandardValue,
bvm.engineTypeValue,
bvm.announcementModel,
@ -805,9 +805,9 @@
<select id="selectByModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
SELECT bvm.vehicleAlias AS modelName,
convert(bc.guidedPrice/10000,decimal(10,2)) AS price,
bmc.configName AS commonlyConfig
SELECT bvm.vehicleAlias AS modelName,
convert(bc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig
FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
@ -818,9 +818,9 @@
<select id="getModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
select bvm.vehicleAlias AS modelName,
convert(bvc.guidedPrice/10000,decimal(10,2)) AS price,
bmc.configName AS commonlyConfig
select bvm.vehicleAlias AS modelName,
convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price,
bmc.configName AS commonlyConfig
from base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
@ -961,4 +961,24 @@
and bv.location = #{warehouseSid}
</where>
</select>
<update id="updateVehicleOutLibrary">
UPDATE
base_vehicle
SET vehicleState = #{vehicleState},
vehicleStateValue = #{vehicleStateValue},
salesDate = #{salesDate},
salePrice = #{salePrice},
remarks = #{remarks}
WHERE sid = #{sid}
</update>
<update id="updateVehicleBuyBreak">
UPDATE
base_vehicle
SET solidDate = #{solidDate},
settlementStatus = #{settlementStatus},
settlementStatusValue = #{settlementStatusValue}
WHERE sid = #{sid}
</update>
</mapper>

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -108,13 +108,19 @@ public class BaseVehicleRest implements BaseVehicleFeign {
BaseVehicle baseVehicle = new BaseVehicle();
dto.fillEntity(baseVehicle);
//锁定状态
String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
/*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
baseVehicle.setLockedState(lockedStateKey);
baseVehicle.setLockedStateValue(lockedStateValue);
baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/
baseVehicle.setLockedState(dto.getLockedState());
baseVehicle.setLockedStateValue(dto.getLockedStateValue());
baseVehicle.setVehicleState(dto.getVehicleState());
baseVehicle.setVehicleStateValue(dto.getVehicleStateValue());
baseVehicle.setSettlementStatus(dto.getSettlementStatus());
baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue());
boolean isSave = baseVehicleService.save(baseVehicle);
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
if (StringUtils.isNotBlank(dto.getVinNo())){
@ -140,6 +146,16 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return rb.success().setMsg("保存成功");
}
@Override
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
return baseVehicleService.vehicleOutLibrary(baseVehicleOutLibrary);
}
@Override
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
return baseVehicleService.vehicleBuyBreak(baseVehicleBuyBlank);
}
@Override
public ResultBean update(BaseVehicleDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();

73
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -1,5 +1,6 @@
package com.yxt.anrui.base.biz.basevehicle;
import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -10,6 +11,9 @@ import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
@ -20,9 +24,15 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
@ -63,9 +73,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
@Autowired
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private CommonAppendixService commonAppendixService;
private SysUserFeign sysUserFeign;
@Autowired
private BaseVehicleAppendixService baseVehicleAppendixService;
@Autowired
@ -78,6 +86,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
@Autowired
private BaseVehinstallService baseVehinstallService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private CommonAppendixService commonAppendixService;
/**
* 车辆信息分页列表
@ -102,7 +114,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (pagerQuery != null) {
qw.eq("bv.isDelete", "0");
qw.orderByDesc("bv.priceDate");
qw.eq("bv.createOrgSid",pagerQuery.getCreateOrgSid());
qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
qw.like("bv.vinNo", pagerQuery.getVinNo());
}
@ -1277,7 +1289,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
}
//结算状态:0买断
//结算状态:0买断
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
//车辆状态:现车
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
@ -1362,7 +1374,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
IPage<AppBaseVinNowCarVo> pagging = baseMapper.getModelNowCarList(page, qw);
for (AppBaseVinNowCarVo record : pagging.getRecords()) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateService.selStateByVehicleSid(record.getSid());
if (baseVehicleCertificateVo != null){
if (baseVehicleCertificateVo != null) {
record.setCertificate(baseVehicleCertificateVo.getCertificateStateValue());
}
vinNowCarVos.add(record);
@ -1614,4 +1626,53 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return iPage;
}
@Transactional
public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) {
ResultBean rb = ResultBean.fireFail();
String vehicleSid = baseVehicleOutLibrary.getVehicleSid();
String vehicleStateValue = baseVehicleOutLibrary.getVehicleStateValue();
if (!vehicleStateValue.equals(VehicleState.StockEnum.STOCK.getRemarks())) {
return rb.setMsg("该车辆台账不是库存车辆,请重新选择");
}
String userSid = baseVehicleOutLibrary.getUserSid();
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
StringBuffer remarks = new StringBuffer();
String outLibraryValue = baseVehicleOutLibrary.getOutLibraryValue();
String contractNo = baseVehicleOutLibrary.getContractNo();
if (StringUtils.isNotBlank(outLibraryValue)) {
remarks.append(outLibraryValue).append(" ");
}
if (StringUtils.isNotBlank(contractNo)) {
remarks.append(contractNo);
}
String salePrice = baseVehicleOutLibrary.getSalePrice();
baseMapper.updateVehicleOutLibrary(vehicleSid,VehicleState.StockEnum.OUT_STOCK.getCode(),VehicleState.StockEnum.OUT_STOCK.getRemarks(), DateUtil.today(),salePrice,remarks.toString());
CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
crmCustomerTempDto.setCustomerTypeKey(baseVehicleOutLibrary.getCustomerTypeKey());
crmCustomerTempDto.setCustomerType(baseVehicleOutLibrary.getCustomerType());
crmCustomerTempDto.setName(baseVehicleOutLibrary.getCustomerName());
crmCustomerTempDto.setMobile(baseVehicleOutLibrary.getMobile());
crmCustomerTempDto.setIDNumber(baseVehicleOutLibrary.getIDNumber());
crmCustomerTempDto.setAddress(baseVehicleOutLibrary.getAddress());
crmCustomerTempDto.setStaffSid(userVoResultBean.getData().getStaffSid());
crmCustomerTempFeign.save(crmCustomerTempDto);
return rb.success().setMsg("出库成功");
}
public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) {
ResultBean rb = ResultBean.fireFail();
List<String> vehicleSid = baseVehicleBuyBlank.getVehicleSid();
String solidDate = baseVehicleBuyBlank.getSolidDate();
CommonAppendix commonAppendix = baseVehicleBuyBlank.getCommonAppendix();
for (String s : vehicleSid) {
baseMapper.updateVehicleBuyBreak(s,solidDate,VehicleState.BuyoutEnum.BUYOUT.getCode(),VehicleState.BuyoutEnum.BUYOUT.getRemarks());
commonAppendix.setLinkSid(s);
commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType());
commonAppendixService.save(commonAppendix);
}
return rb.success().setMsg("买断成功");
}
}

611
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java

@ -68,311 +68,316 @@ import java.util.List;
@Service
public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMapper, BusVehicleOffer> {
@Autowired
private BusVehicleInquiryService busVehicleInquiryService;
@Autowired
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private BaseVehmodelOptionService baseVehmodelOptionService;
@Autowired
private BaseVehmodelConfigService baseVehmodelConfigService;
@Autowired
private BusVehicleInquiryService busVehicleInquiryService;
@Autowired
private BaseModelConfigService baseModelConfigService;
@Autowired
private BaseVehicleModelService baseVehicleModelService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private BaseVehmodelOptionService baseVehmodelOptionService;
@Autowired
private BaseVehmodelConfigService baseVehmodelConfigService;
public PagerVo<BusVehicleOfferVo> listPageVo(PagerQuery<BusVehicleOfferQuery> pq) {
BusVehicleOfferQuery query = pq.getParams();
QueryWrapper<BusVehicleOffer> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state",0);
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
}
String offerStartDate = query.getOfferStartDate();
String offerEndDate = query.getOfferEndDate();
qw.apply(StringUtils.isNotBlank(offerStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + offerStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(offerEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + offerEndDate + "','%Y-%m-%d')"
);
IPage<BusVehicleOffer> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleOfferVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusVehicleOfferVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BusVehicleOfferDto dto){
BusVehicleOffer entity = new BusVehicleOffer();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public BusVehicleOfferVo fetchByIdVo(String id){
BusVehicleOffer entity = this.fetchById(id);
BusVehicleOfferVo vo = new BusVehicleOfferVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public PagerVo<BusVehicleOfferVo> listPageVo(PagerQuery<BusVehicleOfferQuery> pq) {
BusVehicleOfferQuery query = pq.getParams();
QueryWrapper<BusVehicleOffer> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 0);
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
}
String offerStartDate = query.getOfferStartDate();
String offerEndDate = query.getOfferEndDate();
qw.apply(StringUtils.isNotBlank(offerStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + offerStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(offerEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + offerEndDate + "','%Y-%m-%d')"
);
IPage<BusVehicleOffer> page = PagerUtil.queryToPage(pq);
IPage<BusVehicleOfferVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusVehicleOfferVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<BusVehicleOfferDetailVo> fetchAll(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOfferDetailVo busVehicleOfferDetailVo = new BusVehicleOfferDetailVo();
BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(sid);
if (busVehicleInquiry == null){
return rb.setMsg("该询价单不存在");
}
busVehicleOfferDetailVo.setSid(busVehicleInquiry.getSid());
busVehicleOfferDetailVo.setInquirer(busVehicleInquiry.getInquirer());
String createBySid = busVehicleInquiry.getCreateBySid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
SysUserVo sysUserVo = sysUserVoResultBean.getData();
if (sysUserVo == null){
return rb.setMsg("该用户不存在");
}
busVehicleOfferDetailVo.setPhone(sysUserVo.getMobile());
busVehicleOfferDetailVo.setCreateTime(busVehicleInquiry.getCreateTime());
busVehicleOfferDetailVo.setVehModelSid(busVehicleInquiry.getVehModelSid());
busVehicleOfferDetailVo.setVehModel(busVehicleInquiry.getVehModel());
busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig());
busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig());
List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
String repInstr = "";
for (String s : stringList) {
repInstr += s + ",";
}
if (StringUtils.isNotBlank(repInstr)){
busVehicleOfferDetailVo.setRepInstr(repInstr.substring(0,repInstr.length()-1));
}
busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig());
busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel());
busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid());
busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid());
if (baseVehicleModel == null){
return rb.setMsg("该车型不存在");
}
busVehicleOfferDetailVo.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
busVehicleOfferDetailVo.setProductLineValue(baseVehicleModel.getProductLineValue());
busVehicleOfferDetailVo.setDriveFormValue(baseVehicleModel.getDriveFormValue());
busVehicleOfferDetailVo.setPowerValue(baseVehicleModel.getPowerValue());
busVehicleOfferDetailVo.setVehicleVersionValue(baseVehicleModel.getVehicleVersionValue());
busVehicleOfferDetailVo.setFuelTypeValue(baseVehicleModel.getFuelTypeValue());
busVehicleOfferDetailVo.setGearboxTypeValue(baseVehicleModel.getGearboxTypeValue());
busVehicleOfferDetailVo.setMarketSegmentsValue(baseVehicleModel.getMarketSegmentsValue());
busVehicleOfferDetailVo.setEngineTypeValue(baseVehicleModel.getEngineTypeValue());
busVehicleOfferDetailVo.setSpecifications(baseVehicleModel.getSpecifications());
busVehicleOfferDetailVo.setEmissionStandardValue(baseVehicleModel.getEmissionStandardValue());
busVehicleOfferDetailVo.setDepartmentValue(baseVehicleModel.getDepartmentValue());
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(busVehicleInquiry.getVehModelConfigSid());
if (baseModelConfig == null){
return rb.setMsg("该常用配置不存在");
}
busVehicleOfferDetailVo.setCarColorKey(baseModelConfig.getCarColorKey());
busVehicleOfferDetailVo.setCarColor(baseModelConfig.getCarColor());
busVehicleOfferDetailVo.setSpecificationKey(baseModelConfig.getSpecificationKey());
busVehicleOfferDetailVo.setSpecification(baseModelConfig.getSpecification());
busVehicleOfferDetailVo.setBaffleModelKey(baseModelConfig.getBaffleModelKey());
busVehicleOfferDetailVo.setBaffleModel(baseModelConfig.getBaffleModel());
busVehicleOfferDetailVo.setSaddleKey(baseModelConfig.getSaddleKey());
busVehicleOfferDetailVo.setSaddle(baseModelConfig.getSaddle());
busVehicleOfferDetailVo.setIndependentSourcesKey(baseModelConfig.getIndependentSourcesKey());
busVehicleOfferDetailVo.setIndependentSources(baseModelConfig.getIndependentSources());
busVehicleOfferDetailVo.setSlowMachineKey(baseModelConfig.getSlowMachineKey());
busVehicleOfferDetailVo.setSlowMachine(baseModelConfig.getSlowMachine());
busVehicleOfferDetailVo.setRearAxleRatioKey(baseModelConfig.getRearAxleRatioKey());
busVehicleOfferDetailVo.setRearAxleRatio(baseModelConfig.getRearAxleRatio());
busVehicleOfferDetailVo.setSuspensionKey(baseModelConfig.getSuspensionKey());
busVehicleOfferDetailVo.setSuspension(baseModelConfig.getSuspension());
busVehicleOfferDetailVo.setWheelbaseKey(baseModelConfig.getWheelbaseKey());
busVehicleOfferDetailVo.setWheelbase(baseModelConfig.getWheelbase());
busVehicleOfferDetailVo.setFuelTankKey(baseModelConfig.getFuelTankKey());
busVehicleOfferDetailVo.setFuelTank(baseModelConfig.getFuelTank());
busVehicleOfferDetailVo.setRearViewMirrorKey(baseModelConfig.getRearViewMirrorKey());
busVehicleOfferDetailVo.setRearViewMirror(baseModelConfig.getRearViewMirror());
busVehicleOfferDetailVo.setAirConditionerKey(baseModelConfig.getAirConditionerKey());
busVehicleOfferDetailVo.setAirConditioner(baseModelConfig.getAirConditioner());
busVehicleOfferDetailVo.setSeatKey(baseModelConfig.getSeatKey());
busVehicleOfferDetailVo.setSeat(baseModelConfig.getSeat());
busVehicleOfferDetailVo.setBumperKey(baseModelConfig.getBumperKey());
busVehicleOfferDetailVo.setBumper(baseModelConfig.getBumper());
busVehicleOfferDetailVo.setMultimediaKey(baseModelConfig.getMultimediaKey());
busVehicleOfferDetailVo.setMultimedia(baseModelConfig.getMultimedia());
busVehicleOfferDetailVo.setTireSizeKey(baseModelConfig.getTireSizeKey());
busVehicleOfferDetailVo.setTireSize(baseModelConfig.getTireSize());
busVehicleOfferDetailVo.setHubMaterialKey(baseModelConfig.getHubMaterialKey());
busVehicleOfferDetailVo.setHubMaterial(baseModelConfig.getHubMaterial());
busVehicleOfferDetailVo.setTireCoverKey(baseModelConfig.getTireCoverKey());
busVehicleOfferDetailVo.setTireCover(baseModelConfig.getTireCover());
busVehicleOfferDetailVo.setConfiguringBaoKey(baseModelConfig.getConfiguringBaoKey());
busVehicleOfferDetailVo.setConfiguringBao(baseModelConfig.getConfiguringBao());
busVehicleOfferDetailVo.setPackingCaseKey(baseModelConfig.getPackingCaseKey());
busVehicleOfferDetailVo.setPackingCase(baseModelConfig.getPackingCase());
BusVehicleOffer busVehicleOfferVo = baseMapper.fetchByMainSid(busVehicleInquiry.getSid());
if (busVehicleOfferVo != null){
busVehicleOfferDetailVo.setSpecialInstructions(busVehicleOfferVo.getSpecialInstructions());
busVehicleOfferDetailVo.setCostPrice(busVehicleOfferVo.getCostPrice());
busVehicleOfferDetailVo.setSalePrice(busVehicleOfferVo.getSalePrice());
busVehicleOfferDetailVo.setRemarks(busVehicleOfferVo.getRemarks());
busVehicleOfferDetailVo.setCreateOrgSid(busVehicleInquiry.getCreateOrgSid());
}
return rb.success().setData(busVehicleOfferDetailVo);
}
public void saveOrUpdateDto(BusVehicleOfferDto dto) {
BusVehicleOffer entity = new BusVehicleOffer();
dto.fillEntity(entity);
this.saveOrUpdate(entity);
}
public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOffer busVehicleOffer = new BusVehicleOffer();
String sid = busVehicleOffer.getSid();
String configName = "";
//缓速器
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSlowMachine()) && "有".equals(busVehicleOfferDetailVo.getSlowMachine())) {
configName += "缓速器/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearViewMirror())) {
configName += busVehicleOfferDetailVo.getRearViewMirror() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireSize())) {
configName += busVehicleOfferDetailVo.getTireSize() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearAxleRatio())) {
configName += busVehicleOfferDetailVo.getRearAxleRatio() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getAirConditioner()) && "有".equals(busVehicleOfferDetailVo.getAirConditioner())) {
configName += "空调/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getHubMaterial())) {
configName += busVehicleOfferDetailVo.getHubMaterial() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBaffleModel())) {
configName += busVehicleOfferDetailVo.getBaffleModel() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSuspension())) {
configName += busVehicleOfferDetailVo.getSuspension() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSeat())) {
configName += busVehicleOfferDetailVo.getSeat() + "/";
}
//护轮罩
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireCover()) && "有".equals(busVehicleOfferDetailVo.getTireCover())) {
configName += "护轮罩/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSaddle())) {
configName += busVehicleOfferDetailVo.getSaddle() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getWheelbase())) {
configName += busVehicleOfferDetailVo.getWheelbase() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBumper())) {
configName += busVehicleOfferDetailVo.getBumper() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getConfiguringBao())) {
configName += busVehicleOfferDetailVo.getConfiguringBao() + "/";
}
//独立热源
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getIndependentSources()) && "有".equals(busVehicleOfferDetailVo.getIndependentSources())) {
configName += "独立热源/";
}
//油罐
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getFuelTank())) {
configName += busVehicleOfferDetailVo.getFuelTank() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getMultimedia()) && "有".equals(busVehicleOfferDetailVo.getMultimedia())) {
configName += "多媒体/";
}
//颜色
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getCarColor())) {
configName += busVehicleOfferDetailVo.getCarColor() + "/";
}
//驾驶室规格
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSpecification())) {
configName += busVehicleOfferDetailVo.getSpecification() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getPackingCase())) {
configName += busVehicleOfferDetailVo.getPackingCase() + "/";
}
String moreConfig = busVehicleOfferDetailVo.getMoreConfig();
String configName1 = configName + moreConfig;
List<String> stringList = baseModelConfigService.fetchConfigName(busVehicleOfferDetailVo.getCreateOrgSid());
if (stringList.contains(configName1)){
String costPrice = busVehicleOfferDetailVo.getCostPrice();
if (StringUtils.isBlank(costPrice)){
return rb.setMsg("请填写厂家结算价");
}
String salePrice = busVehicleOfferDetailVo.getSalePrice();
if (StringUtils.isBlank(salePrice)){
return rb.setMsg("请填写销售参考价");
}
BeanUtil.copyProperties(busVehicleOfferDetailVo,busVehicleOffer);
busVehicleOffer.setSid(sid);
busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid());
save(busVehicleOffer);
}else {
BaseModelConfig baseModelConfig = new BaseModelConfig();
BeanUtil.copyProperties(busVehicleOfferDetailVo,baseModelConfig);
baseModelConfig.setSid(sid);
baseModelConfig.setConfigName(configName);
baseModelConfigService.save(baseModelConfig);
String costPrice = busVehicleOfferDetailVo.getCostPrice();
if (StringUtils.isBlank(costPrice)){
return rb.setMsg("请填写厂家结算价");
}
String salePrice = busVehicleOfferDetailVo.getSalePrice();
if (StringUtils.isBlank(salePrice)){
return rb.setMsg("请填写销售参考价");
}
BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
baseVehmodelConfig.setModelSid(busVehicleOfferDetailVo.getVehModelSid());
baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid());
baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid());
baseVehmodelConfigService.save(baseVehmodelConfig);
BeanUtil.copyProperties(busVehicleOfferDetailVo,busVehicleOffer);
busVehicleOffer.setSid(sid);
busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid());
save(busVehicleOffer);
busVehicleInquiryService.updateConfigBySid(busVehicleOfferDetailVo.getSid());
}
return rb.success().setMsg("提交成功");
}
public BusVehicleOfferVo fetchByIdVo(String id) {
BusVehicleOffer entity = this.fetchById(id);
BusVehicleOfferVo vo = new BusVehicleOfferVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOffer busVehicleOffer = fetchBySid(sid);
String inquirySid = busVehicleOffer.getInquirySid();
BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(inquirySid);
BusVehicleOfferDetailVos busVehicleOfferDetailVos = new BusVehicleOfferDetailVos();
BeanUtil.copyProperties(busVehicleInquiry,busVehicleOfferDetailVos);
busVehicleOfferDetailVos.setXvehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
busVehicleOfferDetailVos.setXvehModelConfig(busVehicleInquiry.getVehModelConfig());
busVehicleOfferDetailVos.setXmoreConfig(busVehicleInquiry.getMoreConfig());
String createBySid = busVehicleInquiry.getCreateBySid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
SysUserVo sysUserVo = sysUserVoResultBean.getData();
if (sysUserVo == null){
return rb.setMsg("该用户不存在");
}
busVehicleOfferDetailVos.setPhone(sysUserVo.getMobile());
List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
String repInstr = "";
for (String s : stringList) {
repInstr += s + ",";
}
if (StringUtils.isNotBlank(repInstr)){
busVehicleOfferDetailVos.setRepInstr(repInstr.substring(0,repInstr.length()-1));
}
String vehModelConfigSid = busVehicleOffer.getVehModelConfigSid();
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(vehModelConfigSid);
if (baseModelConfig == null){
return rb.setMsg("该常用配置不存在");
}
busVehicleOfferDetailVos.setBvehModelConfigSid(vehModelConfigSid);
busVehicleOfferDetailVos.setBvehModelConfig(baseModelConfig.getConfigName());
busVehicleOfferDetailVos.setBmoreConfig(baseModelConfig.getOtherConfig());
busVehicleOfferDetailVos.setSpecialInstructions(busVehicleOffer.getSpecialInstructions());
busVehicleOfferDetailVos.setCostPrice(busVehicleOffer.getCostPrice());
busVehicleOfferDetailVos.setSalePrice(busVehicleOffer.getSalePrice());
busVehicleOfferDetailVos.setRemarks(busVehicleOffer.getRemarks());
return rb.success().setData(busVehicleOfferDetailVos);
}
public ResultBean<BusVehicleOfferDetailVo> fetchAll(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOfferDetailVo busVehicleOfferDetailVo = new BusVehicleOfferDetailVo();
BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(sid);
if (busVehicleInquiry == null) {
return rb.setMsg("该询价单不存在");
}
busVehicleOfferDetailVo.setSid(busVehicleInquiry.getSid());
busVehicleOfferDetailVo.setInquirer(busVehicleInquiry.getInquirer());
String createBySid = busVehicleInquiry.getCreateBySid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
SysUserVo sysUserVo = sysUserVoResultBean.getData();
if (sysUserVo == null) {
return rb.setMsg("该用户不存在");
}
busVehicleOfferDetailVo.setPhone(sysUserVo.getMobile());
busVehicleOfferDetailVo.setCreateTime(busVehicleInquiry.getCreateTime());
busVehicleOfferDetailVo.setVehModelSid(busVehicleInquiry.getVehModelSid());
busVehicleOfferDetailVo.setVehModel(busVehicleInquiry.getVehModel());
busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig());
busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig());
//List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
StringBuffer repInstr = new StringBuffer();
String optionalConfig = busVehicleInquiry.getOptionalConfig();
String replacementConfig = busVehicleInquiry.getReplacementConfig();
if (StringUtils.isNotBlank(optionalConfig)) {
repInstr.append(optionalConfig).append(" ");
}
if (StringUtils.isNotBlank(replacementConfig)){
repInstr.append(replacementConfig);
}
busVehicleOfferDetailVo.setRepInstr(repInstr.toString());
busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig());
busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel());
busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid());
busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName());
busVehicleOfferDetailVo.setReplacementConfig(busVehicleInquiry.getReplacementConfig());
busVehicleOfferDetailVo.setOptionalConfig(busVehicleInquiry.getOptionalConfig());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid());
if (baseVehicleModel == null) {
return rb.setMsg("该车型不存在");
}
busVehicleOfferDetailVo.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
busVehicleOfferDetailVo.setProductLineValue(baseVehicleModel.getProductLineValue());
busVehicleOfferDetailVo.setDriveFormValue(baseVehicleModel.getDriveFormValue());
busVehicleOfferDetailVo.setPowerValue(baseVehicleModel.getPowerValue());
busVehicleOfferDetailVo.setVehicleVersionValue(baseVehicleModel.getVehicleVersionValue());
busVehicleOfferDetailVo.setFuelTypeValue(baseVehicleModel.getFuelTypeValue());
busVehicleOfferDetailVo.setGearboxTypeValue(baseVehicleModel.getGearboxTypeValue());
busVehicleOfferDetailVo.setMarketSegmentsValue(baseVehicleModel.getMarketSegmentsValue());
busVehicleOfferDetailVo.setEngineTypeValue(baseVehicleModel.getEngineTypeValue());
busVehicleOfferDetailVo.setSpecifications(baseVehicleModel.getSpecifications());
busVehicleOfferDetailVo.setEmissionStandardValue(baseVehicleModel.getEmissionStandardValue());
busVehicleOfferDetailVo.setDepartmentValue(baseVehicleModel.getDepartmentValue());
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(busVehicleInquiry.getVehModelConfigSid());
if (baseModelConfig == null) {
return rb.setMsg("该常用配置不存在");
}
busVehicleOfferDetailVo.setCarColorKey(baseModelConfig.getCarColorKey());
busVehicleOfferDetailVo.setCarColor(baseModelConfig.getCarColor());
busVehicleOfferDetailVo.setSpecificationKey(baseModelConfig.getSpecificationKey());
busVehicleOfferDetailVo.setSpecification(baseModelConfig.getSpecification());
busVehicleOfferDetailVo.setBaffleModelKey(baseModelConfig.getBaffleModelKey());
busVehicleOfferDetailVo.setBaffleModel(baseModelConfig.getBaffleModel());
busVehicleOfferDetailVo.setSaddleKey(baseModelConfig.getSaddleKey());
busVehicleOfferDetailVo.setSaddle(baseModelConfig.getSaddle());
busVehicleOfferDetailVo.setIndependentSourcesKey(baseModelConfig.getIndependentSourcesKey());
busVehicleOfferDetailVo.setIndependentSources(baseModelConfig.getIndependentSources());
busVehicleOfferDetailVo.setSlowMachineKey(baseModelConfig.getSlowMachineKey());
busVehicleOfferDetailVo.setSlowMachine(baseModelConfig.getSlowMachine());
busVehicleOfferDetailVo.setRearAxleRatioKey(baseModelConfig.getRearAxleRatioKey());
busVehicleOfferDetailVo.setRearAxleRatio(baseModelConfig.getRearAxleRatio());
busVehicleOfferDetailVo.setSuspensionKey(baseModelConfig.getSuspensionKey());
busVehicleOfferDetailVo.setSuspension(baseModelConfig.getSuspension());
busVehicleOfferDetailVo.setWheelbaseKey(baseModelConfig.getWheelbaseKey());
busVehicleOfferDetailVo.setWheelbase(baseModelConfig.getWheelbase());
busVehicleOfferDetailVo.setFuelTankKey(baseModelConfig.getFuelTankKey());
busVehicleOfferDetailVo.setFuelTank(baseModelConfig.getFuelTank());
busVehicleOfferDetailVo.setRearViewMirrorKey(baseModelConfig.getRearViewMirrorKey());
busVehicleOfferDetailVo.setRearViewMirror(baseModelConfig.getRearViewMirror());
busVehicleOfferDetailVo.setAirConditionerKey(baseModelConfig.getAirConditionerKey());
busVehicleOfferDetailVo.setAirConditioner(baseModelConfig.getAirConditioner());
busVehicleOfferDetailVo.setSeatKey(baseModelConfig.getSeatKey());
busVehicleOfferDetailVo.setSeat(baseModelConfig.getSeat());
busVehicleOfferDetailVo.setBumperKey(baseModelConfig.getBumperKey());
busVehicleOfferDetailVo.setBumper(baseModelConfig.getBumper());
busVehicleOfferDetailVo.setMultimediaKey(baseModelConfig.getMultimediaKey());
busVehicleOfferDetailVo.setMultimedia(baseModelConfig.getMultimedia());
busVehicleOfferDetailVo.setTireSizeKey(baseModelConfig.getTireSizeKey());
busVehicleOfferDetailVo.setTireSize(baseModelConfig.getTireSize());
busVehicleOfferDetailVo.setHubMaterialKey(baseModelConfig.getHubMaterialKey());
busVehicleOfferDetailVo.setHubMaterial(baseModelConfig.getHubMaterial());
busVehicleOfferDetailVo.setTireCoverKey(baseModelConfig.getTireCoverKey());
busVehicleOfferDetailVo.setTireCover(baseModelConfig.getTireCover());
busVehicleOfferDetailVo.setConfiguringBaoKey(baseModelConfig.getConfiguringBaoKey());
busVehicleOfferDetailVo.setConfiguringBao(baseModelConfig.getConfiguringBao());
busVehicleOfferDetailVo.setPackingCaseKey(baseModelConfig.getPackingCaseKey());
busVehicleOfferDetailVo.setPackingCase(baseModelConfig.getPackingCase());
BusVehicleOffer busVehicleOfferVo = baseMapper.fetchByMainSid(busVehicleInquiry.getSid());
if (busVehicleOfferVo != null) {
busVehicleOfferDetailVo.setSpecialInstructions(busVehicleOfferVo.getSpecialInstructions());
busVehicleOfferDetailVo.setCostPrice(busVehicleOfferVo.getCostPrice());
busVehicleOfferDetailVo.setSalePrice(busVehicleOfferVo.getSalePrice());
busVehicleOfferDetailVo.setRemarks(busVehicleOfferVo.getRemarks());
busVehicleOfferDetailVo.setCreateOrgSid(busVehicleInquiry.getCreateOrgSid());
}
return rb.success().setData(busVehicleOfferDetailVo);
}
public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOffer busVehicleOffer = new BusVehicleOffer();
String sid = busVehicleOffer.getSid();
String configName = "";
//缓速器
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSlowMachine()) && "有".equals(busVehicleOfferDetailVo.getSlowMachine())) {
configName += "缓速器/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearViewMirror())) {
configName += busVehicleOfferDetailVo.getRearViewMirror() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireSize())) {
configName += busVehicleOfferDetailVo.getTireSize() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearAxleRatio())) {
configName += busVehicleOfferDetailVo.getRearAxleRatio() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getAirConditioner()) && "有".equals(busVehicleOfferDetailVo.getAirConditioner())) {
configName += "空调/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getHubMaterial())) {
configName += busVehicleOfferDetailVo.getHubMaterial() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBaffleModel())) {
configName += busVehicleOfferDetailVo.getBaffleModel() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSuspension())) {
configName += busVehicleOfferDetailVo.getSuspension() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSeat())) {
configName += busVehicleOfferDetailVo.getSeat() + "/";
}
//护轮罩
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireCover()) && "有".equals(busVehicleOfferDetailVo.getTireCover())) {
configName += "护轮罩/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSaddle())) {
configName += busVehicleOfferDetailVo.getSaddle() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getWheelbase())) {
configName += busVehicleOfferDetailVo.getWheelbase() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBumper())) {
configName += busVehicleOfferDetailVo.getBumper() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getConfiguringBao())) {
configName += busVehicleOfferDetailVo.getConfiguringBao() + "/";
}
//独立热源
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getIndependentSources()) && "有".equals(busVehicleOfferDetailVo.getIndependentSources())) {
configName += "独立热源/";
}
//油罐
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getFuelTank())) {
configName += busVehicleOfferDetailVo.getFuelTank() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getMultimedia()) && "有".equals(busVehicleOfferDetailVo.getMultimedia())) {
configName += "多媒体/";
}
//颜色
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getCarColor())) {
configName += busVehicleOfferDetailVo.getCarColor() + "/";
}
//驾驶室规格
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSpecification())) {
configName += busVehicleOfferDetailVo.getSpecification() + "/";
}
if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getPackingCase())) {
configName += busVehicleOfferDetailVo.getPackingCase() + "/";
}
String moreConfig = busVehicleOfferDetailVo.getMoreConfig();
String configName1 = configName + moreConfig;
List<String> stringList = baseModelConfigService.fetchConfigName(busVehicleOfferDetailVo.getCreateOrgSid());
if (stringList.contains(configName1)) {
String costPrice = busVehicleOfferDetailVo.getCostPrice();
if (StringUtils.isBlank(costPrice)) {
return rb.setMsg("请填写厂家结算价");
}
String salePrice = busVehicleOfferDetailVo.getSalePrice();
if (StringUtils.isBlank(salePrice)) {
return rb.setMsg("请填写销售参考价");
}
BeanUtil.copyProperties(busVehicleOfferDetailVo, busVehicleOffer);
busVehicleOffer.setSid(sid);
busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid());
save(busVehicleOffer);
} else {
BaseModelConfig baseModelConfig = new BaseModelConfig();
BeanUtil.copyProperties(busVehicleOfferDetailVo, baseModelConfig);
baseModelConfig.setSid(sid);
baseModelConfig.setConfigName(configName);
baseModelConfigService.save(baseModelConfig);
String costPrice = busVehicleOfferDetailVo.getCostPrice();
if (StringUtils.isBlank(costPrice)) {
return rb.setMsg("请填写厂家结算价");
}
String salePrice = busVehicleOfferDetailVo.getSalePrice();
if (StringUtils.isBlank(salePrice)) {
return rb.setMsg("请填写销售参考价");
}
BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
baseVehmodelConfig.setModelSid(busVehicleOfferDetailVo.getVehModelSid());
baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid());
baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid());
baseVehmodelConfigService.save(baseVehmodelConfig);
BeanUtil.copyProperties(busVehicleOfferDetailVo, busVehicleOffer);
busVehicleOffer.setSid(sid);
busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid());
save(busVehicleOffer);
busVehicleInquiryService.updateConfigBySid(busVehicleOfferDetailVo.getSid());
}
return rb.success().setMsg("提交成功");
}
public ResultBean<BusVehicleOfferDetailVos> fetchAllBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusVehicleOffer busVehicleOffer = fetchBySid(sid);
String inquirySid = busVehicleOffer.getInquirySid();
BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(inquirySid);
BusVehicleOfferDetailVos busVehicleOfferDetailVos = new BusVehicleOfferDetailVos();
BeanUtil.copyProperties(busVehicleInquiry, busVehicleOfferDetailVos);
busVehicleOfferDetailVos.setXvehModelConfigSid(busVehicleInquiry.getVehModelConfigSid());
busVehicleOfferDetailVos.setXvehModelConfig(busVehicleInquiry.getVehModelConfig());
busVehicleOfferDetailVos.setXmoreConfig(busVehicleInquiry.getMoreConfig());
String createBySid = busVehicleInquiry.getCreateBySid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid);
SysUserVo sysUserVo = sysUserVoResultBean.getData();
if (sysUserVo == null) {
return rb.setMsg("该用户不存在");
}
busVehicleOfferDetailVos.setPhone(sysUserVo.getMobile());
List<String> stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid());
String repInstr = "";
for (String s : stringList) {
repInstr += s + ",";
}
if (StringUtils.isNotBlank(repInstr)) {
busVehicleOfferDetailVos.setRepInstr(repInstr.substring(0, repInstr.length() - 1));
}
String vehModelConfigSid = busVehicleOffer.getVehModelConfigSid();
BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(vehModelConfigSid);
if (baseModelConfig == null) {
return rb.setMsg("该常用配置不存在");
}
busVehicleOfferDetailVos.setBvehModelConfigSid(vehModelConfigSid);
busVehicleOfferDetailVos.setBvehModelConfig(baseModelConfig.getConfigName());
busVehicleOfferDetailVos.setBmoreConfig(baseModelConfig.getOtherConfig());
busVehicleOfferDetailVos.setSpecialInstructions(busVehicleOffer.getSpecialInstructions());
busVehicleOfferDetailVos.setCostPrice(busVehicleOffer.getCostPrice());
busVehicleOfferDetailVos.setSalePrice(busVehicleOffer.getSalePrice());
busVehicleOfferDetailVos.setRemarks(busVehicleOffer.getRemarks());
return rb.success().setData(busVehicleOfferDetailVos);
}
}

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@ -39,7 +39,8 @@
if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState,
if(length(bd.nodeState) > 0, false, true) as showUpdata,
bd.contractNo as contractId,
bd.applyName as `name`,
bd.applyName,
bd.name as customerName,
DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as `date`
FROM bus_delivered_apply bd
<where>

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -49,6 +49,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -89,6 +90,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BusDeliveredService busDeliveredService;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@ -714,10 +717,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = appDeliveredApplyDto.getSid();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(appDeliveredApplyDto.getUserSid()).getData();
if (StringUtils.isBlank(dtoSid)) {
BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
BeanUtil.copyProperties(appDeliveredApplyDto, busDeliveredApply, "sid");
save(busDeliveredApply);
List<AppCarListDto> carList = appDeliveredApplyDto.getCarList();
if (carList.size() > 0) {
busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
@ -727,6 +730,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (stringResultBean.getSuccess()) {
busDeliveredApply.setOrgSid(stringResultBean.getData());
}
busDeliveredApply.setApplySid(sysUserVo.getSid());
busDeliveredApply.setApplyName(sysUserVo.getName());
save(busDeliveredApply);
} else {
BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -1305,7 +1305,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询意向车型sid查询车型信息并保存车型:品牌sid、品牌、车型sid、配置sid、车型名称、车型配置名称、常用配置、更多配置、特殊配置说明、单台指导价、单台成交价
//意向车型可以查询的:品牌sid、品牌、车型sid、配置sid、车型名称、车型配置、其他配置说明、数量、换选装内容为特殊配置说明、销售参考价
ResultBean<CrmVehicleDemandOrderVo> orderVoResultBean = crmVehicledemandFeign.getInfo(intentionSid);
if (!orderVoResultBean.getSuccess()) {
if (orderVoResultBean.getSuccess()) {
CrmVehicleDemandOrderVo crmVehicleDemandOrderVo = orderVoResultBean.getData();
BusSalesOrderModel busSalesOrderModel = new BusSalesOrderModel();
busSalesOrderModel.setSalesOrderSid(sid);
@ -1317,6 +1317,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice()));
busSalesOrderModel.setMoreConfig(crmVehicleDemandOrderVo.getOtherConfig());
busSalesOrderModel.setSpecialConfig(crmVehicleDemandOrderVo.getChangeOptions());
busSalesOrderModel.setModelName(crmVehicleDemandOrderVo.getModelName());
busSalesOrderModelService.insert(busSalesOrderModel);
BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();
busSalesOrderPrice.setQuantity(crmVehicleDemandOrderVo.getNumber());

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java

@ -127,6 +127,8 @@ public class CrmCustomerTempDto implements Dto {
private String customerClassKey;
@ApiModelProperty(value = "备注")
private String remarks;
@ApiModelProperty("业务人员sid")
private String staffSid;
//运营信息
@ApiModelProperty(value = "运营信息")

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml

@ -99,7 +99,7 @@
cv.modelName AS model,
cv.brandSid,
cv.brandName AS brand,
cv.saleReferencePrice AS guidancePrice,
convert(cv.saleReferencePrice/10000,decimal(10,2)) AS guidancePrice,
cv.vehicleModelOffer AS price,
cv.comonConfigSid AS configSid,
cv.remarks,

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java

@ -29,4 +29,7 @@ public class ScmApplyInboundQuery implements Query {
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java

@ -36,5 +36,8 @@ public class AppScmVehicleExaminePageVo implements Vo {
@ApiModelProperty("是否验车 未验车 1 以验车2")
private String inspectedType;
@ApiModelProperty("保存状态(默认为0 未操作 1 已保存)")
private int saveStatus;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java

@ -94,5 +94,7 @@ public class ScmVehicleExamine extends BaseEntity {
private String modelDifferenceExplain; // 车型配置差异说明
@ApiModelProperty("保修卡卡号")
private String guaranteeCardNo; // 保修卡卡号
@ApiModelProperty("保存状态(默认为0 未操作 1 已保存)")
private int saveStatus;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java

@ -64,6 +64,6 @@ public class ScmWarehouseQuery implements Query {
@ApiModelProperty("负责人及电话")
private String warehouseContract; // 负责人及电话
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("分组key")
private String warehouseGroupKey; // 分组key
}

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -1,13 +1,13 @@
package com.yxt.anrui.scm.biz.scmapplyinbound;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -105,6 +105,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmApplyInbound> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) {
qw.like("purchaseOrderNo", query.getPurchaseOrderNo());
}
@ -446,16 +447,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
baseVehicleDto.setConfigName(booad.getConfigName());
baseVehicleDto.setInsideCode(booad.getInsideCode());
baseVehicleDto.setOrderingNo(booad.getPurchaseOrderNo());
baseVehicleDto.setSettlementStatus("0");
baseVehicleDto.setSettlementStatusValue("未买断");
baseVehicleDto.setLockedState("0");
baseVehicleDto.setLockedStateValue("未锁定");
baseVehicleDto.setVehicleState("0003");
baseVehicleDto.setVehicleStateValue("在途");
baseVehicleDto.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
baseVehicleDto.setSettlementStatusValue(VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks());
baseVehicleDto.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
baseVehicleDto.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleDto.setVehicleState(VehicleState.StockEnum.ING_STOCK.getCode());
baseVehicleDto.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
baseVehicleDto.setManPurOrderTypeKey("001");
baseVehicleDto.setManPurOrderTypeValue("排产订单");
baseVehicleDto.setContractPrice(Integer.parseInt(booad.getContractPrice().toString()));
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().subtract(booad.getSecondaryFreight()).toString()));
baseVehicleDto.setFreight(Integer.parseInt(booad.getOnceFreight().add(booad.getSecondaryFreight()).toString()));
baseVehicleDto.setCostPrice(Integer.parseInt(booad.getCostPrice().toString()));
baseVehicleDto.setPriceDate(booad.getPriceDate());
baseVehicleDto.setDepartureDate(booad.getDepartureDate());

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@ -24,7 +24,8 @@
sve.purchaseType,
sve.inspection as inspectedName,
sve.inspectionDate as inspectedDate,
sve.inspectionResult as inspectedType
sve.inspectionResult as inspectedType,
sve.saveStatus
FROM scm_vehicle_examine sve
<where>
${ew.sqlSegment}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@ -355,6 +355,7 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
if (StringUtils.isNotBlank(dto.getInspectedSid())) {
ScmVehicleExamine scmVehicleExamine = fetchBySid(dto.getInspectedSid());
if ("1".equals(scmVehicleExamine.getInspectionResult())) {
scmVehicleExamine.setSaveStatus(1);
scmVehicleExamine.setVinNo(dto.getVin());
scmVehicleExamine.setPurchaseTypeKey(dto.getPurchaseKey());
scmVehicleExamine.setModelName(dto.getModel());

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemRest.java

@ -35,6 +35,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
/**
* Project: anrui-scm(供应链) <br/>
* File: ScmVehicleInspectitemFeignFallback.java <br/>
@ -68,7 +70,7 @@ public class ScmVehicleInspectitemRest implements ScmVehicleInspectitemFeign {
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean<String> save(@RequestBody ScmVehicleInspectitemDto dto) {
public ResultBean<String> save(@Valid @RequestBody ScmVehicleInspectitemDto dto) {
return scmVehicleInspectitemService.saveOrUpdateDto(dto);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@ -81,8 +81,8 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
qw.like("warehouseContract", query.getWarehouseContract());
}
if (StringUtils.isNotBlank(query.getWarehouseGroup())) {
qw.eq("warehouseGroup", query.getWarehouseGroup());
if (StringUtils.isNotBlank(query.getWarehouseGroupKey())) {
qw.eq("warehouseGroupKey", query.getWarehouseGroupKey());
}
return qw;
}

222
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue

@ -0,0 +1,222 @@
<template>
<div>
<el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile" :accept="accept" list-type="picture-card" :limit="limit" :file-list="files" :on-remove="removeImage" :on-preview="handlePictureCardPreview" :on-progress="uploadProgrees" :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
<i class="el-icon-plus avatar-uploader-icon"/>
</el-upload>
<el-dialog :visible.sync="dialogVisible" title="查看图片">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
</div>
</template>
<script>
import { uploadFile_yanchejiancha } from '@/api/portal/Upload'
import { getStorage } from '@/utils/auth.js'
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
limit: {
type: Number,
default: ''
},
accept: {
type: String,
default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
uploadFile: uploadFile_yanchejiancha,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
// fileUrl: fileUrl,
// showpicture:false,
isview: false,
nameArr: '',
loadding: false
}
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
console.log('aaaa1', newVal)
this.files = newVal
console.log('aaaa2', this.files)
}
}
},
mounted() {
this.$nextTick(() => {
this.Init()
})
},
created() {
this.uploadFile = uploadFile_yanchejiancha //
this.accessToken = {
token: getStorage()
}
},
methods: {
showImg(imgList) {
this.files = imgList
console.log('123123123', this.files)
},
view() {
// window.open(this.filedUrl)
},
//
Init() {
if (this.name !== undefined) {
this.files = []
for (var i = 0; i < this.name.length; i++) {
this.files.push({
name: this.name[i],
url: this.name[i]
})
}
}
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
console.log('您选择的file:', file)
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = this.fileUrl + file.response.data
// var uid = file.response.data
this.files.push({
name: file.response.data.sourceFileName,
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
// console.log('event:', event)
}
}
}
</script>
<style scoped></style>

34
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue

@ -49,10 +49,16 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>图标</span></div>
<el-form-item>
<upload_yanchejianchaTuBiao ref="uploadImg" class="addinputwOne addinputw" v-model="imagelist" :limit="1" @change="backTuBiaoData" @fileChange="deleteData" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>照片说明</span></div>
<el-form-item>
<el-input v-model="formobj.remarks" clearable class="addinputw addinputwOne" placeholder=""></el-input>
<el-input v-model="formobj.remarks" clearable class="addinputw addinputwOne" type="textarea" resize="none" :autosize="{ minRows: 6, maxRows: 8 }" placeholder=""></el-input>
</el-form-item>
</el-col>
</el-row>
@ -138,11 +144,13 @@
<script>
import { save, fetchDetailsBySid, deleteFilesOss } from '@/api/supplychain/yanchejiancha'
import upload_yanchejiancha from '@/components/uploadFile/upload_yanchejiancha'
import upload_yanchejianchaTuBiao from '@/components/uploadFile/upload_yanchejianchaTuBiao'
export default {
name: 'yanchejianchaAdd',
components: {
upload_yanchejiancha
upload_yanchejiancha,
upload_yanchejianchaTuBiao
},
data() {
return {
@ -156,6 +164,7 @@ export default {
imglist: [],
dialogVisible: false,
dialogUrl: '',
imagelist: [],
//
formobj: {
iconUrl: '',
@ -189,6 +198,10 @@ export default {
fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
this.imagelist.push({
name: '',
url: this.formobj.iconUrl
})
}
}).catch((e) => {
this.formobj = row
@ -213,16 +226,13 @@ export default {
this.formobj.inspectimgtemp.splice(index, 1)
},
backData(val, index) {
console.log(val, 9999999)
if (val.length > 0) {
val.forEach((e) => {
this.formobj.inspectimgtemp[index].imgTempUrl.push(e.url)
})
}
console.log(this.formobj, 777777)
},
handleLook(row) {
console.log(row, 9999999)
this.srcList = []
this.dialogImgVisible = true
this.srcList = row.imgTempUrl
@ -243,6 +253,16 @@ export default {
this.dialogVisible = true
this.dialogUrl = row
},
backTuBiaoData(val) {
if (val.length > 0) {
val.forEach((e) => {
this.formobj.iconUrl = e.url
})
}
},
deleteData() {
this.formobj.iconUrl = ''
},
saveOrUpdate() {
if (this.formobj.isImg === '') {
this.$message({ showClose: true, type: 'error', message: '请勾选是否上传图片' })
@ -283,6 +303,8 @@ export default {
inspectdetail: [],
inspectimgtemp: []
}
this.imagelist = []
this.imglist = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/AppFeign.java

@ -6,7 +6,6 @@ import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@ -28,7 +27,7 @@ public interface AppFeign {
@ApiOperation("流程审核记录")
@GetMapping("/getProgressList")
@ResponseBody
ResultBean<List<AppFlowableRecordVo>> getProgressList(@SpringQueryMap AppFlowableRecordQuery appFlowableRecordQuery);
ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery);
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordQuery.java

@ -14,8 +14,7 @@ import lombok.Data;
public class AppFlowableRecordQuery implements Query {
private static final long serialVersionUID = -1052692071435565128L;
@ApiModelProperty(value = "流程实例id")
@JsonProperty("progressId")
private String procInsId;
private String progressId;
@ApiModelProperty(value = "流程id")
private String deployId;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java

@ -33,4 +33,7 @@ public class AppExaminePageVo implements Vo {
@ApiModelProperty("是否验车 key 未验车 1 以验车2")
private String inspectedType;
@ApiModelProperty("保存状态(默认为0 未操作 1 已保存)")
private int saveStatus;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppScmVehicleGressionFeign.java

@ -35,6 +35,7 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
/**
@ -116,5 +117,5 @@ public interface AppScmVehicleGressionFeign {
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(GressionQuery query);
ResultBean<String> getFlowOperateTitle(@SpringQueryMap GressionQuery query);
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@ -30,7 +30,7 @@ public class AppService {
public ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) {
ResultBean<List<AppFlowableRecordVo>> rb = ResultBean.fireFail();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String procInsId = appFlowableRecordQuery.getProcInsId();
String procInsId = appFlowableRecordQuery.getProgressId();
String deployId = appFlowableRecordQuery.getDeployId();
ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId);
List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/scmvehiclegression/AppScmVehicleGressionService.java

@ -200,7 +200,7 @@ public class AppScmVehicleGressionService {
//0 上一环节 1下一环节
int next = query.getNext();
GetNodeQuery getNodeQuery = new GetNodeQuery();
BeanUtil.copyProperties(getNodeQuery, query);
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<GetNodeVo>> getPreviousNodesForReject = scmVehicleGressionFeign.getPreviousNodesForReject(getNodeQuery);

Loading…
Cancel
Save