Browse Source

移动端开票

master
God 2 years ago
parent
commit
82b5211c60
  1. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java
  2. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
  3. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
  4. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java
  5. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java
  6. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
  7. 42
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  8. 1
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  9. 50
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java
  10. 50
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java
  11. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageInfoQuery.java
  12. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageQuery.java
  13. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java
  14. 45
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java
  15. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java
  16. 7
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java
  17. 50
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFegin.java
  18. 40
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFeginFallback.java
  19. 82
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillVehicleDto.java
  20. 155
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillApplicationDto.java
  21. 38
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillCompleteDto.java
  22. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeQuery.java
  23. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeVo.java
  24. 45
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillTaskQuery.java
  25. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/SubmitFinBillApplicationDto.java
  26. 144
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  27. 35
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/billApplication/AppFinBillApplicationRest.java

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationPageQuery.java

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

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@ -55,7 +55,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "开票申请表 视图数据详情", description = "开票申请表 视图数据详情")
public class FinBillApplicationDetailsVo implements Vo {
public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo implements Vo {
private String sid; // sid

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@ -78,9 +78,9 @@ public interface FinBillApplicationFeign {
@ResponseBody
public ResultBean<FinBillApplicationDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
/*************************流程管理接口********************************/
/*************************公司开票流程管理接口********************************/
@ApiOperation("提交开票申请审批流程")
@ApiOperation("开票申请审批流程")
@PostMapping("/submitFinBillApplication")
public ResultBean submitFinBillApplication(@RequestBody @Valid SubmitFinBillApplicationDto dto);

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationQuery.java

@ -71,4 +71,11 @@ public class FinBillApplicationQuery implements Query {
private String applyStartDate; // 申请开始日期
@ApiModelProperty("申请结束日期")
private String applyEndDate; // 申请结束日期
@ApiModelProperty("是否欠款开票")
private String isArrears; // 是否欠款开票
@ApiModelProperty("承诺回款开始日期")
private String returnedMoneyStartDate; // 承诺回款开始日期
@ApiModelProperty("承诺回款结束日期")
private String returnedMoneyEndDate; // 承诺回款结束日期
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationVo.java

@ -70,4 +70,11 @@ public class FinBillApplicationVo implements Vo {
private String applyDate;
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("欠款金额")
private String arrearsMoney; // 欠款金额
@ApiModelProperty("承诺回款日期")
private String returnedMoneyDate; // 承诺回款日期
@ApiModelProperty("欠款开票原因value")
private String arrearsOpenYYValue; // 欠款开票原因value
}

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@ -112,7 +112,13 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
public ResultBean complete(FinBillCompleteDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
String businessSid = query.getBusinessSid();
FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(businessSid);
if ("003".equals(finBillApplication.getBillStateKey())){
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
}else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
return finBillApplicationService.complete(bv);
}

42
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -158,6 +158,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
String isArrears = query.getIsArrears();
if ("是".equals(isArrears)){
qw.eq("fba.billStateKey","003");
}else {
qw.ne("fba.billStateKey","003");
}
qw.eq("fba.useOrgSid", query.getUseOrgSid());
qw.eq("fba.createBySid", query.getCreateBySid());
if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
@ -186,6 +192,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
);
String returnedMoneyStartDate = query.getReturnedMoneyStartDate();
String returnedMoneyEndDate = query.getReturnedMoneyEndDate();
qw.apply(StringUtils.isNotEmpty(returnedMoneyStartDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') >= date_format('" + returnedMoneyStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(returnedMoneyEndDate), "date_format (fba.returnedMoneyDate,'%Y-%m-%d') <= date_format('" + returnedMoneyEndDate + "','%Y-%m-%d')"
);
return qw;
}
@ -729,9 +740,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
if ("003".equals(finBillApplication.getBillStateKey())){
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
}else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
//判断是否是高低开,若是,则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
@ -751,9 +766,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
bv.setFormVariables(variables);
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
//查询业务信息
FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
if ("003".equals(finBillApplication.getBillStateKey())){
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
}else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
//判断是否是高低开,若是,则isTrue网关参数为true=============添加
String contractNo = finBillApplication.getContractNo();
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
@ -931,7 +950,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
String billStateKey = dto.getBillStateKey();
if ("003".equals(billStateKey)){
bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
}else {
bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
@ -1012,11 +1036,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
public IPage<AppBillApplicationPageVo> getInvoicedApplyList(PagerQuery<AppBillApplicationPageQuery> pagerQuery) {
IPage<AppBillApplicationPageQuery> page = PagerUtil.queryToPage(pagerQuery);
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
pagerQuery.getParams().setUseOrgSid(useOrgSid);
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getParams().getOrgPath()).getData();
QueryWrapper<AppBillApplicationPageVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
qw.eq("fba.useOrgSid", pagerQuery.getParams().getUseOrgSid());
if (StringUtils.isNotBlank(useOrgSid)) {
qw.eq("fba.useOrgSid", useOrgSid);
}
if ("是".equals(pagerQuery.getParams().getIsArrears())){
qw.eq("fba.billStateKey","003");
}else {
qw.ne("fba.billStateKey","003");
}
String name = pagerQuery.getParams().getName();
IPage<AppBillApplicationPageVo> iPage = baseMapper.getInvoicedApplyList(page, qw, name);

1
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -13,6 +13,7 @@ public enum ProcDefEnum {
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),

50
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java

@ -72,4 +72,54 @@ public class BillApplicationIInfoDto implements Dto {
@ApiModelProperty("合同sid")
@JsonProperty("contractSid")
private String contractSid;
@ApiModelProperty("发起人姓名")
private String createByName;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
}

50
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java

@ -76,4 +76,54 @@ public class BillApplicationIInfoVo implements Vo {
@ApiModelProperty("是否能填写开票价")
private Boolean canEdit;
@ApiModelProperty("发起人姓名")
private String createByName;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationPageInfoQuery.java

@ -8,6 +8,6 @@ import lombok.Data;
public class BillApplicationPageInfoQuery implements Query {
private static final long serialVersionUID = -9141834631431139059L;
@ApiModelProperty("")
@ApiModelProperty("sid")
private String sid;
}

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

@ -12,8 +12,10 @@ public class BillApplicationPageQuery implements Query {
private static final long serialVersionUID = 3712146601846318237L;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("是否欠款开票")
private String isArrears;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillTrailerDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerDto.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.yxt.common.core.dto.Dto;

45
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillFileDto.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java

@ -23,45 +23,50 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
package com.yxt.anrui.terminal.api.autoservice.invoiced;
import com.yxt.common.core.dto.Dto;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillFileDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillfile.FinBillFileDto <br/>
* Description: 开票附件关联表 数据传输对象. <br/>
* Project: anrui-fin(开票挂车信息) <br/>
* File: FinBillTrailerVo.java <br/>
* Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo <br/>
* Description: 开票挂车信息表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 17:07:20 <br/>
* Makedate: 2023-04-06 16:41:28 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票附件关联表 数据传输对象", description = "开票附件关联表 数据传输对象")
public class FinBillFileDto implements Dto {
@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象")
public class FinBillTrailerVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("主车车架号")
private String vinNo; // 主车车架号
@ApiModelProperty("挂车车架号")
private String gcVinNo; // 挂车车架号
@ApiModelProperty("开票类型key")
private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billTypeValue; // 开票类型value
@ApiModelProperty("开票名称sid")
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("附件类型")
private String fileType; // 附件类型
@ApiModelProperty("附件sid")
private String fileSid; // 附件sid
@ApiModelProperty("附件路径")
private String fileUrl; // 附件路径
@ApiModelProperty("附件名称")
private String fileName; // 附件名称
@ApiModelProperty("附件类型")
private String attachType; // 附件类型
}
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java

@ -26,4 +26,12 @@ public class VinListDto implements Dto {
@ApiModelProperty("开票类型")
@JsonProperty("invoiceTypeKey")
private String billTypeKey;
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
}

7
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@ -27,4 +27,11 @@ public class VinListVo implements Vo {
@ApiModelProperty("开票类型")
@JsonProperty("invoiceTypeKey")
private String billTypeKey;
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
}

50
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFegin.java

@ -1,50 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
@Api(tags = "开票申请")
@FeignClient(
contextId = "anrui-terminal-AppFinBillApplicationFegin",
name = "anrui-terminal",
path = "finance/v1/billApplication",
fallback = AppFinBillApplicationFeginFallback.class)
public interface AppFinBillApplicationFegin {
/*-----------------------------------------流程------------------------------------------*/
@ApiOperation("提交开票申请")
@PostMapping("/submitBillApplicationInfo")
@ResponseBody
ResultBean submitBillApplicationInfo(@RequestBody SubmitFinBillApplicationDto dto);
@ApiOperation("办理")
@PutMapping("/agreeBillApplicationInfo")
@ResponseBody
ResultBean agreeBillApplicationInfo(@RequestBody SaleOrderRetVehDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectBillApplicationInfo")
@ResponseBody
ResultBean rejectBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallBillApplicationInfo")
@ResponseBody
ResultBean recallBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopBillApplicationInfo")
@ResponseBody
ResultBean stopBillApplicationInfo(@RequestBody SaleOrderRetVehTaskQuery query);
}

40
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/AppFinBillApplicationFeginFallback.java

@ -1,40 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SubmitOrderRetVehDto;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.anrui.terminal.api.finance.collectionConfirm.AppFinCollectionConfirmationFeignFallback;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@Component
public class AppFinBillApplicationFeginFallback implements AppFinBillApplicationFegin{
@Override
public ResultBean submitBillApplicationInfo(SubmitFinBillApplicationDto dto) {
return null;
}
@Override
public ResultBean agreeBillApplicationInfo(SaleOrderRetVehDto dto) {
return null;
}
@Override
public ResultBean rejectBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean recallBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean stopBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
}

82
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/FinBillVehicleDto.java

@ -1,82 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillVehicleDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto <br/>
* Description: 开票车辆信息表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 10:27:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票车辆信息表 数据传输对象", description = "开票车辆信息表 数据传输对象")
public class FinBillVehicleDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("开票类型key")
private String billTypeKey; // 开票类型key
@ApiModelProperty("开票类型value")
private String billTypeValue; // 开票类型value
@ApiModelProperty("挂靠公司sid")
private String billNameSid; // 挂靠公司sid
@ApiModelProperty("挂靠公司名称")
private String billName; // 挂靠公司名称
@ApiModelProperty("开票申请单sid")
private String billAppSid; // 开票申请单sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("开票名称sid")
private String openTickSid; // 开票名称sid
@ApiModelProperty("开票名称")
private String openTickName; // 开票名称
@ApiModelProperty("合格证状态key")
private String certificateStateKey; // 合格证状态key
@ApiModelProperty("合格证状态value")
private String certificateStateValue; // 合格证状态value
@ApiModelProperty("开票信息")
private String openTickRemarks; // 开票信息
}

155
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillApplicationDto.java

@ -1,155 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillFileDto;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillTrailerDto;
import com.yxt.anrui.terminal.api.finance.billApplication.FinBillVehicleDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-fin(开票申请管理) <br/>
* File: FinBillApplicationDto.java <br/>
* Class: com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto <br/>
* Description: 开票申请表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-26 10:27:46 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "开票申请表 数据传输对象", description = "开票申请表 数据传输对象")
public class AppFinBillApplicationDto implements Dto {
private String sid; // sid
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("合同sid")
private String contractSid; // 合同sid
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("单台开票金额")
private String oneBillMoney; // 单台开票金额
@ApiModelProperty("开票金额合计")
private String totalBillMoney; // 开票金额合计
@ApiModelProperty("申请日期")
private String applyDate; // 申请日期
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("环节定义的sid")
private String nodeSid;
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("流程实例的sid")
private String procInstSid;
@ApiModelProperty(value = "是否延迟开票")
private String isDelayBill;
@ApiModelProperty(value = "是否高低开")
private String isHighAndLowOpen;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("当前用户部门全路径")
private String orgSidPath;
@ApiModelProperty(value = "发起部门sid")
private String deptSid;
@ApiModelProperty(value = "发起部门名称")
private String deptName;
@ApiModelProperty(value = "销售专员sid")
private String staffSid;
@ApiModelProperty(value = "销售专员名称")
private String staffName;
@ApiModelProperty(value = "销售部门sid")
private String saleDeptSid;
@ApiModelProperty(value = "销售部门名称")
private String saleDeptName;
@ApiModelProperty(value = "销售类型key")
private String saleTypeKey;
@ApiModelProperty(value = "销售类型value")
private String saleTypeValue;
@ApiModelProperty(value = "开票单位sid")
private String openTickUnitSid;
@ApiModelProperty(value = "开票单位名称")
private String openTickUnitName;
@ApiModelProperty(value = "是否领取发票原件")
private String isLQOrigInvoice;
@ApiModelProperty(value = "开票类型key")
private String openTickTypeKey;
@ApiModelProperty(value = "开票类型value")
private String openTickTypeValue;
@ApiModelProperty(value = "开票名称sid")
private String openTickSid;
@ApiModelProperty(value = "开票名称")
private String openTickName;
@ApiModelProperty(value = "欠款金额")
private String arrearsMoney;
@ApiModelProperty(value = "承诺回款日期")
private String returnedMoneyDate;
@ApiModelProperty(value = "欠款开票原因key")
private String arrearsOpenYYKey;
@ApiModelProperty(value = "欠款开票原因value")
private String arrearsOpenYYValue;
@ApiModelProperty("开票状态Value")
private String billStateValue; // 开票状态Value
@ApiModelProperty("开票状态key")
private String billStateKey;// 开票状态key
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型名称")
private String modelName; // 车型名称
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("开票车辆信息")
private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
@ApiModelProperty("开票挂车信息")
private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
@ApiModelProperty("客户开票申请书附件信息")
private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
@ApiModelProperty("开票信息确认书附件信息")
private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
@ApiModelProperty("车辆登记合同附件信息")
private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
}

38
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillCompleteDto.java

@ -1,38 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 14:57
* @Description
*/
@Data
public class AppFinBillCompleteDto implements Dto {
private static final long serialVersionUID = 6378752532534735663L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误:orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeQuery.java

@ -1,23 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:04
* @Description
*/
@Data
public class AppFinBillNodeQuery implements Query {
private static final long serialVersionUID = 9117613683840483366L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
}

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillNodeVo.java

@ -1,26 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:03
* @Description
*/
@Data
public class AppFinBillNodeVo implements Vo {
private static final long serialVersionUID = -833419512294877848L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

45
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/AppFinBillTaskQuery.java

@ -1,45 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:06
* @Description
*/
@Data
public class AppFinBillTaskQuery implements Query {
private static final long serialVersionUID = 1288615499873178778L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/billApplication/flowable/SubmitFinBillApplicationDto.java

@ -1,23 +0,0 @@
package com.yxt.anrui.terminal.api.finance.billApplication.flowable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author liuguohui
* @version 1.0
* @description
* @date 2022/04/13
*/
@ApiModel("提交")
@Data
public class SubmitFinBillApplicationDto extends AppFinBillApplicationDto {
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

144
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -10,6 +10,10 @@ import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@ -26,9 +30,11 @@ import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyInfoVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExamineInfoVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExaminePageVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.base.utils.StringUtils;
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.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -68,41 +74,133 @@ public class InvoicedService {
public ResultBean<BillApplicationIInfoVo> getInvoicedApply(BillApplicationPageInfoQuery query) {
ResultBean<BillApplicationIInfoVo> rb = ResultBean.fireFail();
BillApplicationIInfoVo vo = new BillApplicationIInfoVo();
AppBillApplicationPageInfoQuery appBillApplicationPageInfoQuery = new AppBillApplicationPageInfoQuery();
BeanUtil.copyProperties(query,appBillApplicationPageInfoQuery);
ResultBean<AppBillApplicationIInfoVo> resultBean = finBillApplicationFeign.getInvoicedApply(appBillApplicationPageInfoQuery);
ResultBean<FinBillApplicationDetailsVo> resultBean = finBillApplicationFeign.fetchDetailsBySid(query.getSid());
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppBillApplicationIInfoVo appBillApplicationIInfoVo = resultBean.getData();
BeanUtil.copyProperties(appBillApplicationIInfoVo, vo);
FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
BeanUtil.copyProperties(finBillApplicationDetailsVo, vo);
vo.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
//车辆信息
List<VinListVo> vinListVos = new ArrayList<>();
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
VinListVo vinListVo = new VinListVo();
vinListVo.setVIN(finBillVehicle.getVinNo());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateStateValue(finBillVehicle.getCertificateStateValue());
vinListVo.setBillTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setBillTypeValue(finBillVehicle.getBillTypeValue());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setOpenTickRemarks(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
}
vo.setVinList(vinListVos);
//挂车信息
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
List<FinBillTrailerVo> finBillTrailerVos = new ArrayList<>();
if (finBillTrailers != null && finBillTrailers.size() > 0){
for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) {
FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo);
finBillTrailerVos.add(finBillTrailerVo);
}
}
vo.setFinBillTrailers(finBillTrailerVos);
//附件信息
List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs();
List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
if (khkpsqsApplicationAppendxs.size() > 0){
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
}
}
if (kpxxqrsApplicationAppendxs.size() > 0){
for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
}
}
if (cldjhtApplicationAppendxs.size() > 0){
for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}
}
return rb.success().setData(vo);
}
public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) {
AppBillApplicationIInfoDto appBillApplicationIInfoDto = new AppBillApplicationIInfoDto();
BeanUtil.copyProperties(dto, appBillApplicationIInfoDto);
ResultBean resultBean = finBillApplicationFeign.saveInvoicedApplyInfo(appBillApplicationIInfoDto);
FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
BeanUtil.copyProperties(dto, finBillApplicationDto);
finBillApplicationDto.setCreateBySid(dto.getUserSid());
//开票车辆信息
List<VinListDto> vinList = dto.getVinList();
List<FinBillVehicleDto> finBillVehicleDtos = new ArrayList<>();
for (VinListDto vinListDto : vinList) {
FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
finBillVehicleDto.setVinNo(vinListDto.getVIN());
finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateStateValue());
finBillVehicleDto.setBillTypeKey(vinListDto.getBillTypeKey());
finBillVehicleDto.setBillTypeValue(vinListDto.getBillTypeValue());
finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName());
finBillVehicleDto.setOpenTickRemarks(vinListDto.getOpenTickRemarks());
finBillVehicleDtos.add(finBillVehicleDto);
}
finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos);
//开票挂车信息
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto> finBillTrailerDtos = new ArrayList<>();
com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto();
if (finBillTrailers != null && finBillTrailers.size() > 0){
for (FinBillTrailerDto finBillTrailer : finBillTrailers) {
BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto);
finBillTrailerDtos.add(finBillTrailerDto);
}
}
finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
//附件信息
List<String> customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书
List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
if (customerInvoiceApplyImages != null){
for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(customerInvoiceApplyImage);
khkpsqsApplicationAppendxs.add(finBillFileDto);
}
}
if (invoiceApplyConfirmImages != null){
for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(invoiceApplyConfirmImage);
kpxxqrsApplicationAppendxs.add(finBillFileDto);
}
}
if (registerContractImages != null){
for (String registerContractImage : registerContractImages) {
FinBillFileDto finBillFileDto = new FinBillFileDto();
finBillFileDto.setFileUrl(registerContractImage);
cldjhtApplicationAppendxs.add(finBillFileDto);
}
}
finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
ResultBean resultBean = finBillApplicationFeign.save(finBillApplicationDto);
return resultBean;
}
public ResultBean agreeInvoicedInfo(InvoicedDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
BeanUtil.copyProperties(dto, finBillCompleteDto);
finBillCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = finBillApplicationFeign.complete(finBillCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -174,9 +272,9 @@ public class InvoicedService {
public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) {
ResultBean rb = ResultBean.fireFail();
SubmitBillApplicationDto submitBillApplicationDto = new SubmitBillApplicationDto();
SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto();
BeanUtil.copyProperties(dto, submitBillApplicationDto);
ResultBean resultBean = finBillApplicationFeign.submitBillApplication(submitBillApplicationDto);
ResultBean resultBean = finBillApplicationFeign.submitFinBillApplication(submitBillApplicationDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}

35
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/billApplication/AppFinBillApplicationRest.java

@ -1,35 +0,0 @@
package com.yxt.anrui.terminal.biz.finance.billApplication;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehDto;
import com.yxt.anrui.terminal.api.autoservice.saleOrderRetVeh.flowable.SaleOrderRetVehTaskQuery;
import com.yxt.anrui.terminal.api.finance.billApplication.AppFinBillApplicationFegin;
import com.yxt.anrui.terminal.api.finance.billApplication.flowable.SubmitFinBillApplicationDto;
import com.yxt.common.core.result.ResultBean;
public class AppFinBillApplicationRest implements AppFinBillApplicationFegin {
@Override
public ResultBean submitBillApplicationInfo(SubmitFinBillApplicationDto dto) {
return null;
}
@Override
public ResultBean agreeBillApplicationInfo(SaleOrderRetVehDto dto) {
return null;
}
@Override
public ResultBean rejectBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean recallBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
@Override
public ResultBean stopBillApplicationInfo(SaleOrderRetVehTaskQuery query) {
return null;
}
}
Loading…
Cancel
Save