yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
fanzongzhe 2 years ago
parent
e9d5b65df6 1d3a36f365
commit
83e893ba16
60 changed files with 689 additions and 259 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
  4. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java
  6. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java
  7. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java
  8. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java
  9. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
  10. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
  11. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java
  12. 57
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  13. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  14. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
  15. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  16. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
  17. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
  18. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java
  19. 23
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java
  20. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java
  21. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
  22. 65
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  23. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  24. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  25. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  26. 26
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
  27. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  28. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java
  29. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
  30. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java
  31. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  32. 5
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  33. 7
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
  34. 68
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  35. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
  36. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
  37. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  38. 19
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  39. 19
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
  40. 9
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
  41. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
  42. 19
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
  43. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
  44. 2
      anrui-system-ui/src/views/flow/doneList.vue
  45. 8
      anrui-system-ui/src/views/flow/havereadList.vue
  46. 8
      anrui-system-ui/src/views/flow/tobereadList.vue
  47. 2
      anrui-system-ui/src/views/flow/todoList.vue
  48. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
  49. 11
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  50. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java
  51. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java
  52. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java
  53. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
  54. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
  55. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
  56. 22
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java
  57. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java
  58. 74
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  59. 9
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
  60. 310
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
View File

@ -77,4 +77,10 @@ public class BaseModelModpriceModel extends BaseEntity {
@ApiModelProperty("价格增减数额")
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
View File

@ -69,4 +69,8 @@ public class BaseModelModpriceModelDto implements Dto {
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
View File

@ -68,6 +68,10 @@ public class BaseModelModpriceModelVo implements Vo {
private String guidedPrice; // 现全款销售指导价
@ApiModelProperty("价格增减数额")
private String incOrDecInPrice; // 价格增减数额
@ApiModelProperty("调整后全款销售指导价")
private String tzhGuidedPrice; // 调整后全款销售指导价
@ApiModelProperty("调整后贷款销售指导价")
private String tzhManufactorSettlementPrice; // 调整后贷款销售指导价
@ApiModelProperty("备注")
private String remarks; // 备注

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java
View File

@ -114,9 +114,9 @@ public interface BaseTrailerFeign {
@PostMapping("/trailerOut/{sid}")
ResultBean trailerOut(@PathVariable("sid") String sid);
@ApiOperation("查询主车的挂车信息")
@ApiOperation("查询主车的挂车信息/上装信息")
@GetMapping("/trailerList")
ResultBean<TraliveredVo> trailerList(@RequestParam("vinSid") String vinSid);
ResultBean<TraliveredVo> trailerList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo);
@ApiOperation("根据挂车车架号获取一条记录")
@GetMapping("/fetchByGcVinNo/{gcVinNo}")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java
View File

@ -85,7 +85,7 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
}
@Override
public ResultBean<TraliveredVo> trailerList(String vinSid) {
public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
return null;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/TraliveredVo.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.base.api.basetrailer;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
import lombok.Data;
import java.util.ArrayList;
@ -18,4 +19,6 @@ public class TraliveredVo {
private String modelName;
private List<TrailerVo> list = new ArrayList<>();
private List<BaseVehinstallmodelDetailsVo> vehillModelList = new ArrayList<>();
}

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java
View File

@ -52,7 +52,6 @@ public class BaseVehicleModel extends BaseEntity {
@ApiModelProperty("产品线key值")
private String productLine;
@ApiModelProperty("产品线value值")
private String productLineValue;
@ApiModelProperty(value = "排放标准key值")
private String emissionStandard;

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDetailsVo.java
View File

@ -27,9 +27,6 @@ package com.yxt.anrui.base.api.basevehinstallmodel;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -108,4 +105,7 @@ public class BaseVehinstallmodelDetailsVo implements Vo {
@ApiModelProperty("创建组织")
private String createOrgSid; // 创建组织
@ApiModelProperty("销售订单中上装价格")
private String topPrice;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java
View File

@ -52,6 +52,8 @@ import java.math.BigDecimal;
@Data
public class BaseVehmodelConfigDto implements Dto {
@ApiModelProperty("修改时间")
private String modifyTime; // 修改时间
@ApiModelProperty("业务员sid")
private String staffSid; // 业务员sid
@ApiModelProperty("用户sid")

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java
View File

@ -1,11 +1,14 @@
package com.yxt.anrui.base.api.basevehmodelconfig;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import java.util.Date;
/**
* @Author dimengzhe
* @Date 2022/4/29 10:59
@ -34,4 +37,8 @@ public class BaseVehmodelVo implements Vo {
@ApiModelProperty("sid")
private String modelConfigSid;
@ApiModelProperty("最新更新时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date modifyTime; // 最新更新时间
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java
View File

@ -111,8 +111,8 @@ public class BaseTrailerRest implements BaseTrailerFeign {
}
@Override
public ResultBean<TraliveredVo> trailerList(String vinSid) {
return baseTrailerService.trailerList(vinSid);
public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
return baseTrailerService.trailerList(vinSid,contractNo);
}
@Override

57
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
View File

@ -29,56 +29,47 @@ 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.metadata.IPage;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
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.basevehicle.BaseVehicleDto;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApply;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService;
import com.yxt.anrui.base.biz.basevehicleoutapply.BaseVehicleOutApplyService;
import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService;
import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
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.buscenter.api.bussalesorder.BusSalesOrder;
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.fin.api.finbillapplication.FinBillApplicationDetailsVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@ -86,11 +77,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
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.anrui.scm.api.scmapplyinbound.ScmApplyInboundVo;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -103,7 +92,6 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@ -163,6 +151,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
private FinBillApplicationFeign finBillApplicationFeign;
@Autowired
private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
@Autowired
private BaseVehinstallService baseVehinstallService;
@Autowired
private BaseVehinstallmodelService baseVehinstallmodelService;
private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -716,16 +708,43 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
}
}
public ResultBean<TraliveredVo> trailerList(String vinSid) {
public ResultBean<TraliveredVo> trailerList(String vinSid,String contractNo) {
ResultBean<TraliveredVo> rb = ResultBean.fireFail();
//查询销售订单的上装价格
String price = "";
ResultBean<AppOrderDetailsVo> detailsVoResultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(contractNo);
if(detailsVoResultBean.getData() != null){
if(detailsVoResultBean.getData().getTopInfo() != null){
price = detailsVoResultBean.getData().getTopInfo().getTopPrice();
}
}
TraliveredVo traliveredVo = new TraliveredVo();
List<BaseVehinstallmodelDetailsVo> vehillModelList = new ArrayList<>();
//根据车辆sid查询车架号以及车型信息
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
traliveredVo.setVinNo(baseVehicle.getVinNo());
traliveredVo.setModelName(baseVehicle.getModelName());
List<TrailerVo> voList = baseMapper.trailerList(vinSid);
voList.removeAll(Collections.singleton(null));
traliveredVo.setList(voList);
if(voList.isEmpty()){
traliveredVo.setList(voList);
}
//查询车辆的上装配置
List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(baseVehicle.getCreateOrgSid(), baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length()-8));
baseVehinstallsList.removeAll(Collections.singleton(null));
for (int i = 0; i < baseVehinstallsList.size(); i++) {
BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = new BaseVehinstallmodelDetailsVo();
BaseVehinstall baseVehinstall = baseVehinstallsList.get(i);
String topSid = baseVehinstall.getMainSid();
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(topSid);
BeanUtil.copyProperties(baseVehinstallmodel,baseVehinstallmodelDetailsVo);
baseVehinstallmodelDetailsVo.setTopPrice(price);
vehillModelList.add(baseVehinstallmodelDetailsVo);
}
vehillModelList.removeAll(Collections.singleton(null));
if(!vehillModelList.isEmpty()){
traliveredVo.setVehillModelList(vehillModelList);
}
return rb.success().setData(traliveredVo);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -3849,7 +3849,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
}
for (BaseVehicleQKKPVo baseVehicleQKKPVo : recordsNew) {
TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid()).getData();
TraliveredVo data = baseTrailerService.trailerList(baseVehicleQKKPVo.getVehSid(),baseVehicleQKKPVo.getContractNo()).getData();
List<TrailerVo> trailerVos = data.getList();
if (trailerVos != null && trailerVos.size() > 0){
for (TrailerVo trailerVo : trailerVos) {

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
View File

@ -133,7 +133,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
@Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}")
@Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice},modifyTime = now() where sid = #{sid}")
void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice, @Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice, @Param("sid") String sid);
IPage<BaseVehmodelConfigVehicleVos> selVehModelByUseOrgSidAll(IPage<BaseVehmodelConfig> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVehicleVos> qw);

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
View File

@ -219,7 +219,7 @@
</select>
<select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
select bvc.sid as modelConfigSid,bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, bmc.configName,bvc.manufactorSettlementPrice
select bvc.sid as modelConfigSid,bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid, bmc.configName,bvc.manufactorSettlementPrice,bvc.modifyTime
from base_vehmodel_config bvc
left join base_vehicle_model bm on bvc.modelSid = bm.sid
left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.base.biz.basevehmodelconfig;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigDto;
@ -38,6 +39,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -83,6 +85,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
@PostMapping("/update")
public ResultBean update(@RequestBody BaseVehmodelConfigDto dto) {
ResultBean rb = ResultBean.fireFail();
dto.setModifyTime(DateUtil.formatTime(new Date()));
baseVehmodelConfigService.updateBySid(dto.toMap(), dto.getSid());
return rb.success();
}

7
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.buscenter.api.busdelivered;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -34,6 +35,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
@ -95,4 +97,9 @@ public interface BusDeliveredFeign {
@PostMapping("/addRetrievalApply")
@ResponseBody
public ResultBean addRetrievalApply(@Valid @RequestBody AddRetrievalApplyDto dto);
@ApiOperation("补充车辆返回")
@PostMapping("/selectInfo")
@ResponseBody
ResultBean<List<AppCarListVo>> selectInfo(@RequestBody DeliverDetailsQuery query);
}

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.buscenter.api.busdelivered;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -84,4 +85,9 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign {
public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) {
return null;
}
@Override
public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
return null;
}
}

23
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/DeliverDetailsQuery.java
View File

@ -0,0 +1,23 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/4/18 9:17
* @Description
*/
@Data
public class DeliverDetailsQuery {
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("当前申请页面已选车辆的sid:app需要排除")
private List<String> vinSelectsid = new ArrayList<>();
@ApiModelProperty("补充车辆sid：pc需要的")
private List<String> vinSids = new ArrayList<>();
}

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java
View File

@ -34,4 +34,6 @@ public class AppOrderTopInfoVo implements Vo {
private String remarks;
@ApiModelProperty("01公司采购02客户自购")
private String buyTypeKey;
private String topPrice;
}

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java
View File

@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.busdelivered;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.*;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -35,6 +36,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusDeliveredFeignFallback.java <br/>
@ -112,4 +115,9 @@ public class BusDeliveredRest implements BusDeliveredFeign {
public ResultBean addRetrievalApply(AddRetrievalApplyDto dto) {
return busDeliveredService.addRetrievalApply(dto);
}
@Override
public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
return busDeliveredService.selectInfo(query);
}
}

65
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
View File

@ -325,8 +325,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
appCarListVo.setVinSid(list.get(i));
// appCarListVo.setDiscount(appOrderPriceInfoVo.getSingleCarDiscountPrice());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid);
if (trailerList.getData().getList().isEmpty()) {
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid,contractNo);
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
@ -432,8 +432,8 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid());
if (trailerList.getData().getList().isEmpty()) {
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
@ -533,4 +533,61 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
return baseMapper.updateStateByContractNo(contractNo, vinSidList, i);
}
public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
ResultBean<List<AppCarListVo>> rb = ResultBean.fireFail();
//移动端：排除已选车辆后的所有未提交及未出库的车辆集合
//PC端：前端传的已勾选的所有的车辆的集合
String contractNo = query.getContractNo();
List<String> vinSelectSid = query.getVinSelectsid();
vinSelectSid.removeAll(Collections.singleton(null));
List<String> vinSids = query.getVinSids();
vinSids.removeAll(Collections.singleton(null));
List<AppCarListVo> list = new ArrayList<>();
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByNoAndVinSids(contractNo);
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
AppCarListVo appCarListVo = new AppCarListVo();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
String vinSid = busSalesOrderVehicle.getLinkSid();
if(!vinSelectSid.isEmpty()){
if(vinSelectSid.contains(vinSid)){
continue;
}
}
if(!vinSids.isEmpty()){
if(vinSids.contains(vinSid)){
appCarListVo.setVinSid(vinSid);
}else{
continue;
}
}else{
appCarListVo.setVinSid(vinSid);
}
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(vinSid,query.getContractNo());
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
//优惠包使用情况
List<BusDeliveredDetailsDiscountsVo> discountList = new ArrayList<>();
List<BusSalesOrderDiscount> busSalesOrderDiscountList = busSalesOrderDiscountService.selectListByContractNo(contractNo);
for (int j = 0; j < busSalesOrderDiscountList.size(); j++) {
BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
BusSalesOrderDiscount orderDiscountVo = busSalesOrderDiscountList.get(j);
busDeliveredDetailsDiscountsVo.setDiscountInfo(orderDiscountVo.getDiscountExplain());
busDeliveredDetailsDiscountsVo.setDiscountSid(orderDiscountVo.getSid());
busDeliveredDetailsDiscountsVo.setDiscountPrice(orderDiscountVo.getPrice());
busDeliveredDetailsDiscountsVo.setDiscountNum(0);
busDeliveredDetailsDiscountsVo.setTotalNum(orderDiscountVo.getNum());
busDeliveredDetailsDiscountsVo.setDiscountName(orderDiscountVo.getName());
discountList.add(busDeliveredDetailsDiscountsVo);
}
appCarListVo.setDiscountUse(discountList);
BusDeliveredUseMessagesVo deliveredUseMessagesVo = new BusDeliveredUseMessagesVo();
deliveredUseMessagesVo.setVin(busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
appCarListVo.setRealBuyer(deliveredUseMessagesVo);
list.add(appCarListVo);
}
return rb.success().setData(list);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -1299,7 +1299,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid());
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
if (trailerList.getData().getList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
View File

@ -92,7 +92,7 @@
contractPath,
topName,
remarks,
buyTypeKey
buyTypeKey,topPrice
FROM bus_sales_order_makeup
where salesOrderSid = #{sid}
</select>

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
View File

@ -107,4 +107,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);
BusSalesOrderVehicle selectByNoAndVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid);
List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
}

26
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml
View File

@ -39,7 +39,8 @@
linkNo as vin,
topSid
from bus_sales_order_vehicle
where salesOrderSid = #{saleOrderSid} and length(linkSid)>0
where salesOrderSid = #{saleOrderSid}
and length(linkSid) > 0
</select>
<select id="selectListBySid" resultType="java.lang.String">
@ -61,21 +62,36 @@
</select>
<select id="selectListBySids" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo">
select sid,linkSid as vinSid,linkNo as vinNo from bus_sales_order_vehicle where salesOrderSid = #{sid}
select sid, linkSid as vinSid, linkNo as vinNo
from bus_sales_order_vehicle
where salesOrderSid = #{sid}
</select>
<update id="updateTemporaryNo">
update bus_sales_order_vehicle set temporaryNo = #{temporaryNo} where sid = #{sid}
update bus_sales_order_vehicle
set temporaryNo = #{temporaryNo}
where sid = #{sid}
</update>
<select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select * from bus_sales_order_vehicle where salesOrderSid = #{salesOrderSid}
select *
from bus_sales_order_vehicle
where salesOrderSid = #{salesOrderSid}
</select>
<select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.*
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
where bo.contractNo = #{contractNo}
and bv.linkSid = #{vinSid}
</select>
<select id="selectByNoAndVinSids"
resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
select bv.*
from bus_delivered bd
left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
where bd.contractNo = #{contractNo} and bd.state = 1 and length(bv.linkSid)>0
</select>
</mapper>

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -226,4 +226,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public BusSalesOrderVehicle selectByNoAndVinSid(String contractNo,String vinSid){
return baseMapper.selectByNoAndVinSid(contractNo,vinSid);
}
public List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo) {
return baseMapper.selectByNoAndVinSids(contractNo);
}
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java
View File

@ -10,13 +10,9 @@ public class AppBillApplicationPageQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("是否欠款开票")
private String isArrears; // 是否欠款开票
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
View File

@ -51,6 +51,8 @@ public class FinBillApplicationQuery implements Query {
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("组织全路径")
private String orgPath; // 组织全路径
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty(value = "销售类型key")

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java
View File

@ -69,5 +69,4 @@ public class FinBillTrailerDto implements Dto {
private String billAppSid; // 开票申请单sid
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
}

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -151,6 +151,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getOrgPath())){
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
query.setUseOrgSid(useOrgSid);
}
qw.ne("fba.billStateKey", "003");
qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
@ -369,6 +373,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
FinBillApplication entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setArrearsMoney("0");
baseMapper.updateById(entity);
}
@ -401,7 +406,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
} else {
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData();
TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(),entity.getContractNo()).getData();
List<TrailerVo> trailerVoList = data.getList();
for (TrailerVo trailerVo : trailerVoList) {
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
@ -1113,11 +1118,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("fba.useOrgSid", useOrgSid);
}
if ("是".equals(pagerQuery.getParams().getIsArrears())) {
qw.eq("fba.billStateKey", "003");
} else {
qw.ne("fba.billStateKey", "003");
}
String name = pagerQuery.getParams().getName();
IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw, name);
List<AppBillApplicationPageVo> records = iPage.getRecords();

5
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
View File

@ -186,6 +186,11 @@ public class FlowableRest implements FlowableFeign {
return rb.setMsg("抄送失败，流程定义不存在！");
}
mfq.setModuleName(process.get("NAME_"));
if(processVariables.containsKey("orderNames")){
mfq.setMsgTitle(processVariables.get("orderNames").toString());
}else{
mfq.setMsgTitle(process.get("NAME_"));
}
mfq.setMsgTitle(process.get("NAME_"));
mfq.setUserSids(userSids.toString());
ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);

7
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
View File

@ -150,15 +150,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ACT_RE_PROCDEF arpd ON ahpi.PROC_DEF_ID_ = arpd.ID_
LEFT JOIN sys_form_link sfl ON ahpi.PROC_INST_ID_ = sfl.procInsId
<where>
<if test="proDefName != null and proDefName != ''">
<!--<if test="proDefName != null and proDefName != ''">
AND arpd.NAME_ LIKE concat('%',#{proDefName},'%')
</if>
</if>-->
<if test="startDate != null and startDate != ''">
AND ahpi.START_TIME_ <![CDATA[ >= ]]> #{startDate}
</if>
<if test="endDate != null and endDate != ''">
AND ahpi.START_TIME_ <![CDATA[ <= ]]> #{endDate}
</if>
<if test="names != null and names != ''">
and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%'))
</if>
</where>
) flow
GROUP BY flow.PROC_INST_ID_

68
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -500,6 +500,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(StringUtils.isNotBlank(orgPath)){
// or.taskVariableValueLike("orgPath", "%" + orgPath + "%");
}
if(StringUtils.isNotBlank(names)){
or.or();
or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
or.endOr();
}
//.taskCandidateGroupIn(roleSidList)
or.taskAssigneeLike("%" + userSid + "%")
.orderByTaskCreateTime().desc();
@ -510,13 +515,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (paramMap.get("endDate") != null && StringUtils.isNotBlank(paramMap.get("endDate").toString())) {
taskQuery.taskCreatedBefore(DateUtils.dateStrConvertDate(paramMap.get("endDate").toString(), "yyyy-MM-dd"));
}
if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
/*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
}
/* page.setTotal(taskQuery.count());
int p = (pageNum - 1) * pageSize;*/
// List<Task> taskList = taskQuery.listPage(p, pageSize);
List<Task> taskList = taskQuery.list();
}*/
page.setTotal(taskQuery.count());
int p = (pageNum - 1) * pageSize;
List<Task> taskList = taskQuery.listPage(p, pageSize);
// List<Task> taskList = taskQuery.list();
List<FlowTaskDto> flowList = new ArrayList<>();
for (Task task : taskList) {
FlowTaskDto flowTask = new FlowTaskDto();
@ -578,7 +583,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowList.add(flowTask);
}
//筛选发起人==============================
if (StringUtils.isNotBlank(startUserNameParams)) {
/*if (StringUtils.isNotBlank(startUserNameParams)) {
String finalStartUserNameParams = startUserNameParams;
flowList = flowList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
@ -588,7 +593,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
page.setTotal(flowList.size());
flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
collect(Collectors.toList());*/
page.setRecords(flowList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
@ -716,18 +721,19 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
ll.add(mapss);
//查询条件发起人
if("startUserName".equals(btq.getField())){
/* if("startUserName".equals(btq.getField())){
paraMap.remove("startUserName");
startUserNameParams = btq.getValue();
}
if("proDefName".equals(btq.getField())){
names = btq.getValue();
}
paraMap.put("names",names);
}*/
}
paraMap.put("userSid", userSid);
paraMap.put("list", ll);
/* paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);*/
paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);
List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
int count = baseMapper.finishedListCount(paraMap);
List<FlowTaskDto> hisTaskList = new ArrayList();
@ -816,7 +822,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
hisTaskList.add(flowTask);
}
//对hisTaskList进行筛选发起人
if (StringUtils.isNotBlank(startUserNameParams)) {
/* if (StringUtils.isNotBlank(startUserNameParams)) {
String finalStartUserNameParams = startUserNameParams;
hisTaskList = hisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
}
@ -826,8 +832,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
page.setTotal(hisTaskList.size());
hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
// page.setTotal(count);
collect(Collectors.toList());*/
page.setTotal(count);
page.setRecords(hisTaskList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
@ -860,14 +866,15 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
ll.add(mapss);
if("proDefName".equals(btq.getField())){
names = btq.getValue();
paraMap.put("names",names);
paraMap.remove("proDefName");
}
}
paraMap.put("userSid", userSid);
paraMap.put("list", ll);
/* paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);*/
paraMap.put("page", (pageNum - 1) * pageSize);
paraMap.put("size", pageSize);
List<Map<String, Object>> maps = baseMapper.finishedList1(paraMap);
int count = baseMapper.finishedListCount(paraMap);
List<FlowTaskDto> hisTaskList = new ArrayList();
@ -963,7 +970,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
List<FlowTaskDto> userHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(hisTaskList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
//对hisTaskList进行筛选发起人
if (StringUtils.isNotBlank(names)) {
/* if (StringUtils.isNotBlank(names)) {
String finalStartUserNameParams = names;
userHisTaskList = userHisTaskList.stream().filter(v -> v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList());
namesHisTaskList = namesHisTaskList.stream().filter(v -> v.getProcDefName().contains(finalStartUserNameParams)).collect(Collectors.toList());
@ -974,9 +981,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
page.setTotal(finallyList.size());
finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
// page.setTotal(count);
// page.setRecords(hisTaskList);
page.setRecords(finallyList);
page.setRecords(finallyList);*/
page.setTotal(count);
page.setRecords(hisTaskList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
}
@ -1989,7 +1997,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
if("proDefName".equals(btq.getField())){
names = btq.getValue();
paramMap.remove("proDefName");
}
}
TaskQuery or = taskQuery.active()
@ -1997,6 +2004,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
;
if(StringUtils.isNotBlank(orgPath)){
/* or.taskVariableValueLike("orgPath", "%" + orgPath + "%");*/
}
if(StringUtils.isNotBlank(names)){
or.or();
or.taskVariableValueLike("orderNames", "%" + names + "%").processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
or.endOr();
}
or.taskAssigneeLike("%" + userSid + "%")
.orderByTaskCreateTime().desc();
@ -2010,10 +2022,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
/*if (paramMap.get("proDefName") != null && StringUtils.isNotBlank(paramMap.get("proDefName").toString())) {
taskQuery.processDefinitionNameLike("%" + paramMap.get("proDefName") + "%");
}*/
/* page.setTotal(taskQuery.count());
page.setTotal(taskQuery.count());
int p = (pageNum - 1) * pageSize;
List<Task> taskList = taskQuery.listPage(p, pageSize);*/
List<Task> taskList = taskQuery.list();
List<Task> taskList = taskQuery.listPage(p, pageSize);
// List<Task> taskList = taskQuery.list();
List<FlowTaskDto> flowList = new ArrayList<>();
for (Task task : taskList) {
FlowTaskDto flowTask = new FlowTaskDto();
@ -2081,7 +2093,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowList.add(flowTask);
}
//对flowList进行筛选发起人======================
List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
/*List<FlowTaskDto> userHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
List<FlowTaskDto> namesHisTaskList = Optional.ofNullable(flowList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDto.class)).collect(Collectors.toList());
if (StringUtils.isNotBlank(names)) {
String finalStartUserNameParams = names;
@ -2093,8 +2105,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
finallyList.addAll(userHisTaskList);
page.setTotal(finallyList.size());
finallyList = finallyList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).
collect(Collectors.toList());
page.setRecords(finallyList);
collect(Collectors.toList());*/
page.setRecords(flowList);
ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
return rb.success().setData(page);
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java
View File

@ -146,4 +146,12 @@ public class ScmApplyInbound extends BaseEntity {
@ApiModelProperty("申请人组织路径")
private String orgSidPath; // 申请人组织路径
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("价格")
private String price; // 价格
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java
View File

@ -161,6 +161,11 @@ public class ScmApplyInboundDto implements Dto {
private String pcApplicationCode;
@ApiModelProperty("部门sid")
private String orgSid;
@ApiModelProperty("销售指导价")
private String guidedPrice; // 销售指导价
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
@ApiModelProperty("车辆列表")
private List<ScmApplyInboundVehicleDto> vehicleList;

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
View File

@ -162,5 +162,8 @@ public class ScmApplyInboundVo implements Vo {
private String configSid;
@ApiModelProperty("部门sid")
private String orgSid;
@ApiModelProperty("全款/贷款销售指导价")
private String guidedPrice; // 全款/贷款销售指导价
@ApiModelProperty("最新更新时间")
private String newUpdateDate; // 最新更新时间
}

19
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -21,6 +21,8 @@ import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDetailsVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
@ -141,6 +143,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private ScmApplyInboundQueryService scmApplyInboundQueryService;
@Autowired
private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
ScmApplyInboundQuery query = pq.getParams();
@ -221,6 +225,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
inboundVehicle.setApplicationCode(billNo);
inboundVehicle.setSid(UUID.randomUUID().toString());
inboundVehicle.setOrgSidPath(orgPath);
inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
save(inboundVehicle);
String num = dto.getNum();
if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@ -291,6 +296,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ScmApplyInbound scmApplyInbound = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, scmApplyInbound);
scmApplyInbound.setOrgSidPath(dto.getOrgPath());
scmApplyInbound.setNewUpdateDate(DateUtil.formatDate(new Date()));
updateById(scmApplyInbound);
scmFileService.delByMainSid(dto.getSid());
if (scmFiles.size() > 0) {
@ -321,6 +327,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
ScmApplyInboundVo vo = new ScmApplyInboundVo();
ScmApplyInbound scmApplyInbound = fetchBySid(sid);
BeanUtil.copyProperties(scmApplyInbound, vo);
String modelSid = scmApplyInbound.getModelSid();
String configSid = scmApplyInbound.getConfigSid();
String useOrgSid = scmApplyInbound.getUseOrgSid();
BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigFeign.selectOne(modelSid, configSid, useOrgSid).getData();
String guidedPrice = baseVehmodelVo.getGuidedPrice();
String manufactorSettlementPrice = baseVehmodelVo.getManufactorSettlementPrice();
vo.setGuidedPrice(guidedPrice + "/" + manufactorSettlementPrice);
vo.setNewUpdateDate(DateUtil.formatDate(baseVehmodelVo.getModifyTime()));
List<ScmApplyInboundVehicleVo> list = scmApplyInboundVehicleService.selectListByAppSid(sid);
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
for (ScmFileVo scmFileVo : scmFileVos) {
@ -400,6 +414,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
public ResultBean submitRecordApplication(SubmitScmApplyInboundDto dto) {
String busSid = dto.getSid();
String num = dto.getNum();
String guidedPrice = dto.getGuidedPrice();
String[] split = guidedPrice.split("/");
if (split.length < 2){
return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可提交");
}
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
ScmApplyInbound scmApplyInbound1 = fetchBySid(busSid);
if (StringUtils.isBlank(busSid)) {

19
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
View File

@ -72,9 +72,14 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额(元)" header-align="center" width="200">
<el-table-column label="调整后全款销售指导价(元)" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
<el-input v-model="scope.row.tzhGuidedPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="调整后贷款销售指导价(元)" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.tzhManufactorSettlementPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
@ -141,11 +146,8 @@ export default {
this.formobj.createTime = year + '-' + month + '-' + day
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符
e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个-
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
e.target.value = parseFloat(e.target.value)
@ -200,7 +202,8 @@ export default {
configName: e.configName,
costPrice: '',
guidedPrice: e.guidedPrice,
incOrDecInPrice: '',
tzhGuidedPrice: '',
tzhManufactorSettlementPrice: '',
manufactorSettlementPrice: e.manufactorSettlementPrice,
remarks: ''
})

9
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
View File

@ -61,9 +61,14 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额(元)" align="center" width="150">
<el-table-column label="调整后全款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
<span>{{ scope.row.tzhGuidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="调整后贷款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.tzhManufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">

9
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
View File

@ -61,9 +61,14 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额(元)" align="center" width="150">
<el-table-column label="调整后全款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
<span>{{ scope.row.tzhGuidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="调整后贷款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.tzhManufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">

19
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
View File

@ -71,9 +71,14 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额(元)" header-align="center" width="200">
<el-table-column label="调整后全款销售指导价(元)" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
<el-input v-model="scope.row.tzhGuidedPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="调整后贷款销售指导价(元)" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.tzhManufactorSettlementPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
@ -143,11 +148,8 @@ export default {
},
methods: {
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符
e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个-
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
e.target.value = parseFloat(e.target.value)
@ -198,7 +200,8 @@ export default {
configName: e.configName,
costPrice: '',
guidedPrice: e.guidedPrice,
incOrDecInPrice: '',
tzhGuidedPrice: '',
tzhManufactorSettlementPrice: '',
manufactorSettlementPrice: e.manufactorSettlementPrice,
remarks: ''
})

9
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
View File

@ -59,9 +59,14 @@
<span>{{ scope.row.manufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额(元)" align="center" width="150">
<el-table-column label="调整后全款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
<span>{{ scope.row.tzhGuidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="调整后贷款销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.tzhManufactorSettlementPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">

2
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -9,7 +9,7 @@
<div class="searchcon">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-form-item label="工作名称">
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">

8
anrui-system-ui/src/views/flow/havereadList.vue
View File

@ -8,9 +8,12 @@
<div class="searchcon">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-form-item label="工作名称">
<el-input v-model="listQuery.params.names" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">
<el-input v-model="listQuery.params.startUserName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发送日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" placeholder="选择日期" clearable value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
<span style="padding: 0 8px">至</span>
@ -166,7 +169,8 @@ export default {
createEndTime: '',
userSid: '',
state: '1', // 0是待阅,1是已阅
orgPath: ''
orgPath: '',
startUserName: ''
}
}
}

8
anrui-system-ui/src/views/flow/tobereadList.vue
View File

@ -8,9 +8,12 @@
<div class="searchcon">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-form-item label="工作名称">
<el-input v-model="listQuery.params.names" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="流程名称">
<el-input v-model="listQuery.params.startUserName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发送日期">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" placeholder="选择日期" clearable value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
<span style="padding: 0 8px">至</span>
@ -156,7 +159,8 @@ export default {
createEndTime: '',
userSid: '',
state: '0', // 0是待阅,1是已阅
orgPath: ''
orgPath: '',
startUserName: ''
}
}
}

2
anrui-system-ui/src/views/flow/todoList.vue
View File

@ -9,7 +9,7 @@
<div class="searchcon">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-form-item label="工作名称">
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
</el-form-item>
<el-form-item label="发起人">

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
View File

@ -63,6 +63,8 @@ public class BillApplicationIInfoDto implements Dto {
private String orgPath;
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")

11
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
View File

@ -55,14 +55,10 @@ public class BillApplicationIInfoVo implements Vo {
private List<String> registerContractImages;
@ApiModelProperty("确认书")
private List<String> invoiceApplyConfirmImages;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("合同编号")
@ -71,4 +67,11 @@ public class BillApplicationIInfoVo implements Vo {
private String billNo; // 单据编号
@ApiModelProperty("是否可以编辑开票价")
private Boolean isCanEdit; // 是否可以编辑开票价
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实列id")
private String procInsId;
@ApiModelProperty("流程状态")
private String nodeState;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java
View File

@ -14,8 +14,6 @@ public class BillApplicationPageQuery implements Query {
private String userSid;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("是否欠款开票")
private String isArrears;
@ApiModelProperty("组织全路径")
private String orgPath;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageVo.java
View File

@ -9,6 +9,9 @@ import lombok.Data;
public class BillApplicationPageVo implements Vo {
private static final long serialVersionUID = -6197889357871997515L;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String contractSid;

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java
View File

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-fin(开票挂车信息) <br/>
* File: FinBillTrailerDto.java <br/>
@ -68,5 +70,6 @@ public class FinBillTrailerDto implements Dto {
private String billAppSid; // 开票申请单sid
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("合格证图片")
private List<String> files;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
View File

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-fin(开票挂车信息) <br/>
* File: FinBillTrailerVo.java <br/>
@ -62,5 +64,6 @@ public class FinBillTrailerVo implements Vo {
private String billAppSid; // 开票申请单sid
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("合格证图片")
private List<String> files;
}

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
View File

@ -133,8 +133,13 @@ public interface AppBusDeliveredApplyFeign {
@ResponseBody
ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query);
@ApiOperation("主车的挂车信息")
@ApiOperation("主车的挂车信息/上装信息")
@GetMapping("/tralieredDetailsList")
@ResponseBody
ResultBean<DeliveredTralierVo> tralieredDetailsList(@RequestParam("vinSid") String vinSid);
ResultBean<DeliveredTralierVo> tralieredDetailsList(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo")String contractNo);
@ApiOperation("待补充车辆")
@GetMapping("/appendRetrievalCars")
@ResponseBody
public ResultBean<List<CarListVo>> appendRetrievalCars(@SpringQueryMap DeliveredDetailssQuery query);
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
View File

@ -124,7 +124,12 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
}
@Override
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid) {
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid,String contractNo) {
return null;
}
@Override
public ResultBean<List<CarListVo>> appendRetrievalCars(DeliveredDetailssQuery query) {
return null;
}
}

22
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredDetailssQuery.java
View File

@ -0,0 +1,22 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/4/18 11:50
* @Description
*/
@Data
public class DeliveredDetailssQuery {
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("当前申请页面已选车辆的sid:app需要排除")
private List<String> vinSelectsid = new ArrayList<>();
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredTralierVo.java
View File

@ -3,6 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
@ -15,6 +16,9 @@ public class DeliveredTralierVo {
@ApiModelProperty("车型信息")
private List<ConfigVo> modeInfo;
@ApiModelProperty("挂车列表信息")
private List<List<ConfigVo>> handCarInfo;
@ApiModelProperty("挂车/上装列表信息")
private List<List<ConfigVo>> handCarInfo = new ArrayList<>();
private List<String> titles = new ArrayList<>();
}

74
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
View File

@ -66,12 +66,36 @@ public class InvoicedService {
public ResultBean<PagerVo<BillApplicationPageVo>> getInvoicedApplyList(PagerQuery<BillApplicationPageQuery> pagerQuery) {
ResultBean<PagerVo<BillApplicationPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppBillApplicationPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppBillApplicationPageVo>> resultBean = finBillApplicationFeign.getInvoicedApplyList(pq);
List<BillApplicationPageVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BillApplicationPageVo.class)).collect(Collectors.toList());
BillApplicationPageQuery params = pagerQuery.getParams();
FinBillApplicationQuery finBillApplicationQuery = new FinBillApplicationQuery();
finBillApplicationQuery.setCreateBySid(params.getUserSid());
finBillApplicationQuery.setCustomerName(params.getName());
finBillApplicationQuery.setOrgPath(params.getOrgPath());
PagerQuery<FinBillApplicationQuery> pcq = new PagerQuery<>();
pcq.setParams(finBillApplicationQuery);
ResultBean<PagerVo<FinBillApplicationVo>> resultBean = finBillApplicationFeign.listPage(pcq);
List<FinBillApplicationVo> records = resultBean.getData().getRecords();
List<BillApplicationPageVo> billApplicationPageVos = new ArrayList<>();
PagerVo<BillApplicationPageVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
for (FinBillApplicationVo record : records) {
BillApplicationPageVo billApplicationPageVo = new BillApplicationPageVo();
billApplicationPageVo.setSaleType(record.getSaleTypeValue());
billApplicationPageVo.setBillUnit(record.getOpenTickUnitName());
billApplicationPageVo.setCustomerName(record.getCustomerName());
billApplicationPageVo.setModel(record.getModelName());
billApplicationPageVo.setApplyName(record.getCreateByName());
billApplicationPageVo.setApplyDate(record.getApplyDate());
billApplicationPageVo.setNum(record.getNum().toString());
billApplicationPageVo.setContractNo(record.getContractNo());
billApplicationPageVo.setSid(record.getSid());
if (record.getNodeState().equals("待提交") || record.getNodeState().equals("发起申请")){
billApplicationPageVo.setShowUpData(true);
}else {
billApplicationPageVo.setShowUpData(false);
}
billApplicationPageVos.add(billApplicationPageVo);
}
v.setRecords(billApplicationPageVos);
return rb.success().setData(v);
}
@ -84,6 +108,21 @@ public class InvoicedService {
}
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
vo.setSellerName(finBillApplicationDetailsVo.getStaffName());
vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName());
vo.setName(finBillApplicationDetailsVo.getCustomerName());
vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
vo.setOpenTickTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
vo.setOpenTickTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName());
vo.setInvoiceStateKey(finBillApplicationDetailsVo.getBillStateKey());
vo.setInvoiceState(finBillApplicationDetailsVo.getBillStateValue());
vo.setContractId(finBillApplicationDetailsVo.getContractNo());
vo.setDate(finBillApplicationDetailsVo.getApplyDate());
vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
//车辆信息
@ -108,6 +147,10 @@ public class InvoicedService {
for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
String hgzImageUrl = finBillTrailer.getHgzImageUrl();
List<String> files = new ArrayList<>();
files.add(hgzImageUrl);
finBillTrailerVo.setFiles(files);
finBillTrailerVos.add(finBillTrailerVo);
}
}
@ -140,7 +183,6 @@ public class InvoicedService {
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}else {
vo.setIsCanEdit(true);
vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney());
}
return rb.success().setData(vo);
}
@ -148,7 +190,27 @@ public class InvoicedService {
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
finBillApplicationDto.setUseOrgSid(useOrgSid);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey());
finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
finBillApplicationDto.setBillStateKey(dto.getInvoiceStateKey());
finBillApplicationDto.setBillStateValue(dto.getInvoiceState());
finBillApplicationDto.setContractNo(dto.getContractId());
finBillApplicationDto.setApplyDate(dto.getDate());
finBillApplicationDto.setCreateBySid(dto.getUserSid());
finBillApplicationDto.setNodeState(dto.getNodeState());
finBillApplicationDto.setBillNo(dto.getBillNo());
String publishInfo = dto.getPublishInfo();
finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-")));
finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-")));

9
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
View File

@ -132,7 +132,12 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
}
@Override
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid) {
return appBusDeliveredApplyService.tralieredDetailsList(vinSid);
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid,String contractNo) {
return appBusDeliveredApplyService.tralieredDetailsList(vinSid,contractNo);
}
@Override
public ResultBean<List<CarListVo>> appendRetrievalCars(DeliveredDetailssQuery query) {
return appBusDeliveredApplyService.appendRetrievalCars(query);
}
}

310
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java
View File

@ -30,8 +30,10 @@ import com.alibaba.fastjson.JSON;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basetrailer.TrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodelDetailsVo;
import com.yxt.anrui.buscenter.api.busdelivered.*;
import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -266,149 +268,200 @@ public class AppBusDeliveredApplyService {
return rb.success().setData(data);
}
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid) {
public ResultBean<DeliveredTralierVo> tralieredDetailsList(String vinSid, String contractNo) {
ResultBean<DeliveredTralierVo> rb = ResultBean.fireFail();
DeliveredTralierVo deliveredTralierVo = new DeliveredTralierVo();
ResultBean<TraliveredVo> resultBean = baseTrailerFeign.trailerList(vinSid);
ResultBean<TraliveredVo> resultBean = baseTrailerFeign.trailerList(vinSid, contractNo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
TraliveredVo traliveredVo = resultBean.getData();
//车型信息
List<ConfigVo> modelInfo = new ArrayList<>();
//挂车/上装列表的拼接list
List<List<ConfigVo>> handCarInfo = new ArrayList<>();
List<String> titles = new ArrayList<>();
String vinNo = traliveredVo.getVinNo();
modelInfo.add(getConfigValueSpanSize("主车车架号", vinNo, 2));
String modelName = traliveredVo.getModelName();
modelInfo.add(getConfigValueSpanSize("车型", modelName, 2));
deliveredTralierVo.setModeInfo(modelInfo);
List<TrailerVo> list = traliveredVo.getList();
for (int i = 0; i < list.size(); i++) {
TrailerVo trailerVo = list.get(i);
List<ConfigVo> configVoList = new ArrayList<>();
//挂车车架号
String trailerVinNo = trailerVo.getTrailerVinNo();
configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1));
//成交价
String dealPrice = trailerVo.getDealPrice();
configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1));
//车辆品牌
String brandName = trailerVo.getBrandName();
configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1));
//车辆型号
String carModelName = trailerVo.getCarModelName();
configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1));
//生产厂商名称
String manufacturerName = trailerVo.getManufacturerName();
configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2));
//挂车类型
String trailerTypeValue = trailerVo.getTrailerTypeValue();
List<BaseVehinstallmodelDetailsVo> vehillModelList = traliveredVo.getVehillModelList();
if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
String title = "挂车" + i + 1;
titles.add(title);
TrailerVo trailerVo = list.get(i);
List<ConfigVo> configVoList = new ArrayList<>();
//挂车车架号
String trailerVinNo = trailerVo.getTrailerVinNo();
configVoList.add(getConfigValueSpanSize("车架号", trailerVinNo, 1));
//成交价
String dealPrice = trailerVo.getDealPrice();
configVoList.add(getConfigValueSpanSize("成交价", dealPrice, 1));
//车辆品牌
String brandName = trailerVo.getBrandName();
configVoList.add(getConfigValueSpanSize("车辆品牌", brandName, 1));
//车辆型号
String carModelName = trailerVo.getCarModelName();
configVoList.add(getConfigValueSpanSize("车辆型号", carModelName, 1));
//生产厂商名称
String manufacturerName = trailerVo.getManufacturerName();
configVoList.add(getConfigValueSpanSize("生产厂商名称", manufacturerName, 2));
//挂车类型
String trailerTypeValue = trailerVo.getTrailerTypeValue();
configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2));
//外观尺寸
String appearanceSizeAll = "";
String appearanceSizeLong = trailerVo.getAppearanceSizeLong();
if (StringUtils.isNotBlank(appearanceSizeLong)) {
appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,";
}else{
appearanceSizeAll = appearanceSizeAll + "长 mm,";
}
String appearanceSizeWide = trailerVo.getAppearanceSizeWide();
if (StringUtils.isNotBlank(appearanceSizeWide)) {
appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,";
}else{
appearanceSizeAll = appearanceSizeAll + "宽 mm,";
}
//高
String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh();
if (StringUtils.isNotBlank(appearanceSizeHigh)) {
appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,";
}else{
appearanceSizeAll = appearanceSizeAll + "高 mm,";
}
//总高
String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh();
if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) {
appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh+"mm";
}else{
appearanceSizeAll = appearanceSizeAll + "总高 mm";
}
//外观尺寸
configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2));
//内部尺寸
String insideSizeAll = "";
String insideSizeLong = trailerVo.getInsideSizeLong();
if (StringUtils.isNotBlank(insideSizeLong)) {
insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,";
} else {
insideSizeAll = insideSizeAll + "长 mm,";
}
String insideSizeWide = trailerVo.getInsideSizeWide();
if (StringUtils.isNotBlank(insideSizeWide)) {
insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,";
} else {
insideSizeAll = insideSizeAll + "宽 mm,";
}
String insideSizeHigh = trailerVo.getInsideSizeHigh();
if (StringUtils.isNotBlank(insideSizeHigh)) {
insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm";
} else {
insideSizeAll = insideSizeAll + "高 mm";
}
configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2));
String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh();
configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2));
//大梁尺寸
String girderSizeAll = "";
String girderSizeHigh = trailerVo.getGirderSizeHigh();
if (StringUtils.isNotBlank(girderSizeHigh)) {
girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,";
}else{
girderSizeAll = girderSizeAll + "高度 mm,";
}
String girderSizeWide = trailerVo.getGirderSizeWide();
if (StringUtils.isNotBlank(girderSizeWide)) {
girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,";
}else{
girderSizeAll = girderSizeAll + "宽度 mm,";
}
String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate();
if (StringUtils.isNotBlank(girderSizeStandPlate)) {
girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm";
}else{
girderSizeAll = girderSizeAll + "立板 mm";
configVoList.add(getConfigValueSpanSize("挂车类型", trailerTypeValue, 2));
//外观尺寸
String appearanceSizeAll = "";
String appearanceSizeLong = trailerVo.getAppearanceSizeLong();
if (StringUtils.isNotBlank(appearanceSizeLong)) {
appearanceSizeAll = appearanceSizeAll + "长 " + appearanceSizeLong + "mm,";
} else {
appearanceSizeAll = appearanceSizeAll + "长 mm,";
}
String appearanceSizeWide = trailerVo.getAppearanceSizeWide();
if (StringUtils.isNotBlank(appearanceSizeWide)) {
appearanceSizeAll = appearanceSizeAll + "宽 " + appearanceSizeWide + "mm,";
} else {
appearanceSizeAll = appearanceSizeAll + "宽 mm,";
}
//高
String appearanceSizeHigh = trailerVo.getAppearanceSizeHigh();
if (StringUtils.isNotBlank(appearanceSizeHigh)) {
appearanceSizeAll = appearanceSizeAll + "高 " + appearanceSizeHigh + "mm,";
} else {
appearanceSizeAll = appearanceSizeAll + "高 mm,";
}
//总高
String appearanceSizeTotalHigh = trailerVo.getAppearanceSizeTotalHigh();
if (StringUtils.isNotBlank(appearanceSizeTotalHigh)) {
appearanceSizeAll = appearanceSizeAll + "总高" + appearanceSizeTotalHigh + "mm";
} else {
appearanceSizeAll = appearanceSizeAll + "总高 mm";
}
//外观尺寸
configVoList.add(getConfigValueSpanSize("外观尺寸", appearanceSizeAll, 2));
//内部尺寸
String insideSizeAll = "";
String insideSizeLong = trailerVo.getInsideSizeLong();
if (StringUtils.isNotBlank(insideSizeLong)) {
insideSizeAll = insideSizeAll + "长 " + insideSizeLong + "mm,";
} else {
insideSizeAll = insideSizeAll + "长 mm,";
}
String insideSizeWide = trailerVo.getInsideSizeWide();
if (StringUtils.isNotBlank(insideSizeWide)) {
insideSizeAll = insideSizeAll + "宽 " + insideSizeWide + "mm,";
} else {
insideSizeAll = insideSizeAll + "宽 mm,";
}
String insideSizeHigh = trailerVo.getInsideSizeHigh();
if (StringUtils.isNotBlank(insideSizeHigh)) {
insideSizeAll = insideSizeAll + "高 " + insideSizeHigh + "mm";
} else {
insideSizeAll = insideSizeAll + "高 mm";
}
configVoList.add(getConfigValueSpanSize("内部尺寸", insideSizeAll, 2));
String saddleLeaveLandHigh = trailerVo.getSaddleLeaveLandHigh();
configVoList.add(getConfigValueSpanSize("鞍座离地高度", saddleLeaveLandHigh, 2));
//大梁尺寸
String girderSizeAll = "";
String girderSizeHigh = trailerVo.getGirderSizeHigh();
if (StringUtils.isNotBlank(girderSizeHigh)) {
girderSizeAll = girderSizeAll + "高度 " + girderSizeHigh + "mm,";
} else {
girderSizeAll = girderSizeAll + "高度 mm,";
}
String girderSizeWide = trailerVo.getGirderSizeWide();
if (StringUtils.isNotBlank(girderSizeWide)) {
girderSizeAll = girderSizeAll + "宽度 " + girderSizeWide + "mm,";
} else {
girderSizeAll = girderSizeAll + "宽度 mm,";
}
String girderSizeStandPlate = trailerVo.getGirderSizeStandPlate();
if (StringUtils.isNotBlank(girderSizeStandPlate)) {
girderSizeAll = girderSizeAll + "立板 " + girderSizeStandPlate + "mm";
} else {
girderSizeAll = girderSizeAll + "立板 mm";
}
configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2));
//牵引销
String towPin = trailerVo.getTowPin();
configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2));
//板簧
String plateSpring = trailerVo.getPlateSpring();
configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2));
//车桥
String axle = trailerVo.getAxle();
configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2));
//轮胎及钢圈
String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle();
configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2));
//底板
String floorSize = trailerVo.getFloorSize();
if (StringUtils.isNotBlank(floorSize)) {
configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
} else {
configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2));
}
//门扇要求
String doorFanRequirement = trailerVo.getDoorFanRequirement();
configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1));
//箱体颜色
String boxColor = trailerVo.getBoxColor();
configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1));
//更多配置
String moreConfig = trailerVo.getMoreConfig();
configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2));
handCarInfo.add(configVoList);
}
configVoList.add(getConfigValueSpanSize("大梁尺寸", girderSizeAll, 2));
//牵引销
String towPin = trailerVo.getTowPin();
configVoList.add(getConfigValueSpanSize("牵引销(底盘)", towPin, 2));
//板簧
String plateSpring = trailerVo.getPlateSpring();
configVoList.add(getConfigValueSpanSize("板簧(底盘)", plateSpring, 2));
//车桥
String axle = trailerVo.getAxle();
configVoList.add(getConfigValueSpanSize("车桥(底盘)", axle, 2));
//轮胎及钢圈
String tyreAndSteelCircle = trailerVo.getTyreAndSteelCircle();
configVoList.add(getConfigValueSpanSize("轮胎及钢圈(底盘)", tyreAndSteelCircle, 2));
//底板
String floorSize = trailerVo.getFloorSize();
if(StringUtils.isNotBlank(floorSize)){
configVoList.add(getConfigValueSpanSize("底板(底盘)", floorSize + "mm", 2));
}else{
configVoList.add(getConfigValueSpanSize("底板(底盘)", " mm", 2));
}
if (!vehillModelList.isEmpty()) {
for (int i = 0; i < vehillModelList.size(); i++) {
String title = "上装" + i + 1;
titles.add(title);
BaseVehinstallmodelDetailsVo baseVehinstallmodelDetailsVo = vehillModelList.get(i);
List<ConfigVo> configVoList = new ArrayList<>();
//成交价2个格
String topPrice = baseVehinstallmodelDetailsVo.getTopPrice();
configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2));
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
//外廓尺寸
configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1));
//颜色
configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1));
//板材材质
configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1));
//板材厚度
configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1));
//篷布滑道
configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1));
//冷藏冷机
configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1));
//自卸液压盖版
configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1));
//底板加热
configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1));
//更多配置2个格
configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2));
handCarInfo.add(configVoList);
}
//门扇要求
String doorFanRequirement = trailerVo.getDoorFanRequirement();
configVoList.add(getConfigValueSpanSize("门扇要求", doorFanRequirement, 1));
//箱体颜色
String boxColor = trailerVo.getBoxColor();
configVoList.add(getConfigValueSpanSize("箱体颜色", boxColor, 1));
//更多配置
String moreConfig = trailerVo.getMoreConfig();
configVoList.add(getConfigValueSpanSize("更多配置", moreConfig, 2));
handCarInfo.add(configVoList);
}
deliveredTralierVo.setHandCarInfo(handCarInfo);
return rb.success().setData(deliveredTralierVo);
}
@ -424,4 +477,13 @@ public class AppBusDeliveredApplyService {
}
return configInfoSpanSize;
}
public ResultBean<List<CarListVo>> appendRetrievalCars(DeliveredDetailssQuery query) {
ResultBean<List<CarListVo>> rb = ResultBean.fireFail();
DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery();
BeanUtil.copyProperties(query, deliverDetailsQuery);
ResultBean<List<AppCarListVo>> selectInfo = busDeliveredFeign.selectInfo(deliverDetailsQuery);
List<CarListVo> voList = Optional.ofNullable(selectInfo.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CarListVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
}
Write Preview
Loading…
Cancel
Save