提交 e6920ee1 authored 作者: 马路路's avatar 马路路

订单报价-计费管理-车主、货主计费-开票配置字段更新

上级 d991e0ba
...@@ -195,7 +195,7 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai ...@@ -195,7 +195,7 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
rowData.add(new ExcelData(dto.getGoodsName())); rowData.add(new ExcelData(dto.getGoodsName()));
rowData.add(new ExcelData(dto.getTruckNo())); rowData.add(new ExcelData(dto.getTruckNo()));
// 开票配置 // 开票配置
rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType()))); rowData.add(new ExcelData(dto.getInvoiceConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoiceConfigType())));
rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName())); rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType()))); rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
rowData.add(new ExcelData(dto.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag()))); rowData.add(new ExcelData(dto.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));
......
...@@ -584,7 +584,7 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS ...@@ -584,7 +584,7 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2))); rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName())); rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType()))); rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType()))); rowData.add(new ExcelData(dto.getInvoiceConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoiceConfigType())));
rowData.add(new ExcelData(dto.getOrderNo())); rowData.add(new ExcelData(dto.getOrderNo()));
rowData.add(new ExcelData(dto.getSettlementNo())); rowData.add(new ExcelData(dto.getSettlementNo()));
rowData.add(new ExcelData(dto.getCreateTime())); rowData.add(new ExcelData(dto.getCreateTime()));
......
...@@ -79,7 +79,7 @@ public class CarrierPageSettlementDriverDetailVO { ...@@ -79,7 +79,7 @@ public class CarrierPageSettlementDriverDetailVO {
@Schema(description = "开票公司简称") @Schema(description = "开票公司简称")
private String invoicingCompanyShorterName; private String invoicingCompanyShorterName;
@Schema(description = "开票配置") @Schema(description = "开票配置")
private Integer invoicingConfigType; private Integer invoiceConfigType;
@MoneyOutConvert @MoneyOutConvert
@Schema(description = "平台服务费") @Schema(description = "平台服务费")
private BigDecimal platformServiceFee; private BigDecimal platformServiceFee;
......
...@@ -75,7 +75,7 @@ public class CarrierPageSettlementOwnerDetailVO { ...@@ -75,7 +75,7 @@ public class CarrierPageSettlementOwnerDetailVO {
@Schema(description = "开票服务率") @Schema(description = "开票服务率")
private BigDecimal invoiceServiceFeeRate; private BigDecimal invoiceServiceFeeRate;
@Schema(description = "开票配置:0-否,1-是") @Schema(description = "开票配置:0-否,1-是")
private Integer invoicingConfigType; private Integer invoiceConfigType;
@MoneyOutConvert @MoneyOutConvert
@Schema(description = "借款抵扣金额") @Schema(description = "借款抵扣金额")
private BigDecimal loanFreight; private BigDecimal loanFreight;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论