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 78ee2ecfad..f5496d77ef 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 @@ -1933,7 +1933,10 @@ public class FinBillApplicationService extends MybatisBaseService ysSids = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid()); //已收金额 BigDecimal seYs = new BigDecimal("0"); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index 67009f6b44..6f371f730f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -212,11 +212,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService fileList = new ArrayList<>(); List clmmhtApplicationAppendxs = finBillFileService.fetchcyyzzBySid(sid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index d751a287fe..0751c69f1b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -33,6 +33,10 @@ public class AdvanceInvoiceDto implements Dto { private String invoicingUnit; @ApiModelProperty("是否领取原件") private String getOriginalValue; + @ApiModelProperty("开票类型key") + private String openTickTypeKey; + @ApiModelProperty("开票类型value") + private String openTickTypeValue; @ApiModelProperty("默认开票sid") private String openTickSid; @ApiModelProperty("默认开票名称") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index 6d16fb6f90..821b8afe29 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -32,6 +32,8 @@ public class AdvanceInvoiceInfoVo implements Vo { private String name; @ApiModelProperty("开票单位") private String invoicingUnit; + @ApiModelProperty("是否领取原件key") + private String getOriginalKey; @ApiModelProperty("是否领取原件") private String getOriginalValue; @ApiModelProperty("默认开票类型key") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 0a7110d68b..a972571776 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -214,6 +214,11 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey()); vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue()); vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate()); + if ("是".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){ + vo.setGetOriginalKey("1"); + }else if ("否".equals(finBillApplicationDetailsVo.getIsLQOrigInvoice())){ + vo.setGetOriginalKey("0"); + } vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice()); vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney()); @@ -509,6 +514,8 @@ public class AppBusAdvanceGinvoiceapplyService { finBillApplicationDto.setBillNo(dto.getBillNo()); finBillApplicationDto.setModelSid(dto.getModelSid()); finBillApplicationDto.setModelName(dto.getModelName()); + finBillApplicationDto.setOpenTickTypeKey(dto.getOpenTickTypeKey()); + finBillApplicationDto.setOpenTickTypeValue(dto.getOpenTickTypeValue()); String publishInfo = dto.getPublishInfo(); String[] split = publishInfo.split("-"); finBillApplicationDto.setDeptName(split[0]);