diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java index 7663b488c5..e35ce10bf5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java @@ -41,4 +41,7 @@ public class BaseVehicleActualSales extends BaseEntity { private String carBrandSid; @ApiModelProperty(value = "品牌名称") private String carBrandName; + + @ApiModelProperty("申请人的所在部门sid全路径") + private String orgSidPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java index 6d2c236153..a2bb9bb24d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java @@ -54,4 +54,6 @@ public class BaseVehicleActualSalesDto implements Dto { private String carBrandSid; @ApiModelProperty(value = "品牌名称") private String carBrandName; + + private String orgSidPath; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java new file mode 100644 index 0000000000..798951e509 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.basevehiclecertificate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppHandoverCertificateInfoVo implements Vo { + private static final long serialVersionUID = 5182269192194137775L; + + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("车辆sid") + private String carSid; + @ApiModelProperty("") + private String invoice; + @ApiModelProperty("合格证日期") + private String date; + @ApiModelProperty("合格证附件") + private List invoiceImages; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java index 9a07b4412e..2759b9e125 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java @@ -125,4 +125,9 @@ public interface BaseVehicleCertificateFeign { @PostMapping("/updateCertificate") @ResponseBody ResultBean updateCertificate(@RequestBody CertificateDto dto); + + @ApiOperation("交车准备获取合格证信息") + @GetMapping("/getCertificateInfo/{vinNo}/{userSid}") + @ResponseBody + ResultBean getCertificateInfo(@PathVariable("vinNo") String vinNo, @PathVariable("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java index 3a96b7ea2c..b4e96033c5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java @@ -77,4 +77,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica return null; } + @Override + public ResultBean getCertificateInfo(String vinNo, String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java index 33a74ea651..055421ca6f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java @@ -50,11 +50,19 @@ import lombok.Data; public class BaseVehicleTempstate extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("数据字典项key,如移位申请中 001 状态") - private String tempStateKey; // 数据字典项key,如移位申请中 001 状态 - @ApiModelProperty("业务sid") - private String busSid; // 业务sid + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateValue; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateKey; + @ApiModelProperty("业务状态key") + private String tempKey; + @ApiModelProperty("业务状态value") + private String tempValue; + @ApiModelProperty("业务sid") + private String busSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java index 53e8228cd4..c9fd98063c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java @@ -49,13 +49,19 @@ import lombok.Data; @ApiModel(value = "车辆临时状态表 视图数据详情", description = "车辆临时状态表 视图数据详情") public class BaseVehicleTempstateDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("车辆sid") - private String vehSid; // 车辆sid - @ApiModelProperty("数据字典项key,如移位申请中 001 状态") - private String tempStateKey; // 数据字典项key,如移位申请中 001 状态 - @ApiModelProperty("业务sid") - private String busSid; // 业务sid + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateValue; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateKey; + @ApiModelProperty("业务状态key") + private String tempKey; + @ApiModelProperty("业务状态value") + private String tempValue; + @ApiModelProperty("业务sid") + private String busSid; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java index 5da41e79fa..29c007a855 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java @@ -54,8 +54,16 @@ public class BaseVehicleTempstateDto implements Dto { @ApiModelProperty("车辆sid") private String vehSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateValue; @ApiModelProperty("数据字典项key,如移位申请中 001 状态") private String tempStateKey; + @ApiModelProperty("业务状态key") + private String tempKey; + @ApiModelProperty("业务状态value") + private String tempValue; @ApiModelProperty("业务sid") private String busSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java index c3f5c33b99..b0291d882b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java @@ -49,12 +49,18 @@ import lombok.Data; @ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象") public class BaseVehicleTempstateVo implements Vo { - private String sid; - @ApiModelProperty("车辆sid") private String vehSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("数据字典项key,如移位申请中 001 状态") + private String tempStateValue; @ApiModelProperty("数据字典项key,如移位申请中 001 状态") private String tempStateKey; + @ApiModelProperty("业务状态key") + private String tempKey; + @ApiModelProperty("业务状态value") + private String tempValue; @ApiModelProperty("业务sid") private String busSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index e20153a359..91c2929642 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -82,4 +82,7 @@ public class BusVehicleApply extends BaseEntity { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty("申请人的orgSidPath") + private String orgSidPath; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index c092547721..830abe2558 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -82,4 +82,7 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty("申请人orgSidPath") + private String orgSidPath; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java new file mode 100644 index 0000000000..428b353cf4 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.base.common.enums; + +import lombok.Getter; + +/** + * @Author hp + * @Date 2022/11/17 15:10 + * @Description 临时状态 持久状态 + */ +public class VehicleStateTempOrLast { + @Getter + public static enum PaymentEnum { + + ARREARS_CARRY_VEHICLE("0001", "欠款提车"), + + ARREARS_INVOICING("0004", "欠款开票"), + + PAY_MODELS("0002", "交清车款"), + + BAG_CARD_BUSINESS("0003", "包牌业务"), + + FIN_PAYMENT("0005", "款项确认"); + + /** + * code值 + */ + private final String code; + /** + * 备注 + */ + private final String remarks; + + /** + * 构造器 + * + * @param code code值 + * @param remarks 备注 + */ + private PaymentEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 8083535f05..9d68070634 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -150,9 +150,26 @@ public class BaseVehicleActualSalesService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + //=========================================== BaseVehicleActualSales baseVehicleActualSales = new BaseVehicleActualSales(); BeanUtils.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "sid"); baseVehicleActualSales.setCreateBySid(scmVehicleActualSalesDto.getUserSid()); + baseVehicleActualSales.setOrgSidPath(orgSidPath); boolean isSave = save(baseVehicleActualSales); if (!isSave) { return rb.setMsg("保存失败"); @@ -175,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid); @@ -326,6 +343,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = saveOrUpdateVehicleSales(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -443,6 +461,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java index 1a6ae62a57..1641d8957b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java @@ -297,6 +297,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign { return baseVehicleCertificateService.updateCertificate(dto); } + @Override + public ResultBean getCertificateInfo(String vinNo, String userSid) { + return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid); + } + /** * @param sheet 单元格 * @param resultCell 列表的值 diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index 8e86e549d1..cc14dec67f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -4,13 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo; import com.yxt.anrui.base.api.basevehiclecertificate.*; +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -29,6 +37,15 @@ import java.util.List; @Service public class BaseVehicleCertificateService extends MybatisBaseService { + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + + @Autowired + CommonAppendixService commonAppendixService; + + @Autowired + private FileUploadComponent fileUploadComponent; + /** * 台账信息条件分页查询 * @@ -190,4 +207,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService getCertificateInfo(String vinNo, String userSid) { + ResultBean rb = ResultBean.fireFail(); + AppHandoverCertificateInfoVo vo = new AppHandoverCertificateInfoVo(); + String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + BaseVehicleCertificateVo baseVehicleCertificateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, userOrgSid); + vo.setVin(vinNo); + vo.setDate(baseVehicleCertificateVo.getCertificateDate()); + vo.setInvoice(baseVehicleCertificateVo.getCertificationNo()); + List appAppendixList = commonAppendixService.getAppAppendixList(baseVehicleCertificateVo.getSid(), "0002"); + List invoiceImages = new ArrayList<>(); + for (CommonAppendixVo commonAppendixVo : appAppendixList) { + invoiceImages.add(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath()); + } + vo.setInvoiceImages(invoiceImages); + return rb; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index f5aa1ff381..2c0808e81b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -220,6 +220,22 @@ public class BusVehicleApplyService extends MybatisBaseService rb = ResultBean.fireFail(); String sid = dto.getSid(); if (StringUtils.isBlank(sid)) {//新增 + //======================================= + String orgSidPath = dto.getOrgSidPath(); + if(StringUtils.isBlank(orgSidPath)){ + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } + //=========================================== BusVehicleApply entity = new BusVehicleApply(); BeanUtil.copyProperties(dto, entity, "sid"); //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号 @@ -227,6 +243,7 @@ public class BusVehicleApplyService extends MybatisBaseService busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList(); for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) { @@ -260,7 +277,7 @@ public class BusVehicleApplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -511,6 +529,7 @@ public class BusVehicleApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 36f21dc630..63d29bfac9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1541,6 +1541,7 @@ public class CommonContractService extends MybatisBaseService vinList = new ArrayList<>(); @ApiModelProperty("欠款金额") - private String arrearsMoney; + private BigDecimal arrearsMoney; @ApiModelProperty("车型") private String carModel; @ApiModelProperty("开票信息确认书") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java index 65cbf0b777..96f04ddb86 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java @@ -13,4 +13,7 @@ public class AppAdvanceInvoicePageQuery implements Query { @ApiModelProperty("客户名称字段 合同编号字段") private String name; + + @ApiModelProperty("状态") + private String type; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java index d04c27cdf2..28237c49a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui_buscenter(销售业务)
* File: BusAdvanceGinvoiceapply.java
@@ -49,27 +51,27 @@ import lombok.Data; @TableName("bus_advance_ginvoiceapply") public class BusAdvanceGinvoiceapply extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建人接口") + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 - @ApiModelProperty("合同编号") + @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户名称") + @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("数量") + @ApiModelProperty("数量") private Integer num; // 数量 - @ApiModelProperty("欠款金额") - private Float arrearsMoney; // 欠款金额 - @ApiModelProperty("承诺回款日期") + @ApiModelProperty("欠款金额") + private BigDecimal arrearsMoney; // 欠款金额 + @ApiModelProperty("承诺回款日期") private String returnedMoneyDate; // 承诺回款日期 - @ApiModelProperty("申请人") + @ApiModelProperty("申请人") private String applyName; // 申请人 - @ApiModelProperty("车型") + @ApiModelProperty("车型") private String carModel; // 车型 - @ApiModelProperty("申请日期") + @ApiModelProperty("申请日期") private String applyDate; // 申请日期 - @ApiModelProperty("提前开票原因key") + @ApiModelProperty("提前开票原因key") private String advGinReasonKey; // 提前开票原因key - @ApiModelProperty("提前开票原因value") + @ApiModelProperty("提前开票原因value") private String advGinReasonValue; // 提前开票原因value @ApiModelProperty("选择 手写 key 0 1") private String advGinReasonType; @@ -83,6 +85,9 @@ public class BusAdvanceGinvoiceapply extends BaseEntity { @ApiModelProperty(value = "用户sid") private String createBySid; + @ApiModelProperty(value = "状态") + private String type; + @ApiModelProperty(value = "节点状态") private String nodeState; @ApiModelProperty(value = "节点id") @@ -93,4 +98,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "当前用户部门全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java index 0367b219a3..c3cfc5371d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java @@ -41,4 +41,6 @@ public class AppArrearsCarryDto implements Dto { private String procInsId; @ApiModelProperty("用户sid") private String taskId; + @ApiModelProperty("当前用户部门的全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java index a37c735a3f..c6b16c7350 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java @@ -14,4 +14,7 @@ public class AppArrearsCarryVehicleQuery implements Query { @ApiModelProperty("客户名称 合同编号") private String name; + @ApiModelProperty("状态") + private String type; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java index ddf9aaadb9..1ed5253ce7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java @@ -70,6 +70,9 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { @ApiModelProperty("分公司名称") private String useOrgName; + @ApiModelProperty("状态") + private String type; + @ApiModelProperty(value = "节点状态") private String nodeState; @ApiModelProperty(value = "节点id") @@ -80,4 +83,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity { private String procInstId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("当前用户部门的全路径") + private String orgSidPath; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index cb2f28bfae..fbc06abd89 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -98,7 +98,7 @@ public interface BusArrearsCarryVehicleApplyFeign { public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto); @ApiOperation("手机端-删除欠款提车") - @GetMapping("/deleteArrearsTakeCar") + @DeleteMapping("/deleteArrearsTakeCar") @ResponseBody public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java index 940bf9ccf0..f8acbccb85 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java @@ -16,6 +16,9 @@ public enum BuscenterFileEnum { ENTRUST("007", "委托提车授权书"), ENTRUST_CONFIRM("008", "交车资料确认单"), EXIT_TICKET("009", "出门证"), + HANDOVER_POLICY("010", "保单照片"), + HANDOVER_LICENCE("011", "临时牌照"), + HANDOVER_OTHRRDATA("012", "其他资料"), ; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java index 2943f43145..5cd9ded058 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java @@ -54,6 +54,8 @@ public class BusHandoverPrepare extends BaseEntity { private String contractNo; // 合同编号 @ApiModelProperty("客户名称") private String customerName; // 客户名称 + @ApiModelProperty("客户sid") + private String customerSid; @ApiModelProperty("联系电话") private String mobile; // 联系电话 @ApiModelProperty("品牌") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java index 23961f0477..0adae430a6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java @@ -13,6 +13,8 @@ public class BusHandoverPrepareAddDto implements Dto { @ApiModelProperty("合同编号") private String contractNo; // 合同编号 + @ApiModelProperty("客户Sid") + private String customerSid; // 客户名称 @ApiModelProperty("客户名称") private String customerName; // 客户名称 @ApiModelProperty("联系电话") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java index aff138e67c..aed3072d24 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java @@ -140,5 +140,9 @@ public interface BusHandoverPrepareFeign { @ResponseBody ResultBean getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query); + @ApiOperation("提交交车准备信息") + @PostMapping("/submitDeliveryPlanInfo") + @ResponseBody + ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java index f8c87e1751..4b4901c6d7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java @@ -128,4 +128,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign public ResultBean getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { return null; } + + @Override + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java index 75a9d7fcf0..ca8553a0a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java @@ -11,6 +11,8 @@ public class AppCertificateInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("用户sid") + private String userSid; + + private String sid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java index b82d618365..eb481cd38b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java @@ -10,10 +10,10 @@ import java.util.List; public class AppCertificateInfoVo implements Vo { private static final long serialVersionUID = -4673876588141577559L; + private String sid; + @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; @ApiModelProperty("") private String invoice; @ApiModelProperty("合格证日期") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java index e40d7df0ad..370f60776e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java @@ -11,7 +11,6 @@ public class AppInvoicingInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; + private String sid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java index 9522134e0d..510e3e7b62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java @@ -10,10 +10,10 @@ import java.util.List; public class AppInvoicingInfoVo implements Vo { private static final long serialVersionUID = 8827030575604891015L; + private String sid; + @ApiModelProperty("车架号") private String vin; - @ApiModelProperty("车辆sid") - private String carSid; @ApiModelProperty("发票代码") private String invoice; @ApiModelProperty("开票日期") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java index b7ccaeb451..13adbe6255 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java @@ -11,10 +11,8 @@ public class AppOtherDataDto implements Dto { private static final long serialVersionUID = 6765583840451569166L; - @ApiModelProperty("") private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; @ApiModelProperty("其他资料照片") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java index 7e6e5f1592..0aee884b5d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java @@ -8,10 +8,9 @@ import lombok.Data; public class AppOtherDataInfoQuery implements Query { private static final long serialVersionUID = 6544083379297436705L; - @ApiModelProperty("") + private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java index baa4470a3e..cdd66a7bbc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java @@ -10,10 +10,8 @@ import java.util.List; public class AppOtherDataInfoVo implements Vo { private static final long serialVersionUID = 7178241214019642737L; - @ApiModelProperty("") private String sid; - @ApiModelProperty("车辆sid") - private String carSid; + @ApiModelProperty("车架号") private String vin; @ApiModelProperty("其他资料照片") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java index e89dcd052e..98d6b3672b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java @@ -14,10 +14,9 @@ public class AppPolicyDto implements Dto { private List policyList; @ApiModelProperty("临时牌照") private List licenceList; - @ApiModelProperty("sid") + private String sid; - @ApiModelProperty("车辆照片") - private String carSid; + @ApiModelProperty("车架号") private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java index e8682b7864..d77fe68664 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java @@ -13,7 +13,4 @@ public class AppPolicyInfoQuery implements Query { @ApiModelProperty("车架号") private String vin; - - @ApiModelProperty("车辆sid") - private String carSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java index fccbcc364b..39b0934d60 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java @@ -1,4 +1,20 @@ package com.yxt.anrui.buscenter.api.bushandoverprepare.app; -public class AppPolicyInfoVo { +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppPolicyInfoVo implements Vo { + private static final long serialVersionUID = 5449450307167004770L; + private String sid; + + @ApiModelProperty("保单照片") + private List policyList; + @ApiModelProperty("临时牌照") + private List licenceList; + @ApiModelProperty("车架号") + private String vin; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java new file mode 100644 index 0000000000..b5a17e6bf8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.buscenter.api.bushandoverprepare.app; + +import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppSubmitHandoverPrepareDto implements Dto { + private static final long serialVersionUID = 138156532304986357L; + + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("车辆集合") + private List carDataList; + @ApiModelProperty("记录sid") + private String sid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构") + private String orgPath; + @ApiModelProperty("付款方式") + private String payType; + @ApiModelProperty("车型") + private String model; + @ApiModelProperty("品牌") + private String brand; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java index 2fd45aab5e..2a6752f2d4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java @@ -13,15 +13,15 @@ public class AppBusHandoverPrepareVehicleDto implements Dto { @ApiModelProperty("车架号") private String vinNo; // 车架号 @ApiModelProperty("开票状态") - private int invoicingState; // 开票状态 + private boolean invoicingState; // 开票状态 @ApiModelProperty("合格证状态") - private int certificateState; // 合格证状态 + private boolean certificateState; // 合格证状态 @ApiModelProperty("保单状态") - private int policyState; // 保单状态 + private boolean policyState; // 保单状态 @ApiModelProperty("随车资料状态") - private int onBoardDataState; // 随车资料状态 + private boolean onBoardDataState; // 随车资料状态 @ApiModelProperty("其他资料状态") - private int otherDataState; // 其他资料状态 + private boolean otherDataState; // 其他资料状态 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java index 991ee4645a..56db821af7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java @@ -8,6 +8,8 @@ import lombok.Data; public class AppBusHandoverPrepareVehicleInfoVo implements Vo { private static final long serialVersionUID = 1415137296013613928L; + @ApiModelProperty("sid") + private String sid; // 交车申请表sid @ApiModelProperty("交车申请表sid") private String mainSid; // 交车申请表sid @ApiModelProperty("车架号") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java index 5fa467b29e..fd0931b96a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java @@ -39,6 +39,12 @@ public class BusHandoverWait extends BaseEntity { @ApiModelProperty("付款状态value") private String payStateValue; + @ApiModelProperty("车型sid") + private String modelSid; + + @ApiModelProperty("车型别名") + private String modelName; + @ApiModelProperty("分公司sid") private String useOrgSid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java index f188850a96..977672a3e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java @@ -45,4 +45,7 @@ public class BusHandoverWaitDto implements Dto { @ApiModelProperty("车型别名") private String modelName; + @ApiModelProperty("分公司sid") + private String useOrgSid; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 16a13946e8..8cedb3b0ed 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -228,5 +228,8 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean> getApprovalContractList(@RequestBody PagerQuery pagerQuery); - + @ApiOperation("查询该合同下的该辆车架号的车辆sid") + @GetMapping("/getVinSidByConSid") + @ResponseBody + ResultBean getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 462e43f3c6..8e28f94215 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -203,4 +203,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean> getApprovalContractList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean getVinSidByConSid(String contractNo, String vinNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java index 1a225f3bb4..026e538cc9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java @@ -14,4 +14,7 @@ public class AppRovalContractPageQuery implements Query { @ApiModelProperty("车架号 客户名称 合同编号") private String name; + + @ApiModelProperty("状态") + private int stateType; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java index b8ac670bee..ec2a7b1cfe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java @@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -69,4 +70,7 @@ public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper getAdvanceInvoiceList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); int updateFlowFiled(Map map); + + @Update("update bus_advance_ginvoiceapply set `type` = '2' where sid =#{sid}") + void updateType(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index 4ff6521c9e..94c807b509 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -30,16 +30,20 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.*; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceInvoiceTaskQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo; +import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto; @@ -81,6 +85,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -133,6 +138,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService listPage(PagerQuery pq) { BusAdvanceGinvoiceapplyQuery query = pq.getParams(); @@ -385,6 +392,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); for (AppAdvanceInvoicePageVo record : iPage.getRecords()) { @@ -408,18 +418,14 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService carList = new ArrayList<>(); List vinList = new ArrayList<>(); - int arrearsMoney = 0; List carLists = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid); for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : carLists) { AdCarListVo adCarListVo = new AdCarListVo(); adCarListVo.setPrice(vehicleDetailsVo.getDealMoney()); adCarListVo.setVin(vehicleDetailsVo.getVinNo()); carList.add(adCarListVo); - int dealMoney = Integer.parseInt(vehicleDetailsVo.getDealMoney()); - arrearsMoney = dealMoney + arrearsMoney; } vo.setCarList(carList); - vo.setArrearsMoney(String.valueOf(arrearsMoney)); List vinLists = busSalesOrderService.selectByContractNo(busAdvanceGinvoiceapply.getContractNo()); if (vinLists.size() > 0) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { @@ -482,6 +488,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService 0) { for (String vin : dto.getVinList()) { BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle(); @@ -492,11 +499,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply); - updateById(busAdvanceGinvoiceapply); String sid = dto.getContractSid(); busGinvoiceapplyVehicleService.delByAdvGinSid(sid); List carList = dto.getCarList(); @@ -522,6 +543,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService resultBean = saveAdvanceInvoice(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } String businessSid = resultBean.getData(); + //修改状态 + BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); + baseVehicleTempstateDto.setBusSid(businessSid); + baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()); + List busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid()); + for (BusGinvoiceapplyVehicleDetailsVo busGinvoiceapplyVehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) { + baseVehicleTempstateDto.setVehSid(busGinvoiceapplyVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + baseMapper.updateType(busAdvanceGinvoiceapply.getSid()); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 @@ -694,6 +729,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -727,8 +767,6 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService vinList = new ArrayList<>(); @@ -736,6 +774,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -850,8 +895,6 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService vinList = new ArrayList<>(); @@ -859,6 +902,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService map); + + void updateType(@Param("businessSid") String businessSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index 77bfb58e7d..7f55ddb28d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -98,4 +98,10 @@ WHERE sid = #{sid} + + + update bus_arrears_carry_vehicle_apply + set `type` = '2' + where sid = #{businessSid} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index 4ab0476e2e..92c5123822 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; @@ -23,6 +26,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo; import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; @@ -30,6 +34,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -129,6 +135,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName()); return iPage; @@ -554,8 +569,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService 0) { List vinList = dto.getVinList(); @@ -587,8 +606,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } //根据申请sid查询数据 BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply); @@ -631,6 +660,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); + for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { + baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + baseMapper.updateType(businessSid); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 @@ -742,6 +782,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -770,6 +815,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService recipientSidList = new ArrayList<>(); + //修改状态 + baseMapper.updateType(bv.getBusinessSid()); + //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -780,10 +828,15 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -899,6 +957,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService recipientSidList = new ArrayList<>(); + //修改状态 + baseMapper.updateType(bv.getBusinessSid()); + //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -909,6 +970,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService { - List selectByLinkSid(@Param("sid") String sid, @Param("attachType")String attachType); + List selectByLinkSid(@Param("sid") String sid, @Param("attachType") String attachType); int deleteByLinkSid(String sid); BuscenterFile selectByLinkSidOne(@Param("sid") String sid, @Param("attachType") String attachType); + + @Delete("delete from buscenter_file where linkSid = #{sid} and attachType = #{attachType}") + void delByLinkSidOrType(@Param("sid") String sid, @Param("attachType") String attachType); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java index 33f0cdda18..79d0c1954c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java @@ -48,4 +48,8 @@ public class BuscenterFileService extends MybatisBaseService getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { return busHandoverPrepareService.getDeliveryPlanInfoDetail(query); } + + @Override + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + return busHandoverPrepareService.submitDeliveryPlanInfo(dto); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 112fe3ed0d..a6a849fc46 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -28,15 +28,27 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; +import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum; import com.yxt.anrui.buscenter.api.bushandoverprepare.*; import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*; import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto; import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo; import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto; +import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign; +import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService; import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService; +import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService; import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -47,6 +59,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -70,6 +83,16 @@ public class BusHandoverPrepareService extends MybatisBaseService createQueryWrapper(BusHandoverPrepareQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -182,27 +205,70 @@ public class BusHandoverPrepareService extends MybatisBaseService resultBean = finBillVehicleFeign.selDetailsByVinNo(vin); AppInvoicingInfoVinNoVo data = resultBean.getData(); BeanUtil.copyProperties(data, vo); + vo.setVin(vin); return rb.success().setData(vo); } public ResultBean getCertificateInfo(AppCertificateInfoQuery query) { - return null; + ResultBean rb = new ResultBean(); + AppCertificateInfoVo vo = new AppCertificateInfoVo(); + String vinNo = query.getVin(); + String userSid = query.getUserSid(); + ResultBean resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid); + AppHandoverCertificateInfoVo data = resultBean.getData(); + BeanUtil.copyProperties(data, vo); + vo.setVin(vinNo); + return rb.success().setData(vo); } public ResultBean getPolicyInfo(AppPolicyInfoQuery query) { - return null; + ResultBean rb = new ResultBean<>(); + AppPolicyInfoVo vo = new AppPolicyInfoVo(); + List policyList = new ArrayList<>();// 保单照片 + List licenceList = new ArrayList<>();// 临时牌照 + List policyFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + for (BuscenterFile file : policyFiles) { + policyList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + List licenceFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + for (BuscenterFile file : licenceFiles) { + licenceList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + vo.setPolicyList(policyList); + vo.setLicenceList(licenceList); + vo.setSid(query.getSid()); + vo.setVin(query.getVin()); + return rb.success().setData(vo); } public ResultBean savePolicyInfo(AppPolicyDto dto) { - return null; + ResultBean rb = new ResultBean<>(); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getPolicyList(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType()); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getLicenceList(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType()); + return rb.success(); } public ResultBean getOtherDataInfo(AppOtherDataInfoQuery query) { - return null; + ResultBean rb = new ResultBean<>(); + AppOtherDataInfoVo vo = new AppOtherDataInfoVo(); + List otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + List otherInfo = new ArrayList<>(); + for (BuscenterFile file : otherFiles) { + otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath()); + } + vo.setOtherInfo(otherInfo); + vo.setSid(query.getSid()); + vo.setVin(query.getVin()); + return rb.success().setData(vo); } public ResultBean saveOtherDataInfo(AppOtherDataDto dto) { - return null; + ResultBean rb = new ResultBean<>(); + buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType()); + return rb.success(); } public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) { @@ -225,6 +291,51 @@ public class BusHandoverPrepareService extends MybatisBaseService getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) { - return null; + ResultBean rb = ResultBean.fireFail(); + String sid = query.getSid(); + AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo(); + BusHandoverPrepare busHandoverPrepare = fetchBySid(sid); + BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo); + List list = busHandoverPrepareVehicleService.selByMainSid(sid); + appBusHandoverPrepareInfoVo.setCarDataList(list); + appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid()); + return rb.success().setData(appBusHandoverPrepareInfoVo); + } + + public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) { + ResultBean rb = ResultBean.fireFail(); + BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, busHandoverPrepare); + List handoverPrepareVehicleDtos = dto.getCarDataList(); + if (handoverPrepareVehicleDtos.size() > 0) { + String sid = dto.getSid(); + busHandoverPrepareVehicleService.deleteByMainSid(sid); + for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) { + BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle(); + BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle); + busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid()); + busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle); + + BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto(); + busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo()); + busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName()); + busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid()); + busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo()); + BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData(); + if (data!=null){ + busHandoverWaitDto.setVinSid(data.getSid()); + busHandoverWaitDto.setModelSid(data.getModelSid()); + busHandoverWaitDto.setModelName(data.getModelName()); + } + busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid()); + busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey()); + busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType()); + busHandoverWaitService.saveAll(busHandoverWaitDto); + } + } + busHandoverPrepare.setHandoverPrepareState("已准备"); + busHandoverPrepare.setHandoverPrepareStateKey("2"); + updateById(busHandoverPrepare); + return rb.success(); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java index 1febadf73e..1b383f3045 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java @@ -67,19 +67,19 @@ public interface BusHandoverPrepareVehicleMapper extends BaseMapper selByMainSid(@Param("sid") String sid); - @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}") + @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where sid = #{sid} and vinNo = #{vin}") void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set certificateState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set policyState = 1 where sid = #{sid} and vinNo = #{vin} ") void savePolicyState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set onBoardDataState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin); - @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ") + @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where sid = #{sid} and vinNo = #{vin} ") void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin); @Delete("delete from bus_handover_prepare_vehicle where mainSid = #{sid}") diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml index 106f1b84cc..7d743b4296 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml @@ -16,7 +16,8 @@ @@ -308,11 +311,14 @@ left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid ${ew.sqlSegment} - - and concat(bd.billNo - , bc.customerName - , bc.customerMobile) LIKE concat('%' - , #{name} + + and concat(IFNULL(bd.billNo + , '') + , ifnull(bc.customerName + , '') + , ifnull(bc.customerMobile + , '')) LIKE concat('%' + , #{names} , '%') @@ -344,6 +350,8 @@ - update bus_main_deposit set modifyTime = #{date} where sid = #{sid} + update bus_main_deposit + set modifyTime = #{date} + where sid = #{sid} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 9721ff694c..61f09deb8d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -178,4 +178,9 @@ public interface BusSalesOrderMapper extends BaseMapper { IPage getApprovalContractList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("name") String name); List selectByContractNo(@Param("contractNo") String contractNo); + + + BusSalesOrderDetailsVo getByContractNo(String contractNo); + + String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index f80f2e2bb2..9a132dd1ea 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -244,13 +244,14 @@ ${ew.sqlSegment} and concat(IFNULL(bo.contractNo - , '') - , ifnull(bo.customerName - , '')) LIKE concat('%' - , #{name} - , '%') + , '') + , ifnull(bo.customerName + , '')) LIKE concat('%' + , #{name} + , '%') - and length(bo.contractNo) > 1 + and length(bo.contractNo) + > 1 + SELECT * + FROM bus_sales_order bo + WHERE bo.contractNo = #{contractNo} + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index f4b0590c27..e38812954c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -280,4 +280,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); return new ResultBean>().success().setData(pagerVo); } + + @Override + public ResultBean getVinSidByConSid(String contractNo, String vinNo) { + return busSalesOrderService.getVinSidByConSid(contractNo,vinNo); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 648d06fe45..a4f7881c9e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -42,6 +42,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign; import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; @@ -53,6 +55,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleState; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious; @@ -232,6 +235,8 @@ public class BusSalesOrderService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bo.staffSid", sysUserVo.getStaffSid()); + List vinList = new ArrayList(); + if (params.getStateType() == 1) { + List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); + for (BaseVehicleTempstateVo datum : data) { + BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); + vinList.add(vehicleSelectVo.getVinNo()); + } + } else if (params.getStateType() == 2) { + List data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()).getData(); + for (BaseVehicleTempstateVo datum : data) { + BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData(); + vinList.add(vehicleSelectVo.getVinNo()); + } + } + if (vinList.size() > 0) { + qw.notIn("bsov.linkNo", vinList); + } IPage page = PagerUtil.queryToPage(pagerQuery); IPage iPage = baseMapper.getApprovalContractList(page, qw, params.getName()); for (AppRovalContractPageVo record : iPage.getRecords()) { @@ -2868,4 +2890,18 @@ public class BusSalesOrderService extends MybatisBaseService list = baseMapper.selectByContractNo(contractNo); return list; } + + public BusSalesOrderDetailsVo getByContractNo(String contractNo) { + BusSalesOrderDetailsVo vo = baseMapper.getByContractNo(contractNo); + return vo; + } + + public ResultBean getVinSidByConSid(String contractNo, String vinNo) { + ResultBean rb = ResultBean.fireFail(); + String vinSid = baseMapper.getVinsidByConSid(contractNo, vinNo); + if (StringUtils.isBlank(vinSid)) { + return rb.setData(""); + } + return rb.success().setData(vinSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index 02f0fafa48..b0b006d0a0 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -109,7 +109,7 @@ - + @@ -183,7 +183,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: '' + createBySid: '', + state: '' }, total: 0 } @@ -242,6 +243,7 @@ export default { getList() { this.listLoading = true this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.state = 0 listPage(this.listQuery).then((response) => { this.listLoading = false if (response.code === '200') { @@ -266,7 +268,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: '' + createBySid: '', + state: '' }, total: 0 } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index df25c1f31c..3b3a783c5b 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -555,13 +555,14 @@ export default { this.submitdisabled = false if (resp.code === '200') { this.$message({ showClose: true, type: 'success', message: resp.msg }) - this.handleReturn() + this.handleReturn('true') } }).catch(() => { this.submitdisabled = false }) }, - handleReturn() { + handleReturn(isreload) { + if (isreload === 'true') this.$emit('reloadlist') this.formobj = { sid: '', createByName: window.sessionStorage.getItem('name'), @@ -579,10 +580,18 @@ export default { remittanceConfirmationUrl: '', balance: '', useOrgSid: '', + userSid: '', finSelectedReceivablesDetaileds: [], paymentVoucherAppendixs: [], remittanceConfirmationAppendixs: [] } + this.listQuery = { + contractNo: '', + customerName: '', + customerPhone: '', + sids: [], + createBySid: '' + } this.list1 = [] this.list2 = [] this.forbidden = false diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index 42f03402d7..bc4bf9285d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -166,7 +166,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: window.sessionStorage.getItem('staffSid') + createBySid: '', + state: '' }, total: 0 } @@ -208,6 +209,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid') + this.listQuery.params.state = 1 listPage(this.listQuery).then((response) => { this.listLoading = false if (response.code === '200') { @@ -231,7 +234,8 @@ export default { collectionTypeKey: '', subscriptionState: '', useOrgSid: '', - createBySid: window.sessionStorage.getItem('staffSid') + createBySid: '', + state: '' }, total: 0 } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue index 06aa2e6a51..214303a3fe 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue @@ -157,11 +157,11 @@ {{ scope.row.subscriptionDate }} - - - + + + + + @@ -222,23 +222,20 @@ export default { type: 'success' } ) - this.handleReturn() + this.handleReturn('true') } }) }, handReject() { cashierReject({ sid: this.sid }).then((res) => { if (res.code === '200') { - this.message({ - showClose: true, - message: '已驳回', - type: 'success' - } + this.message({ showClose: true, message: '已驳回', type: 'success' } ) } }) }, - handleReturn() { + handleReturn(isreload) { + if (isreload === 'true') this.$emit('reloadlist') this.formobj = {} this.list1 = [] this.list2 = [] diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index af85870a49..949ecd9513 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -96,7 +96,6 @@ SELECT *, emergencyMobile AS mobile2 FROM crm_customer_temp WHERE sid = #{sid} - AND staffSid = #{staffSid} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java index f1fd6c70f9..47a929f357 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AddInvoicedApplyDto.java @@ -19,12 +19,6 @@ public class AddInvoicedApplyDto implements Dto { @ApiModelProperty("申请日期") private String applyDate; - @ApiModelProperty("开票类型key") - private String billTypeKey; - - @ApiModelProperty("开票类型value") - private String billTypeValue; - @ApiModelProperty("分公司sid") private String useOrgSid; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java index 69478f319a..bed9656a57 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java @@ -89,6 +89,7 @@ public class FinBillApplication extends BaseEntity { private String nodeState; @ApiModelProperty(value = "是否延迟开票") private Integer isDelayBill; - + @ApiModelProperty("当前用户部门全路径") + private String orgSidPath; private String taskId; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index a220adc3e4..b35931c891 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -93,6 +93,8 @@ public class FinBillApplicationDto implements Dto { private String isHighAndLowOpen; @ApiModelProperty("备注") private String remarks; // 备注 + @ApiModelProperty("当前用户部门全路径") + private String orgSidPath; @ApiModelProperty("开票车辆信息") private List finBillVehicles; // 开票车辆信息 @ApiModelProperty("客户开票申请书附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java index ca898633fa..5ecb7aad3b 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java @@ -51,6 +51,8 @@ import java.util.List; @Data public class FinCollectionConfirmationDetailsVo implements Vo { + @ApiModelProperty("sid") + private String sid; @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java index 12aa7172a5..a7d81269d7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java @@ -81,8 +81,8 @@ public class FinCollectionConfirmationDto implements Dto { private String paymentVoucherUrl; // 打款凭证Url @ApiModelProperty("汇款确认书Url") private String remittanceConfirmationUrl; // 汇款确认书Url - @ApiModelProperty("余额") - private String balance; // 余额 +/* @ApiModelProperty("余额") + private String balance;*/ @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("备注") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index 60f96a11aa..1959c8ccb2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -25,12 +25,14 @@ *********************************************************/ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; @@ -121,5 +123,9 @@ public interface FinCollectionConfirmationFeign { @GetMapping("/billeNoList") ResultBean> billeNoList(); + @ApiOperation("欠款提车-查询欠款金额及收款金额") + @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}") + ResultBean selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 83c18f7e01..4b93ae0232 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.fin.api.fincollectionconfirmation; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.core.query.PagerQuery; @@ -126,4 +127,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf public ResultBean> billeNoList() { return null; } + + @Override + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java index 8287eb8c35..571178878c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java @@ -66,6 +66,6 @@ public class FinCollectionConfirmationVo implements Vo { private String remarks; // 备注 @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）") private Integer auditState; // 审核状态 - /*@ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）") - private Integer subscriptionState; // 审核状态*/ + @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）") + private Integer subscriptionState; // 审核状态 } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java new file mode 100644 index 0000000000..5690e74582 --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.fin.api.fincollectionconfirmation.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class AppBusArrearsCarryMoneyVo implements Vo { + private static final long serialVersionUID = 315129249938477010L; + + @ApiModelProperty("合同金额") + private BigDecimal contractAmount; + + @ApiModelProperty("收款总金额") + private BigDecimal contractCollectionMoney; + + @ApiModelProperty("欠款金额") + private BigDecimal arrearsMoney; + + @ApiModelProperty("收款金额") + private BigDecimal subscriptionMoney; + +} diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java index 51bae17d71..ab3c23b8fd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/AppFinPaymentApplyVo.java @@ -55,4 +55,7 @@ public class AppFinPaymentApplyVo implements Vo { private String sid; + @ApiModelProperty("品牌") + private String brand; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java index 5b68cb2563..dbc63c25c8 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java @@ -82,4 +82,7 @@ public class FinSelectedReceivablesDetailed extends BaseEntity { private Integer auditState; // 审核状态 @ApiModelProperty("审核时间") private String auditDate; // 审核时间 + + @ApiModelProperty("应收未收sid") + private String receivablesSid; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index 343ffcec59..4bfe9548e7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java @@ -78,4 +78,7 @@ public class FinSelectedReceivablesDetailedDto implements Dto { private String subscriptionDate; // 认款申请日期 @ApiModelProperty("收款确认单sid") private String collSid; // 收款确认单sid + + @ApiModelProperty("应收未收款项sid") + private String receivablesSid; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java index 9cebfabc5d..c99f8f7e63 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java @@ -82,4 +82,7 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity { @ApiModelProperty("当前应收金额") private BigDecimal currentReceivableMoney; // 当前应收金额 + + @ApiModelProperty("应收金额（不变）") + private String reveivableMoney; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java index b5d20f9bef..ba1a52f976 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java @@ -49,4 +49,8 @@ public class UnCollectionDto implements Dto { @ApiModelProperty("用户sid:创建人") private String userSid; + + @ApiModelProperty("应收金额（不变）") + private String reveivableMoney; + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 7cd332b246..4d705c805c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -78,7 +78,6 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.MessageFlowVo; import com.yxt.messagecenter.api.message.MessageFlowableQuery; -import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -200,6 +199,21 @@ public class FinBillApplicationService extends MybatisBaseService saveOrUpdateDto(FinBillApplicationDto dto) { ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dto.getOrgSidPath())) { + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + dto.setOrgSidPath(orgSidPath); + } List finBillVehicles = dto.getFinBillVehicles(); List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); @@ -686,6 +700,7 @@ public class FinBillApplicationService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -868,6 +883,7 @@ public class FinBillApplicationService extends MybatisBaseService selectByState(); + + int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index ea62d4fa48..1d99763a60 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -86,4 +86,8 @@ left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid where fcc.auditState = 1 + + + update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index a3ba1a66c9..a45aeebe61 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; import com.yxt.common.base.utils.PagerUtil; @@ -199,4 +200,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF public ResultBean> billeNoList() { return finCollectionConfirmationService.billNoList(); } + + @Override + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 763a12cb7d..22399bda7e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -28,11 +28,19 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; -import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; -import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; -import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.api.basevehicle.BaseVehicle; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; +import com.yxt.anrui.base.api.commonappendix.*; +import com.yxt.anrui.base.api.commoncontract.CommonContract; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; @@ -95,15 +103,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); qw.eq("useOrgSid", query.getUseOrgSid()); - if (StringUtils.isNotBlank(query.getCreateBySid())) { - qw.eq("createBySid", query.getCreateBySid()); - } String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). @@ -118,6 +131,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); - CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); if (paymentVoucherAppendixs.size() == 0) { return rb.setMsg("请上传打款凭证附件"); @@ -192,9 +214,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService -1) { s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setLinkSid(sid); commonAppendixDto.setFilePath(s); commonAppendixDto.setCreateBySid(dto.getStaffSid()); commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); @@ -234,27 +260,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService -1) { s = s.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(sid1); + commonAppendixDto.setLinkSid(sid); commonAppendixDto.setFilePath(s); commonAppendixDto.setCreateBySid(dto.getStaffSid()); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); } remFilePath += s + ","; } finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1)); for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) { + //已选 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed); - finSelectedReceivablesDetailed.setCollSid(sid1); + //主表sid + finSelectedReceivablesDetailed.setCollSid(sid); + //设置审核状态为待审核 finSelectedReceivablesDetailed.setAuditState(1); + finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid); finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); + //添加已选车架号为临时状态 + BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); + baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()); + baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks()); + baseVehicleTempstateDto.setTempKey("1"); + baseVehicleTempstateDto.setTempValue("待审核"); + baseVehicleTempstateDto.setBusSid(sid); + //根据合同编号和车架号查询该合同的车辆sid + ResultBean resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN()); + if (resultBean.getSuccess()) { + baseVehicleTempstateDto.setVehSid(resultBean.getData()); + } + ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto); //已选应收款项-车架号 - String vin = finSelectedReceivablesDetailed.getVIN(); + /* String vin = finSelectedReceivablesDetailed.getVIN(); //已选应收款项-应收项目名称 String receivablesName = finSelectedReceivablesDetailed.getReceivablesName(); FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); @@ -262,6 +306,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); BigDecimal totalSubscriptionMone = new BigDecimal(0); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); } + //收款金额 BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); - BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); - if (subtract.compareTo(BigDecimal.ZERO) < 0) { +// BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); + /* if (subtract.compareTo(BigDecimal.ZERO) < 0) { return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); - } - finCollectionConfirmation.setBalance(subtract); + }*/ +// finCollectionConfirmation.setBalance(collectionMoney); + FinCollectionConfirmation confirmation = fetchBySid(dto.getSid()); + finCollectionConfirmation.setBalance(confirmation.getBalance()); finCollectionConfirmation.setAuditState(1); finCollectionConfirmation.setPaymentState(1); save(finCollectionConfirmation); @@ -293,13 +343,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentVoucherAppendixs = new ArrayList<>(); - ArrayList remittanceConfirmationAppendixs = new ArrayList<>(); - String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); - String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl(); - String[] split1 = remittanceConfirmationUrl.split(","); + BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); + + List paymentVoucherAppendixs = new ArrayList<>(); + List remittanceConfirmationAppendixs = new ArrayList<>(); + /* String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl(); + String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();*/ + /* String[] split1 = remittanceConfirmationUrl.split(","); String[] split = paymentVoucherUrl.split(","); BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); for (String s : split) { @@ -311,9 +361,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); + if (listResultBean.getSuccess()) { + for (CommonAppendixVo commonApp : listResultBean.getData()) { + FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo(); + commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath()); + BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo); + paymentVoucherAppendixs.add(paymentVoucherAppendixVo); + } } finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs); - for (String s : split1) { + /* for (String s : split1) { ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s); CommonAppendixVo data = commonAppendixVoResultBean.getData(); String filePath = data.getFilePath(); @@ -322,6 +385,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); @@ -469,6 +545,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentDetails = dto.getContractList(); CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); if (StringUtils.isBlank(dto.getCollectionBillSid())) { @@ -577,23 +655,37 @@ public class FinCollectionConfirmationService extends MybatisBaseService payConfirmFiles = dto.getPayConfirmFiles(); String remFilePath = ""; for (String payFilePath : payConfirmFiles) { if (payFilePath != null) { remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(dto.getSid()); - commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setLinkSid(dto.getCollectionBillSid()); + commonAppendixDto.setFilePath(remFilePath); commonAppendixDto.setCreateBySid(staffSid); commonAppendixDto.setFileName("汇款确认"); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); } remFilePath += remFilePath + ","; } finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath); finCollectionConfirmation.setAuditState(1); + finCollectionConfirmation.setCreateBySid(dto.getUserSid()); save(finCollectionConfirmation); } else { FinCollectionConfirmation finCollectionConfirmation = fetchBySid(dto.getCollectionBillSid()); @@ -630,18 +722,31 @@ public class FinCollectionConfirmationService extends MybatisBaseService payConfirmFiles = dto.getPayConfirmFiles(); String remFilePath = ""; for (String payFilePath : payConfirmFiles) { if (payFilePath != null) { remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); - commonAppendixDto.setLinkSid(dto.getSid()); - commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setLinkSid(dto.getCollectionBillSid()); + commonAppendixDto.setFilePath(remFilePath); commonAppendixDto.setCreateBySid(staffSid); commonAppendixDto.setFileName("汇款确认"); - commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); commonAppendixFeign.save(commonAppendixDto); } remFilePath += remFilePath + ","; @@ -694,11 +799,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService vos = baseMapper.selectByState(); -// for (AppCollectionConfirmationStateVo vo : vos) { -// vo.getContractNo(); -// vo.getVinNo(); -// } + List vinNoList = new ArrayList<>(); + List baseVehicleTempstateVos = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode()).getData(); + for (BaseVehicleTempstateVo baseVehicleTempstateVo : baseVehicleTempstateVos) { + String vehSid = baseVehicleTempstateVo.getVehSid(); + BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vehSid).getData(); + vinNoList.add(baseVehicleSelectVo.getVinNo()); + } + if (vinNoList.size() > 0) { + qw.notIn("VIN", vinNoList); + } IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName()); List records = collectionConfirmList.getRecords(); for (AppFinUncollectedReceivablesDetailedVo record : records) { @@ -730,14 +840,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { - String vin = finSelectedReceivablesDetailedVo.getVIN(); + //更新审核时间 + finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2"); + /* String vin = finSelectedReceivablesDetailedVo.getVIN(); String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); String sid1 = finUncollectedReceivablesDetailedVo.getSid(); BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney)); - finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1); + finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);*/ } FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); @@ -745,34 +857,48 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { String sid1 = finSelectedReceivablesDetailedVo.getSid(); - finSelectedReceivablesDetailedService.cashierConfirm(sid1); - finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1); +// finSelectedReceivablesDetailedService.cashierConfirm(sid1); + //更新审核时间 + finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3"); + //认款金额 BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney); String vin = finSelectedReceivablesDetailedVo.getVIN(); String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); - FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); - String sid2 = finUncollectedReceivablesDetailedVo.getSid(); + String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid(); +// FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecNameOrgSid(vin, receivablesName, useOrgSid); +// String sid2 = finUncollectedReceivablesDetailedVo.getSid(); + //应收未收款项-当前应收金额 BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney()); + //已选应收款项-认款金额 BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); - if (subtract.compareTo(BigDecimal.ZERO) == 0) { + finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); + BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); + finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); + /* if (subtract.compareTo(BigDecimal.ZERO) == 0) { int subscriptionState = 3; finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); } else { int subscriptionState = 2; finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState); - } + }*/ } FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); @@ -784,6 +910,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.billNoList(); return rb.success().setData(stringList); } + + public ResultBean selectArrearsMoneyOrCollectionMoney(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + AppBusArrearsCarryMoneyVo vo = new AppBusArrearsCarryMoneyVo(); + //获取已认款金额 + List list = finSelectedReceivablesDetailedService.selByContractNo(contractNo); + BigDecimal subscriptionMoney = new BigDecimal(0); + for (AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo : list) { + subscriptionMoney = subscriptionMoney.add(appBusArrearsCarryMoneyVo.getSubscriptionMoney()); + } + vo.setContractCollectionMoney(subscriptionMoney); + //获取欠款金额 + CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData(); + String contractAmount = commonContract.getContractAmount(); + BigDecimal contractAmountMoney = new BigDecimal(contractAmount); + BigDecimal arrearsMoney = contractAmountMoney.subtract(subscriptionMoney); + vo.setArrearsMoney(arrearsMoney); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index 190e68f0b5..b4ff2810ef 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -122,7 +122,8 @@ fp.sid, fp.createBySid, fp.taskId, - fp.procInstId + fp.procInstId, + fp.carBrandName brand from fin_paymentapply fp where sid = #{sid} diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 320b512bc4..a42474ee0a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo; @@ -92,8 +93,10 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper selectDetailedGroupConAndRecAndPay(); - @Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}") - void updateAuditDateBySid(String sid1); + @Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}") + void updateAuditDateBySid(@Param("sid1") String sid1,@Param("auditState") String auditState); List selectByCollSid(@Param("collectionBillSid") String collectionBillSid); + + List selByContractNo(String contractNo); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index e411208079..3993f43261 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -84,4 +84,15 @@ FROM fin_selected_receivables_detailed WHERE collSid = #{collectionBillSid} + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index cecf982bc5..6cae9a229c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery; @@ -199,11 +200,16 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService selectByCollSid(String collectionBillSid) { return baseMapper.selectByCollSid(collectionBillSid); } + + public List selByContractNo(String contractNo) { + List list = baseMapper.selByContractNo(contractNo); + return list; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 2256e69f62..07774f130b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -66,6 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName,@Param("useOrgSid")String useOrgSid); @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}") void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney, @Param("sid") String sid); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 931a3d1d8b..cb34551931 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -27,6 +27,14 @@ AND receivablesName = #{receivablesName} + + @@ -186,10 +217,11 @@ @@ -232,13 +264,14 @@ select si.name, su.sid, su.staffSid from sys_user_role sr - left join sys_user su on sr.userSid = su.sid - left join sys_staffinfo si on si.sid = su.staffSid - where sr.roleSid = #{roleSid} + left join sys_user su on sr.userSid = su.sid + left join sys_staffinfo si on si.sid = su.staffSid + where sr.roleSid = #{roleSid} and si.personTypeKey != '01' diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java index f6ac3b5f90..3ad54bc929 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java @@ -995,7 +995,9 @@ public class SysUserService extends MybatisBaseService { sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid); } sysUserVoList.removeAll(Collections.singleton(null)); - + sysUserVoList.forEach(t -> { + t.setOrgSidPath(query.getOrgSidPath()); + }); } else { return rb.setMsg("该角色层级未设置"); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java index c20924eb99..42e5f72da1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java @@ -114,4 +114,7 @@ public class ScmVehicleGression extends BaseEntity { private String orgSid;*/ + private String orgSidPath; + + } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 858b35a4f4..d2de45733e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -393,12 +393,26 @@ public class ScmVehicleGressionService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + } //获取用户信息 ResultBean userVoResultBean = sysUserFeign.fetchBySid(userSid); if (!userVoResultBean.getSuccess()) { @@ -422,6 +436,7 @@ public class ScmVehicleGressionService extends MybatisBaseService 0) { @@ -435,7 +450,7 @@ public class ScmVehicleGressionService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); diff --git a/anrui-scm/anrui-scm-ui/.env.development b/anrui-scm/anrui-scm-ui/.env.development index 67f7e0a1e3..ad912c6688 100644 --- a/anrui-scm/anrui-scm-ui/.env.development +++ b/anrui-scm/anrui-scm-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://anrui.yyundong.com" +VUE_APP_URL = "http://192.168.1.100:8111" ##VUE_APP_URL = "http://120.46.172.184:8111" diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue index d6283e4be9..be6c54db4c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue @@ -6,7 +6,7 @@
保存 - 提交 + 提交 关闭
@@ -187,16 +187,19 @@ export default { this.viewState = 1 }, selectVehicle(depositVehicleList) { - for (var i = 0; i < depositVehicleList.length; i++) { - this.list.push({ - configName: depositVehicleList[i].configName, - configSid: depositVehicleList[i].configSid, - inboundDate: depositVehicleList[i].priceDate, - modelName: depositVehicleList[i].vehicleAlias, - vinNo: depositVehicleList[i].vinNo, - returnStockCost: '', - costRemarks: '' - }) + this.viewState = 1 + if (depositVehicleList.length > 0) { + for (var i = 0; i < depositVehicleList.length; i++) { + this.list.push({ + configName: depositVehicleList[i].configName, + configSid: depositVehicleList[i].configSid, + inboundDate: depositVehicleList[i].priceDate, + modelName: depositVehicleList[i].vehicleAlias, + vinNo: depositVehicleList[i].vinNo, + returnStockCost: '', + costRemarks: '' + }) + } } console.log('车辆表数据', this.list) }, @@ -204,7 +207,6 @@ export default { dataDelete(index, row) { this.list.splice(index, 1) }, - // 返回（===既判断又赋值） handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue index b7d7a661fc..22e6a174ab 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue @@ -2,7 +2,7 @@
-
现车库存
+
车辆查询
确定 关闭 @@ -12,50 +12,26 @@
{{ searchxianshitit }}
- + - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + - - - + + + - - - + + + @@ -66,7 +42,7 @@
-
现车库存列表
+
现车列表
@@ -119,6 +95,7 @@ import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' import req from '@/api/supplychain/purchasereturntowarehouse' +import { typeValues, brandDown, fetchByUseOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons' export default { name: 'xuanzecheliang', @@ -128,22 +105,13 @@ export default { }, data() { return { - createPage: '', - dialogVisible: false, // 弹窗 isSearchShow: false, searchxianshitit: '显示查询条件', - btndisabled: false, viewState: 1, // 1、列表 2、添加-车辆预定 3、编辑 4、查看 5、订金-定金收取 // 查询 ----------- carbrand_list: [], // 品牌 - vehicleFunction_list: [], // 功能 - productLine_list: [], // 系列 - gearboxType_list: [], // 变速箱 - driveForm_list: [], // 驱动 - emissionStandard_list: [], // 排放标准 - power_list: [], // 马力 - fuelType_list: [], // 燃料 - vehicleVersion_list: [], // 版本 + carColor_list: [], // 功能 + location_list: [], // 版本 tableKey: 0, list: [], sids: [], @@ -155,30 +123,39 @@ export default { total: 0, params: { brandSid: '', - driveForm: '', - emissionStandard: '', - fuelType: '', - gearboxType: '', - lockedState: '', - power: '', - productLine: '', - vehicleState: '', - vehicleType: '', - vehicleVersion: '', + modelNameAndCode: '', + vinNo: '', + carColorKey: '', + location: '', vinNoList: [], userSid: '' } }, - selectDate: undefined, - temp: {}, // 添加和编辑 - vinNoList: [], - depositVehicleList: [], - visible: true, - hetongdanganguanliInfoShow: false - // ------------------------------------ + vinNoList: [] } }, methods: { + init() { + typeValues({ type: 'bodyColor' }).then((resp) => { + if (resp.success) { + this.carColor_list = resp.data + } + }) + getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => { + if (res.success) { + brandDown({ useOrg: res.data }).then((resp) => { + if (resp.success) { + this.carbrand_list = resp.data + } + }) + fetchByUseOrgSid({ sid: res.data }).then((respsone) => { + if (respsone.success) { + this.location_list = respsone.data + } + }) + } + }) + }, // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow @@ -194,140 +171,38 @@ export default { this.listQuery.total = 0 this.listQuery.size = 5 this.listQuery.params.brandSid = '' - this.listQuery.params.driveForm = '' - this.listQuery.params.emissionStandard = '' - this.listQuery.params.fuelType = '' - this.listQuery.params.gearboxType = '' - this.listQuery.params.lockedState = '' - this.listQuery.params.power = '' - this.listQuery.params.productLine = '' - this.listQuery.params.vehicleState = '' - this.listQuery.params.vehicleType = '' + this.listQuery.params.modelNameAndCode = '' + this.listQuery.params.vinNo = '' + this.listQuery.params.carColorKey = '' + this.listQuery.params.location = '' + this.listQuery.params.userSid = '' this.getList() }, // 勾选 handleSelectionChange(row) { - console.log('row', row) - this.depositVehicleList = row const aa = [] row.forEach((element) => { - aa.push(element.sid) + aa.push({ + configName: element.configName, + configSid: element.configSid, + priceDate: element.priceDate, + vehicleAlias: element.vehicleAlias, + vinNo: element.vinNo + }) }) this.sids = aa - console.log('选择sid', this.sids) - }, - // 品牌下拉 - getType() { - // 品牌下拉 - req.selectBrand().then((res) => { - if (res.code === '200') { - this.carbrand_list = res.data - console.log('下拉框请求品牌', res.data) - } - }) - // 功能 - req.pullDown({ - type: 'vehicleFunction' - }).then((res) => { - if (res.code === '200') { - this.vehicleFunction_list = res.data - console.log('下拉框请求功能', res.data) - } - }) - // 系列 - req.pullDown({ - type: 'productLine' - }).then((res) => { - if (res.code === '200') { - this.productLine_list = res.data - console.log('下拉框请求系列', res.data) - } - }) - // 变速箱 - req.pullDown({ - type: 'gearbox' - }).then((res) => { - if (res.code === '200') { - this.gearboxType_list = res.data - console.log('下拉框请求变速箱', res.data) - } - }) - // 驱动 - req.pullDown({ - type: 'driver' - }).then((res) => { - if (res.code === '200') { - this.driveForm_list = res.data - console.log('下拉框请求驱动', res.data) - } - }) - // 排放标准 - req.pullDown({ - type: 'emissionStandard' - }).then((res) => { - if (res.code === '200') { - this.emissionStandard_list = res.data - console.log('下拉框请求排放标准', res.data) - } - }) - // 马力 - req.pullDown({ - type: 'horsepower' - }).then((res) => { - if (res.code === '200') { - this.power_list = res.data - console.log('下拉框请求马力', res.data) - } - }) - // 燃料 - req.pullDown({ - type: 'fuelType' - }).then((res) => { - if (res.code === '200') { - this.fuelType_list = res.data - console.log('下拉框请求燃料', res.data) - } - }) - // 版本 - req.pullDown({ - type: 'vehicleVersion' - }).then((res) => { - if (res.code === '200') { - this.vehicleVersion_list = res.data - console.log('下拉框请求版本', res.data) - } - }) }, // 确认 handleConfirm() { if (this.sids.length > 0) { - if (this.vinNoList.length > 0) { - console.log('已选择的数据', this.vinNoList) - for (var i = 0; i < this.vinNoList.length; i++) { - for (var j = 0; j < this.depositVehicleList.length; j++) { - if (this.vinNoList[i] === this.depositVehicleList[j].vinNo) { - const index = this.depositVehicleList.findIndex(val => { - return this.depositVehicleList[j].vinNo === this.vinNoList[i] - }) - this.depositVehicleList.splice(index, 1) - console.log('进入if判断', index) - } - } - } - } - this.$emit('handleVehicle', this.depositVehicleList) - this.$nextTick(() => { - this.$refs.multipleTable.clearSelection() - }) - this.handleReturn() + this.$emit('handleVehicle', this.sids) } else { this.$notify({ title: '提示', - message: '没有选择车辆!', + message: '请选择至少一条车辆记录!', type: 'error', duration: 2000 }) - return } }, // 返回 @@ -364,7 +239,7 @@ export default { // 排除已选信息 loadVinNo(vinNoList) { this.listQuery.params.vinNoList = vinNoList - this.getType() + this.init() this.getList() } } diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue index 7720cc1126..ac8d06f872 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue @@ -2,7 +2,7 @@
-
选择车辆页面
+
车辆查询
确定 关闭 @@ -13,52 +13,27 @@ {{ searchxianshitit }}
- - - + + + - - - - - - - - - - - - - - - - - - - + + - - - - + + - - - + + + - - - + + + - - - - - -
查询 @@ -67,7 +42,7 @@
-
现车库存列表
+
现车列表
@@ -119,7 +94,7 @@