diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java index c7c7b6f80d..0c4717ffe1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingVo.java @@ -77,4 +77,9 @@ public class FinCompanyInvoicingVo implements Vo { private String orgSidPath; @ApiModelProperty("是否可以操作") private Boolean isCZ; + + @ApiModelProperty("开票类型value") + private String invoiceType; // + @ApiModelProperty("开票类型key") + private String invoiceTypeKey; } 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 a244f812d7..9cf0b7e5e7 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 @@ -347,12 +347,14 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setZrrdbcns(zrrdbcns); vo.setZfxsjt(zfxsjt); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } else { vo.setIsCanEdit(true); - } + }*/ + vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); return rb.success().setData(vo); } @@ -474,12 +476,14 @@ public class AppBusAdvanceGinvoiceapplyService { } vo.setZfxsjt(zfxsjt); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } else { vo.setIsCanEdit(true); - } + }*/ + vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); return rb.success().setData(vo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 572866581f..49146228d1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -311,12 +311,14 @@ public class InvoicedService { vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } else { vo.setIsCanEdit(true); - } + }*/ + vo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); return rb.success().setData(vo); } @@ -427,7 +429,7 @@ public class InvoicedService { billApplicationIInfoVo.setRegisterContractImages(registerContractImages); billApplicationIInfoVo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + /* if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { billApplicationIInfoVo.setIsCanEdit(false); billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { @@ -435,7 +437,10 @@ public class InvoicedService { } } else { billApplicationIInfoVo.setIsCanEdit(true); - } + }*/ + billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); + billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + billApplicationIInfoVo.setInvoiceTotal(busSalesOrderIsDTKPJVo.getOneBillMoney()); } else { billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid()); billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index c7badf698b..eb92edcd85 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -396,12 +396,14 @@ public class AppBusDeliveredApplyService { billApplicationIInfoVo.setRegisterContractImages(registerContractImages); billApplicationIInfoVo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(data.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { + /*if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { billApplicationIInfoVo.setIsCanEdit(false); billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } else { billApplicationIInfoVo.setIsCanEdit(true); - } + }*/ + billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); + billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } return null; }