From 589853104c8dceb43d9370be4d19b30401f0b505 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 17 Apr 2023 13:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBillApplicationIInfoVo.java | 4 + .../FinBillApplicationService.java | 9 +- .../invoiced/BillApplicationIInfoDto.java | 133 ++++++----------- .../invoiced/BillApplicationIInfoVo.java | 137 ++++++------------ .../invoiced/FinBillTrailerVo.java | 6 - .../api/autoservice/invoiced/VinListDto.java | 27 +--- .../api/autoservice/invoiced/VinListVo.java | 26 +--- .../autoservice/invoiced/InvoicedService.java | 38 +++-- .../销售订单审批下载模板/xsddsp.ftl | 88 +++++------ 9 files changed, 181 insertions(+), 287 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java index e5d1e3e837..b4b597dc68 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppBillApplicationIInfoVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.fin.api.finbillapplication; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -41,6 +42,9 @@ public class AppBillApplicationIInfoVo implements Vo { @ApiModelProperty("车辆集合") private List vinList; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("开票状态") private String billState; 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 6b38d6f853..368907d34e 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 @@ -225,6 +225,13 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); vo.setFinBillVehicles(finBillVehicleVos); List finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); - if (finBillTrailerVos != null) { + if (finBillTrailerVos != null && finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 5c22a011a7..74854edba1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -11,115 +11,64 @@ import java.util.List; public class BillApplicationIInfoDto implements Dto { private static final long serialVersionUID = -3912119646277339550L; - @ApiModelProperty("业务sid") private String sid; - - @ApiModelProperty("用户sid") - @JsonProperty("userSid") - private String userSid; - - @ApiModelProperty("合同编号") - @JsonProperty("contractId") - private String contractNo; - - @ApiModelProperty("开票总价") - @JsonProperty("invoiceTotal") - private String totalBillMoney; - - @ApiModelProperty("单台开票价") - @JsonProperty("invoiceMoney") - private String oneBillMoney; - - @ApiModelProperty("客户名称") - @JsonProperty("customer") - private String customerName; - + @ApiModelProperty(value = "销售类型value") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty(value = "销售部门名称") + private String sellerDept; + @ApiModelProperty(value = "销售专员名称") + private String sellerName; @ApiModelProperty("申请日期") - @JsonProperty("date") - private String applyDate; - - @ApiModelProperty("备注") - private String remarks; - + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty(value = "开票单位名称") + private String invoicingUnit; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; @ApiModelProperty("车辆集合") private List vinList; - + @ApiModelProperty("开票总价") + private String invoiceTotal; @ApiModelProperty("开票状态") - @JsonProperty("invoiceState") - private String billState; // 开票状态 - + private String invoiceState; @ApiModelProperty("开票状态") - @JsonProperty("invoiceStateKey") - private String billStateKey;// 开票状态key - + private String invoiceStateKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("证件") + private List idCardImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; - @ApiModelProperty("车辆登记合同") private List registerContractImages; - - @ApiModelProperty("开票信息确认书") + @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("任务id") private String taskId; - + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("流程实列id") - @JsonProperty("procInsId") - private String procInstSid; - + private String procInsId; @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 contractId; @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 - + @ApiModelProperty("是否可以编辑开票价") + private Boolean isCanEdit; // 是否可以编辑开票价 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index 5cf69b745c..746dca2938 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -13,117 +13,62 @@ public class BillApplicationIInfoVo implements Vo { @ApiModelProperty("业务sid") private String sid; - - @ApiModelProperty("用户sid") - @JsonProperty("userSid") - private String createBySid; - - @ApiModelProperty("合同编号") - @JsonProperty("contractId") - private String contractNo; - - @ApiModelProperty("开票总价") - @JsonProperty("invoiceTotal") - private String totalBillMoney; - - @ApiModelProperty("单台开票价") - @JsonProperty("invoiceMoney") - private String oneBillMoney; - - @ApiModelProperty("客户名称") - @JsonProperty("customer") - private String customerName; - + @ApiModelProperty(value = "销售类型value") + private String saleType; + @ApiModelProperty("部门-人员名") + private String publishInfo; + @ApiModelProperty(value = "销售部门名称") + private String sellerDept; + @ApiModelProperty(value = "销售专员名称") + private String sellerName; @ApiModelProperty("申请日期") - @JsonProperty("date") - private String applyDate; - - @ApiModelProperty("备注") - private String remarks; - + private String date; + @ApiModelProperty("客户名称") + private String name; + @ApiModelProperty(value = "开票单位名称") + private String invoicingUnit; + @ApiModelProperty(value = "开票类型key") + private String openTickTypeKey; + @ApiModelProperty(value = "开票类型value") + private String openTickTypeValue; + @ApiModelProperty(value = "开票名称") + private String openTickName; + @ApiModelProperty("单台开票价") + private String invoiceMoney; @ApiModelProperty("车辆集合") private List vinList; - + @ApiModelProperty("开票总价") + private String invoiceTotal; @ApiModelProperty("开票状态") - @JsonProperty("invoiceState") - private String billState; - + private String invoiceState; @ApiModelProperty("开票状态") - @JsonProperty("invoiceStateKey") - private String billStateKey; - + private String invoiceStateKey; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("开票挂车信息") + private List finBillTrailers; // 开票挂车信息 + @ApiModelProperty("证件") + private List idCardImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; - @ApiModelProperty("车辆登记合同") private List registerContractImages; - - @ApiModelProperty("开票信息确认书") + @ApiModelProperty("确认书") private List invoiceApplyConfirmImages; - @ApiModelProperty("任务id") - @JsonProperty("") private String taskId; - + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织全路径") + private String orgPath; @ApiModelProperty("流程实列id") - @JsonProperty("procInsId") - private String procInstId; - + private String procInsId; @ApiModelProperty("合同sid") - @JsonProperty("contractSid") private String contractSid; - - @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 contractId; @ApiModelProperty("单据编号") private String billNo; // 单据编号 - @ApiModelProperty("开票挂车信息") - private List finBillTrailers; // 开票挂车信息 - + @ApiModelProperty("是否可以编辑开票价") + private Boolean isCanEdit; // 是否可以编辑开票价 } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index e75ee24b66..e4fd67d221 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -48,10 +48,6 @@ import lombok.Data; @ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象") public class FinBillTrailerVo implements Vo { - private String sid; // sid - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 @ApiModelProperty("主车车架号") private String vinNo; // 主车车架号 @ApiModelProperty("挂车车架号") @@ -60,8 +56,6 @@ public class FinBillTrailerVo implements Vo { private String billTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billTypeValue; // 开票类型value - @ApiModelProperty("开票名称sid") - private String openTickSid; // 开票名称sid @ApiModelProperty("开票名称") private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java index 677815a943..78ed96172f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListDto.java @@ -10,28 +10,17 @@ public class VinListDto implements Dto { private static final long serialVersionUID = 1941205415631089700L; @ApiModelProperty("车架号") - @JsonProperty("vin") - private String VIN; - - @ApiModelProperty("开票名称") - private String invoiceName; - - @ApiModelProperty("开票名称") - private String invoiceNameKey; - + private String vin; @ApiModelProperty("开票类型") - @JsonProperty("invoiceType") - private String billTypeValue; - + private String invoiceTypeKey; @ApiModelProperty("开票类型") - @JsonProperty("invoiceTypeKey") - private String billTypeKey; - - + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; // 开票信息 @ApiModelProperty("合格证状态key") private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") - private String certificateStateValue; // 合格证状态value - @ApiModelProperty("开票信息") - private String openTickRemarks; // 开票信息 + private String certificateState; // 合格证状态value } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index 4edfb2030c..539f57a1a3 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -11,27 +11,17 @@ public class VinListVo implements Vo { private static final long serialVersionUID = -8613016702728614645L; @ApiModelProperty("车架号") - @JsonProperty("vin") - private String VIN; - - @ApiModelProperty("开票名称") - private String invoiceName; - - @ApiModelProperty("开票名称") - private String invoiceNameKey; - + private String vin; @ApiModelProperty("开票类型") - @JsonProperty("invoiceType") - private String billTypeValue; - + private String invoiceTypeKey; @ApiModelProperty("开票类型") - @JsonProperty("invoiceTypeKey") - private String billTypeKey; - + private String invoiceType; + @ApiModelProperty("开票名称") + private String invoiceName; + @ApiModelProperty("开票信息") + private String invoiceInfo; // 开票信息 @ApiModelProperty("合格证状态key") private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") - private String certificateStateValue; // 合格证状态value - @ApiModelProperty("开票信息") - private String openTickRemarks; // 开票信息 + private String certificateState; // 合格证状态value } 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 8edbb6d062..1cfd9b66a1 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 @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery; import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; import com.yxt.anrui.fin.api.finbillapplication.*; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto; import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery; @@ -58,6 +60,8 @@ public class InvoicedService { private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; public ResultBean> getInvoicedApplyList(PagerQuery pagerQuery) { @@ -80,19 +84,20 @@ public class InvoicedService { } FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); - vo.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //车辆信息 List vinListVos = new ArrayList<>(); List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); for (FinBillVehicleVo finBillVehicle : finBillVehicles) { VinListVo vinListVo = new VinListVo(); - vinListVo.setVIN(finBillVehicle.getVinNo()); + vinListVo.setVin(finBillVehicle.getVinNo()); vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey()); - vinListVo.setCertificateStateValue(finBillVehicle.getCertificateStateValue()); - vinListVo.setBillTypeKey(finBillVehicle.getBillTypeKey()); - vinListVo.setBillTypeValue(finBillVehicle.getBillTypeValue()); + vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); + vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); + vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); - vinListVo.setOpenTickRemarks(finBillVehicle.getOpenTickRemarks()); + vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVos.add(vinListVo); } vo.setVinList(vinListVos); @@ -129,6 +134,14 @@ public class InvoicedService { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + vo.setIsCanEdit(false); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + }else { + vo.setIsCanEdit(true); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + } return rb.success().setData(vo); } @@ -136,18 +149,21 @@ public class InvoicedService { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); BeanUtil.copyProperties(dto, finBillApplicationDto); finBillApplicationDto.setCreateBySid(dto.getUserSid()); + String publishInfo = dto.getPublishInfo(); + finBillApplicationDto.setDeptName(publishInfo.substring(0,publishInfo.lastIndexOf("-"))); + finBillApplicationDto.setCreateByName(publishInfo.substring(publishInfo.lastIndexOf("-"))); //开票车辆信息 List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (VinListDto vinListDto : vinList) { FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); - finBillVehicleDto.setVinNo(vinListDto.getVIN()); + finBillVehicleDto.setVinNo(vinListDto.getVin()); finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey()); - finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateStateValue()); - finBillVehicleDto.setBillTypeKey(vinListDto.getBillTypeKey()); - finBillVehicleDto.setBillTypeValue(vinListDto.getBillTypeValue()); + finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState()); + finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey()); + finBillVehicleDto.setBillTypeValue(vinListDto.getInvoiceType()); finBillVehicleDto.setOpenTickName(vinListDto.getInvoiceName()); - finBillVehicleDto.setOpenTickRemarks(vinListDto.getOpenTickRemarks()); + finBillVehicleDto.setOpenTickRemarks(vinListDto.getInvoiceInfo()); finBillVehicleDtos.add(finBillVehicleDto); } finBillApplicationDto.setFinBillVehicles(finBillVehicleDtos); diff --git a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl index 36f326f7da..891300ea53 100644 --- a/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl +++ b/工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.ftl @@ -2506,50 +2506,6 @@ - <#list photoPath64 as photo> - - - - - - - - - - - - - - - - - - - - - - - - - - - ${photo} - - - - - - - - - - - - - - @@ -2697,6 +2653,50 @@ + <#list photoPath64 as photo> + + + + + + + + + + + + + + + + + + + + + + + + + + + ${photo} + + + + + + + + + + + + + +