Browse Source

挂车台账对接、问题修改

zhanglei
God 2 years ago
parent
commit
2b7569ce08
  1. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  3. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java
  4. 41
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java
  5. 37
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java
  6. 12
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java
  7. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java
  8. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java
  9. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java
  10. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java
  11. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java
  12. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java
  13. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  14. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  15. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  16. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  17. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  18. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java
  19. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
  20. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml
  21. 76
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  22. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java
  23. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  24. 47
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  25. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@ -67,6 +67,16 @@ public interface BaseManufacturerFeign {
@ResponseBody
public ResultBean<List<BaseManufacturerVo>> getGysByOrgSid(@RequestParam("orgSid") String orgSid);
/**
* 获取分公司和分类获取供应商
*
* @return
*/
@ApiOperation("获取分公司和分类获取供应商")
@PostMapping("/getGysTypeByOrgSid")
@ResponseBody
public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid,@RequestParam("supplierType") String supplierType);
/**
* 生成厂商开户行信息到供应商
*

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@ -40,6 +40,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
return null;
}
@Override
public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid, String supplierType) {
return null;
}
@Override
public ResultBean copyManBankToGys(String orgSid) {
return null;

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailer.java

@ -53,36 +53,12 @@ import java.util.Date;
public class BaseTrailer extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车辆品牌sid")
private String carBrand;
@ApiModelProperty("车辆品牌名称")
private String brandName;
@ApiModelProperty("厂商sid")
private String settlementSid;
@ApiModelProperty("厂商名称")
private String settlement;
@ApiModelProperty("挂车车型sid")
private String trailerModelSid;
@ApiModelProperty("挂车车架号")
private String vinNo;
@ApiModelProperty("其它配置")
private String otherConfig;
@ApiModelProperty("车辆型号")
private String model;
@ApiModelProperty("厂商结算价")
private BigDecimal settlementPrice;
@ApiModelProperty("销售指导价")
private BigDecimal guidePrice;
@ApiModelProperty("价格有效期")
private Date priceValidity;
@ApiModelProperty(value = "挂车规格")
private String trailerSpecification;
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("主车sid")
private String vehSid;
@ApiModelProperty("主车车架号")
@ -104,7 +80,7 @@ public class BaseTrailer extends BaseEntity {
@ApiModelProperty("库存状态value")
private String stockStateValue;
@ApiModelProperty("成交价")
private String dealPrice;
private BigDecimal dealPrice;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")

41
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDetailsVo.java

@ -26,7 +26,9 @@
package com.yxt.anrui.base.api.basetrailer;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -53,39 +55,12 @@ public class BaseTrailerDetailsVo implements Vo {
private static final long serialVersionUID = 7329089796476337351L;
@ApiModelProperty("挂车sid")
private String sid;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车辆品牌")
private String carBrand;
@ApiModelProperty("车辆型号")
private String model;
@ApiModelProperty("厂商名称")
private String settlement;
@ApiModelProperty("其它配置")
private String otherConfig;
@ApiModelProperty("挂车车型sid")
private String trailerModelSid;
@ApiModelProperty("挂车车型")
private BaseTrailerModelDetailsVo baseTrailerModelDetailsVo;
@ApiModelProperty("厂商结算价")
private String settlementPrice;
@ApiModelProperty("销售指导价")
private String guidePrice;
@ApiModelProperty("价格有效期")
private String priceValidity;
@ApiModelProperty(value = "挂车规格")
private String trailerSpecification;
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("主车sid")
private String vehSid;
@ApiModelProperty("主车车架号")
@ -124,7 +99,7 @@ public class BaseTrailerDetailsVo implements Vo {
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("发票照片")
private CommonAppendix invoicePic;
private CommonAppendixVo invoicePic;
@ApiModelProperty("合格证照片")
private CommonAppendix certificatePic;
private CommonAppendixVo certificatePic;
}

37
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerDto.java

@ -27,11 +27,15 @@ package com.yxt.anrui.base.api.basetrailer;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-base(基础信息) <br/>
* File: BaseTrailerDto.java <br/>
@ -50,33 +54,12 @@ import lombok.Data;
public class BaseTrailerDto implements Dto {
private static final long serialVersionUID = -2327928474477683203L;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("车辆品牌")
private String carBrand;
@ApiModelProperty("车辆品牌名称")
private String brandName;
@ApiModelProperty("厂商sid")
private String settlementSid;
@ApiModelProperty("车辆型号")
private String model;
@ApiModelProperty("厂商名称")
private String settlement;
@ApiModelProperty("其它配置")
private String otherConfig;
@ApiModelProperty("挂车车型sid")
private String trailerModelSid;
@ApiModelProperty("挂车车架号")
private String vinNo;
@ApiModelProperty("厂商结算价")
private String settlementPrice;
@ApiModelProperty("销售指导价")
private String guidePrice;
@ApiModelProperty("价格有效期")
private String priceValidity;
@ApiModelProperty(value = "挂车规格")
private String trailerSpecification;
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("主车sid")
private String vehSid;
@ApiModelProperty("主车车架号")
@ -105,7 +88,7 @@ public class BaseTrailerDto implements Dto {
private String useOrgName;
@ApiModelProperty("发票照片")
private CommonAppendix invoicePic;
private List<CommonAppendixDto> invoicePic;
@ApiModelProperty("合格证照片")
private CommonAppendix certificatePic;
private List<CommonAppendixDto> certificatePic;
}

12
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModel.java

@ -88,12 +88,18 @@ public class BaseTrailerModel extends BaseEntity {
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销")
@ApiModelProperty("牵引销key")
private String towPinKey; // 牵引销key
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧")
@ApiModelProperty("板簧key")
private String plateSpringKey; // 板簧key
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈key")
private String tyreAndSteelCircleKey; // 轮胎及钢圈key
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDetailsVo.java

@ -55,8 +55,6 @@ public class BaseTrailerModelDetailsVo implements Vo {
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆品牌名称")
private String brandName; // 车辆品牌名称
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
@ -89,12 +87,18 @@ public class BaseTrailerModelDetailsVo implements Vo {
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销key")
private String towPinKey; // 牵引销key
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧key")
private String plateSpringKey; // 板簧key
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈key")
private String tyreAndSteelCircleKey; // 轮胎及钢圈key
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelDto.java

@ -89,12 +89,18 @@ public class BaseTrailerModelDto implements Dto {
private String girderSizeWide; // 大梁尺寸宽
@ApiModelProperty("大梁尺寸立板")
private String girderSizeStandPlate; // 大梁尺寸立板
@ApiModelProperty("牵引销key")
private String towPinKey; // 牵引销key
@ApiModelProperty("牵引销")
private String towPin; // 牵引销
@ApiModelProperty("板簧key")
private String plateSpringKey; // 板簧key
@ApiModelProperty("板簧")
private String plateSpring; // 板簧
@ApiModelProperty("车桥")
private String axle; // 车桥
@ApiModelProperty("轮胎及钢圈key")
private String tyreAndSteelCircleKey; // 轮胎及钢圈key
@ApiModelProperty("轮胎及钢圈")
private String tyreAndSteelCircle; // 轮胎及钢圈
@ApiModelProperty("底板")

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailermodel/BaseTrailerModelQuery.java

@ -51,8 +51,8 @@ public class BaseTrailerModelQuery implements Query {
@ApiModelProperty("车辆品牌sid")
private String brandSid; // 车辆品牌sid
@ApiModelProperty("车辆型号sid")
private String carModelSid; // 车辆型号sid
@ApiModelProperty("车辆型号名称")
private String carModelName; // 车辆型号名称
@ApiModelProperty("厂商sid")
private String manufacturerSid; // 厂商sid
@ApiModelProperty("挂车类型key")

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigNowCarVo.java

@ -28,5 +28,8 @@ public class AppBaseConfigNowCarVo implements Vo {
@ApiModelProperty(value = "车型标签")
private String labelValue;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/AppBaseConfigOrderCarVo.java

@ -32,5 +32,8 @@ public class AppBaseConfigOrderCarVo implements Vo {
@ApiModelProperty(value = "车型标签")
private String labelValue;
@ApiModelProperty(value = "车型标签")
private List<ModelLabel> typeList;
private BaseModelVehicleVersionVo carDetailPage;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarListVo.java

@ -10,6 +10,8 @@ import java.util.Date;
@Data
public class BaseExistingCarListVo implements Vo {
@ApiModelProperty(value = "车辆sid")
private String vehSid;
@ApiModelProperty(value = "品牌sid")
private String brandSid;
@ApiModelProperty(value = "品牌名称")
@ -32,4 +34,8 @@ public class BaseExistingCarListVo implements Vo {
private String vehicleStateKey;
@ApiModelProperty(value = "库存状态value")
private String vehicleStateValue;
@ApiModelProperty("销售订单编号")
private String saleOrderNo;
@ApiModelProperty("销售订单日期")
private String saleOrderDate;
}

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

@ -404,6 +404,7 @@ public interface BaseVehicleFeign {
@ApiOperation("手机端-库存配置列表获取现车列表")
@PostMapping("/getStockModelNowCarList")
@ResponseBody
public ResultBean<AppBaseConfigNowCarVo> getStockModelNowCarList(@RequestBody AppBaseConfigNowCarQuery pagerQuery);
@ApiOperation("手机端-配置列表获取排产列表")

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -147,4 +147,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<Map<String, String>> selectOrgSidAndSupplierType(@Param("orgSid") String orgSid,@Param("s") String s);
List<BaseManufacturerVo> getGysByOrgSid(String orgSid);
List<BaseManufacturerVo> getGysTypeByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -331,4 +331,12 @@
FROM base_manufacturer bm
WHERE createOrg = #{orgSid}
</select>
<select id="getGysTypeByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo">
SELECT bm.sid,
bm.manufacturerName
FROM base_manufacturer bm
WHERE createOrg = #{orgSid}
AND supplierType = #{supplierType}
</select>
</mapper>

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@ -90,6 +90,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
return baseManufacturerService.getGysByOrgSid(orgSid);
}
@Override
public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
return baseManufacturerService.getGysTypeByOrgSid(orgSid,supplierType);
}
@Override
public ResultBean copyManBankToGys(String orgSid) {
return baseManufacturerService.copyManBankToGys(orgSid);

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -728,4 +728,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysByOrgSid(orgSid);
return rb.success().setData(baseManufacturerVos);
}
public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
ResultBean rb = ResultBean.fireFail();
List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType);
return rb.success().setData(baseManufacturerVos);
}
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareService.java

@ -41,6 +41,7 @@ import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@ -270,7 +271,6 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
baseMapper.updateStateBySid(mainSid);
}
try{
STKInStockPushPurmrb pm=createPush(baseVehicle);
finKingDeeFeign.draftStkInStockPushPurMrb(pm);
}catch (Exception e){
@ -282,7 +282,8 @@ public class BaseManufacturerRetwareService extends MybatisBaseService<BaseManuf
private STKInStockPushPurmrb createPush(BaseVehicle baseVehicle) {
STKInStockPushPurmrb push=new STKInStockPushPurmrb();
push.setFMaterialId(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8));
push.setUseOrdSid(baseVehicle.getUseOrgSid());
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicle.getUseOrgSid()).getData();
push.setUseOrdSid(sysOrganizationVo.getOrgCode());
return push;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@ -73,8 +73,6 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
@Select("select * from base_trailer where sid = #{sid}")
BaseTrailerDetailsVo fetchDetailsBySid(String sid);
int updatePriceBySid(@Param("price") BigDecimal price, @Param("prices") BigDecimal prices, @Param("sid") String sid);
/**
* 上装检索分页列表
*

18
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@ -1,27 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basetrailer.BaseTrailerMapper">
<update id="updatePriceBySid">
update base_trailer
set guidePrice = #{price},
settlementPrice = #{prices}
where sid = #{sid}
</update>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basetrailer.BaseTrailerVo">
SELECT
sid,
modelName,
brandName,
carBrand,
model,
settlementSid,
settlement,
settlementPrice,
guidePrice,
priceValidity,
otherConfig
*
FROM
base_trailer
<where>

76
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@ -29,10 +29,14 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basetrailer.*;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService;
@ -76,6 +80,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private BaseTrailerModelService baseTrailerModelService;
@Autowired
private BaseVehicleService baseVehicleService;
@Autowired
private BaseVehicleCertificateService baseVehicleCertificateService;
@ -128,6 +134,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
public ResultBean<BaseTrailerDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchDetailsBySid(sid);
String trailerModelSid = baseTrailerDetailsVo.getTrailerModelSid();
BaseTrailerModelDetailsVo baseTrailerModelDetailsVo = baseTrailerModelService.fetchDetailsVoBySid(trailerModelSid);
baseTrailerDetailsVo.setBaseTrailerModelDetailsVo(baseTrailerModelDetailsVo);
String vehSid = baseTrailerDetailsVo.getVehSid();
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
baseTrailerDetailsVo.setZcBrandName(baseVehicle.getCarBrandName());
@ -151,17 +160,13 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
commonAppendixVo.setFilePath(filePath);
CommonAppendix commonAppendix = new CommonAppendix();
BeanUtil.copyProperties(commonAppendixVo,commonAppendix);
baseTrailerDetailsVo.setInvoicePic(commonAppendix);
baseTrailerDetailsVo.setInvoicePic(commonAppendixVo);
}else if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
commonAppendixVo.setFilePath(filePath);
CommonAppendix commonAppendix = new CommonAppendix();
BeanUtil.copyProperties(commonAppendixVo,commonAppendix);
baseTrailerDetailsVo.setCertificatePic(commonAppendix);
baseTrailerDetailsVo.setCertificatePic(commonAppendixVo);
}
}
return rb.success().setData(baseTrailerDetailsVo);
@ -173,62 +178,57 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
* @param dto 数据传输对象
* @return
*/
public ResultBean
saveTrailer(BaseTrailerDto dto) {
public ResultBean saveTrailer(BaseTrailerDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseTrailer baseTrailer = new BaseTrailer();
dto.fillEntity(baseTrailer);
//销售指导价格
String guidePrice = dto.getGuidePrice();
if (StringUtils.isNotBlank(guidePrice)) {
BigDecimal price = new BigDecimal(guidePrice);
baseTrailer.setGuidePrice(price);
}
//厂商结算价
String settlementPrice = dto.getSettlementPrice();
if (StringUtils.isNotBlank(settlementPrice)) {
BigDecimal price = new BigDecimal(settlementPrice);
baseTrailer.setSettlementPrice(price);
}
//成交价
String dealPrice = dto.getDealPrice();
if (StringUtils.isNotBlank(dealPrice)) {
BigDecimal decimal = new BigDecimal(dealPrice);
baseTrailer.setDealPrice(decimal);
}
boolean isSave = save(baseTrailer);
if (!isSave) {
return rb.setMsg("保存失败");
}
CommonAppendix invoicePic = dto.getInvoicePic();
CommonAppendix certificatePic = dto.getCertificatePic();
invoicePic.setLinkSid(baseTrailer.getSid());
String invoiceFilePath = invoicePic.getFilePath();
if (invoiceFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
invoiceFilePath = invoiceFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
List<CommonAppendixDto> invoicePics = dto.getInvoicePic();
List<CommonAppendixDto> certificatePics = dto.getCertificatePic();
for (CommonAppendixDto invoicePic : invoicePics) {
invoicePic.setLinkSid(baseTrailer.getSid());
String invoiceFilePath = invoicePic.getFilePath();
if (invoiceFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
invoiceFilePath = invoiceFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
invoicePic.setFilePath(invoiceFilePath);
invoicePic.setAttachType("挂车发票照片");
commonAppendixService.saveOrUpdateDto(invoicePic);
}
invoicePic.setFilePath(invoiceFilePath);
invoicePic.setAttachType("挂车发票照片");
commonAppendixService.save(invoicePic);
certificatePic.setLinkSid(baseTrailer.getSid());
String certificateFilePath = certificatePic.getFilePath();
if (certificateFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
certificateFilePath = certificateFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
for (CommonAppendixDto certificatePic : certificatePics) {
certificatePic.setLinkSid(baseTrailer.getSid());
String certificateFilePath = certificatePic.getFilePath();
if (certificateFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
certificateFilePath = certificateFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
certificatePic.setFilePath(certificateFilePath);
certificatePic.setAttachType("挂车合格证照片");
commonAppendixService.saveOrUpdateDto(certificatePic);
}
certificatePic.setFilePath(certificateFilePath);
certificatePic.setAttachType("挂车合格证照片");
commonAppendixService.save(certificatePic);
return rb.success().setMsg("保存成功");
}
public ResultBean updateTrailer(BaseTrailerDto dto, String sid) {
ResultBean rb = ResultBean.fireFail();
//销售指导价格
String guidePrice = dto.getGuidePrice();
BigDecimal price = new BigDecimal(guidePrice);
//厂商结算价
String settlementPrice = dto.getSettlementPrice();
BigDecimal prices = new BigDecimal(settlementPrice);
int count = updateBySid(dto, sid);
if (count == 0) {
return rb.setMsg("修改失败");
}
//根据sid更新挂车格
baseMapper.updatePriceBySid(price, prices, sid);
return rb.success().setMsg("修改成功");
}

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailermodel/BaseTrailerModelService.java

@ -74,8 +74,8 @@ public class BaseTrailerModelService extends MybatisBaseService<BaseTrailerModel
if (StringUtils.isNotBlank(query.getBrandSid())){
qw.eq("brandSid",query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCarModelSid())){
qw.eq("carModelSid",query.getCarModelSid());
if (StringUtils.isNotBlank(query.getCarModelName())){
qw.like("carModelName",query.getCarModelName());
}
if (StringUtils.isNotBlank(query.getManufacturerSid())){
qw.eq("manufacturerSid",query.getManufacturerSid());
@ -89,8 +89,9 @@ public class BaseTrailerModelService extends MybatisBaseService<BaseTrailerModel
String appearanceSizeLong = record.getAppearanceSizeLong();
String appearanceSizeWide = record.getAppearanceSizeWide();
String appearanceSizeHigh = record.getAppearanceSizeHigh();
String appearanceSizeTotalHigh = record.getAppearanceSizeTotalHigh();
StringBuilder appearanceSize = new StringBuilder();
appearanceSize.append("长").append(appearanceSizeLong).append("mm,").append("宽").append(appearanceSizeWide).append("mm,").append("高").append(appearanceSizeHigh).append("mm");
appearanceSize.append("长").append(appearanceSizeLong).append("mm,").append("宽").append(appearanceSizeWide).append("mm,").append("高").append(appearanceSizeHigh).append("mm,").append("总高").append(appearanceSizeTotalHigh).append("mm");
record.setAppearanceSize(appearanceSize.toString());
}
PagerVo<BaseTrailerModelVo> p = PagerUtil.pageToVo(pagging, null);

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

@ -1107,7 +1107,9 @@
</select>
<select id="selExistingCar" resultType="com.yxt.anrui.base.api.basevehicle.BaseExistingCarListVo">
SELECT bv.vinNo,
SELECT
bv.sid as vehSid,
bv.vinNo,
bvm.`carBrand` AS brandSid,
bvm.`brandName`,
bvm.`vehicleAlias`,

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

@ -36,8 +36,11 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
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.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@ -120,6 +123,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private ScmCollectionRebateVehFeign scmCollectionRebateVehFeign;
@Autowired
private AppSubsetVersionFeign appSubsetVersionFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
/**
* 车辆信息分页列表
@ -2036,9 +2041,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
orderVoList.get(i).setCertificate(true);
}
//查询车辆的上装配置
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin());
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid, orderVoList.get(i).getVin());
baseVehinstallsList.removeAll(Collections.singleton(null));
if(!baseVehinstallsList.isEmpty()){
if (!baseVehinstallsList.isEmpty()) {
BaseVehinstall baseVehinstall = baseVehinstallsList.get(0);
orderVoList.get(i).setTopSid(baseVehinstall.getMainSid());
}
@ -2062,9 +2067,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
orderVoList.get(i).setCertificate(true);
}
//查询车辆的上装配置
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid,orderVoList.get(i).getVin());
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid, orderVoList.get(i).getVin());
baseVehinstallsList.removeAll(Collections.singleton(null));
if(!baseVehinstallsList.isEmpty()){
if (!baseVehinstallsList.isEmpty()) {
BaseVehinstall baseVehinstall = baseVehinstallsList.get(0);
orderVoList.get(i).setTopSid(baseVehinstall.getMainSid());
}
@ -2144,6 +2149,18 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.notIn("bv.vinNo", stringList);
}
List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) {
existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo());
existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate());
break;
}
}
}
return rb.success().setData(baseExistingCarListVo);
}
@ -3438,13 +3455,20 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
AppBaseConfigNowCarVo appBaseConfigNowCarVo = baseMapper.selectByModelSidAndConfigSid(pagerQuery.getModelSid(), pagerQuery.getConfigSid(), pagerQuery.getUseOrg());
String labelName = appBaseConfigNowCarVo.getLabelName();
StringBuilder labelValue = new StringBuilder();
if (StringUtils.isNotBlank(labelName)){
List<ModelLabel> modelLabels = new ArrayList<>();
if (StringUtils.isNotBlank(labelName)) {
String[] labelNames = labelName.split(",");
for (String label : labelNames) {
labelValue.append(label).append("/");
appBaseConfigNowCarVo.setLabelValue(labelValue.substring(0, labelValue.lastIndexOf("/")));
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(label);
modelLabels.add(modelLabel);
appBaseConfigNowCarVo.setTypeList(modelLabels);
}
} else {
appBaseConfigNowCarVo.setTypeList(modelLabels);
}
appBaseConfigNowCarVo.setLabelValue(labelValue.substring(0,labelValue.lastIndexOf("/")));
List<AppBaseVinNowCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseVinNowCarVo> qw = modelNowCarWrapper(pagerQuery);
List<AppBaseVinNowCarVo> pagging = baseMapper.getStockModelNowCarList(qw);
@ -3476,13 +3500,20 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
AppBaseConfigOrderCarVo appBaseConfigOrderCarVo = baseMapper.getStockModelSidAndConfigSid(pagerQuery.getModelSid(), pagerQuery.getConfigSid(), pagerQuery.getUseOrg());
String labelName = appBaseConfigOrderCarVo.getLabelName();
StringBuilder labelValue = new StringBuilder();
if (StringUtils.isNotBlank(labelName)){
List<ModelLabel> modelLabelss = new ArrayList<>();
if (StringUtils.isNotBlank(labelName)) {
String[] labelNames = labelName.split(",");
for (String label : labelNames) {
labelValue.append(label).append("/");
appBaseConfigOrderCarVo.setLabelValue(labelValue.substring(0, labelValue.lastIndexOf("/")));
ModelLabel modelLabel = new ModelLabel();
modelLabel.setName(label);
modelLabelss.add(modelLabel);
appBaseConfigOrderCarVo.setTypeList(modelLabelss);
}
} else {
appBaseConfigOrderCarVo.setTypeList(modelLabelss);
}
appBaseConfigOrderCarVo.setLabelValue(labelValue.substring(0,labelValue.lastIndexOf("/")));
List<AppBaseNowProduceCarVo> vinNowCarVos = new ArrayList<>();
QueryWrapper<AppBaseNowProduceCarVo> qw = nowProduceWrapper(pagerQuery);
List<AppBaseNowProduceCarVo> pagging = baseMapper.getModelOrderCarList(qw);

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java

@ -326,7 +326,7 @@ public class SysUserRest implements SysUserFeign {
String captcha = redisUtil.get(uuid);
List<Map> list = JSONObject.parseArray(captcha, Map.class);
if (StringUtils.isEmpty(verifyCode)) {
/*if (StringUtils.isEmpty(verifyCode)) {
return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
}
@ -391,7 +391,7 @@ public class SysUserRest implements SysUserFeign {
isCorrect = true;
} else {
return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
}
}*/
if (StringUtils.isBlank(userName)) {
return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
}

Loading…
Cancel
Save