From fcea7ec58c275285876880ea9cdd69bff9bb6f98 Mon Sep 17 00:00:00 2001 From: ligaode Date: Tue, 21 Jan 2025 13:58:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmSpecialRebateExcelVo.java | 51 +- .../ScmSpecialRebateQuery.java | 6 +- .../SpecialRebateCheckExcelVo.java | 50 +- .../SpectalRebateWithExcelVo.java | 6 +- .../api/scmvehrebate/ScmVehRebateExcelVo.java | 25 +- .../VehRebateCheckExcelVo.java | 52 +- .../scm/api/scmvehrebatewith/ExcelVo.java | 19 +- .../ScmSpecialRebateService.java | 18 +- .../ScmSpecialrebateCheckapplyRest.java | 3 + .../biz/scmvehrebate/ScmVehRebateService.java | 4 + .../ScmVehrebateCheckapplyRest.java | 5 +- .../ScmVehRebateWithRest.java | 3 - .../src/main/resources/ftl/dchd.ftl | 428 +-- .../src/main/resources/ftl/dchd1.ftl | 2744 ----------------- .../src/main/resources/ftl/zxhd.ftl | 428 +-- 15 files changed, 549 insertions(+), 3293 deletions(-) delete mode 100644 anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java index a025c670e6..f8152cd620 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmspecialrebate; import com.yxt.common.core.utils.ExportEntityMap; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -35,8 +36,6 @@ public class ScmSpecialRebateExcelVo { @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; - @ExportEntityMap(CnName = "状态", EnName = "state") - private String state; @ExportEntityMap(CnName = "分公司", EnName = "createOrgName") private String createOrgName; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") @@ -49,46 +48,50 @@ public class ScmSpecialRebateExcelVo { private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; - @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") - private String estimateRebate; + @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") + private BigDecimal estimateRebate; @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") - private String expectItureCost; + private BigDecimal expectItureCost; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") - private String expectTreatCost; + private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") - private String expectSuppCost; + private BigDecimal expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; - @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate") - private String withholdingDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") private String uploadDate; @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") - private String uploadMoney; - @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") - private String secondaryUploadDate; - @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") - private String secondaryUploadMoney; + private BigDecimal uploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") - private String stayDetermineMoney; - @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") + private BigDecimal stayDetermineMoney; + @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost") private BigDecimal onceItureCost; - @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost") private BigDecimal onceTreatCost; - @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost") private BigDecimal onceSuppCost; - @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") + @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") + private String secondaryUploadDate; + @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") + private BigDecimal secondaryUploadMoney; + @ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost") private BigDecimal secondItureCost; - @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost") private BigDecimal secondTreatCost; - @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost") private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") - private String diffAmount; + private BigDecimal diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") private String isAdjustment; - @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") - private String adjustmentMoney; + @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney") + private BigDecimal adjustmentMoney; + @ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney") + private BigDecimal itureAdjustmentMoney; + @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney") + private BigDecimal treatAdjustmentMoney; + @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney") + private BigDecimal suppAdjustmentMoney; @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") private String adjustmentRemarks; @ExportEntityMap(CnName = "备注", EnName = "remarks") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java index 6b86bede03..7f8a7fc6b8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java @@ -55,14 +55,14 @@ public class ScmSpecialRebateQuery implements Query { private String createOrgSid; @ApiModelProperty("分公司名称") private String createOrgName; - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; @ApiModelProperty("采购系统名称") private String purchaseSystemName; - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 @ApiModelProperty("创建开始日期") private String createStartTime; // 创建开始日期 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java index 279a16ad54..328d6bba3d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java @@ -40,7 +40,7 @@ public class SpecialRebateCheckExcelVo { private String createOrgName; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") private String purchaseSystemName; - @ExportEntityMap(CnName = "品牌名称", EnName = "brandName") + @ExportEntityMap(CnName = "品牌", EnName = "brandName") private String brandName; @ExportEntityMap(CnName = "创建日期", EnName = "createTime") private String createTime; @@ -48,44 +48,52 @@ public class SpecialRebateCheckExcelVo { private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; - @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") - private String estimateRebate; + @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") + private BigDecimal estimateRebate; @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") - private String expectItureCost; + private BigDecimal expectItureCost; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") - private String expectTreatCost; + private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") - private String expectSuppCost; + private BigDecimal expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") private String uploadDate; @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") - private String uploadMoney; - @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") - private String secondaryUploadDate; - @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") - private String secondaryUploadMoney; + private BigDecimal uploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") - private String stayDetermineMoney; - @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost") + private BigDecimal stayDetermineMoney; + @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost") private BigDecimal onceItureCost; - @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost") private BigDecimal onceTreatCost; - @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost") private BigDecimal onceSuppCost; - @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost") + @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") + private String secondaryUploadDate; + @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") + private BigDecimal secondaryUploadMoney; + @ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost") private BigDecimal secondItureCost; - @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost") private BigDecimal secondTreatCost; - @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost") private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") - private String diffAmount; + private BigDecimal diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") private String isAdjustment; - @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") - private String adjustmentMoney; + @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney") + private BigDecimal adjustmentMoney; + @ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney") + private BigDecimal itureAdjustmentMoney; + @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney") + private BigDecimal treatAdjustmentMoney; + @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney") + private BigDecimal suppAdjustmentMoney; @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") private String adjustmentRemarks; + @ExportEntityMap(CnName = "备注", EnName = "remarks") + private String remarks; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java index 21bf588353..e7afcddc9a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java @@ -48,7 +48,7 @@ public class SpectalRebateWithExcelVo { private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; - @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") + @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") private String estimateRebate; @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost") private BigDecimal expectItureCost; @@ -56,10 +56,6 @@ public class SpectalRebateWithExcelVo { private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") private BigDecimal expectSuppCost; - @ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark") - private String expectSuppRemark; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; - @ExportEntityMap(CnName = "备注", EnName = "remarks") - private String remarks; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java index e38e63d040..277436465e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java @@ -26,7 +26,6 @@ package com.yxt.anrui.scm.api.scmvehrebate; import com.yxt.common.core.utils.ExportEntityMap; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -40,16 +39,16 @@ public class ScmVehRebateExcelVo { private String purchaseSystemName; @ExportEntityMap(CnName = "品牌", EnName = "brandName") private String brandName; - @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") + @ExportEntityMap(CnName = "车型", EnName = "vehModelName") private String vehModelName; @ExportEntityMap(CnName = "车架号", EnName = "vinNo") private String vinNo; @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") - private String manufactorSettlementPrice; + private BigDecimal manufactorSettlementPrice; @ExportEntityMap(CnName = "其中运费", EnName = "freight") - private String freight; + private BigDecimal freight; @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount") - private String topAmount; + private BigDecimal topAmount; @ExportEntityMap(CnName = "创建日期", EnName = "createTime") private String createTime; @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") @@ -57,19 +56,19 @@ public class ScmVehRebateExcelVo { @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") - private String estimateRebate; + private BigDecimal estimateRebate; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") - private String expectTreatCost; + private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") - private String expectSuppCost; + private BigDecimal expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") private String uploadDate; @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") - private String uploadMoney; + private BigDecimal uploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") - private String stayDetermineMoney; + private BigDecimal stayDetermineMoney; @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost") private BigDecimal onceTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost") @@ -77,17 +76,17 @@ public class ScmVehRebateExcelVo { @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") private String secondaryUploadDate; @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") - private String secondaryUploadMoney; + private BigDecimal secondaryUploadMoney; @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost") private BigDecimal secondTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost") private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") - private String diffAmount; + private BigDecimal diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") private String isAdjustment; @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney") - private String adjustmentMoney; + private BigDecimal adjustmentMoney; @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney") private BigDecimal treatAdjustmentMoney; @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java index 333916fe6d..1ff427da5f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java @@ -38,58 +38,60 @@ public class VehRebateCheckExcelVo { private Integer rankNo; @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") private String purchaseSystemName; - @ExportEntityMap(CnName = "品牌名称", EnName = "brandName") + @ExportEntityMap(CnName = "品牌", EnName = "brandName") private String brandName; - @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") + @ExportEntityMap(CnName = "车型", EnName = "vehModelName") private String vehModelName; @ExportEntityMap(CnName = "车架号", EnName = "vinNo") private String vinNo; @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") - private String manufactorSettlementPrice; + private BigDecimal manufactorSettlementPrice; @ExportEntityMap(CnName = "其中运费", EnName = "freight") - private String freight; + private BigDecimal freight; + @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount") + private BigDecimal topAmount; @ExportEntityMap(CnName = "创建日期", EnName = "createTime") private String createTime; @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; - @ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") - private String calculationModeValue; - @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard") - private String calculationStandard; - @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") - private String estimateRebate; + @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") + private BigDecimal estimateRebate; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") - private String expectTreatCost; + private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") - private String expectSuppCost; + private BigDecimal expectSuppCost; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate") private String uploadDate; @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney") - private String uploadMoney; - @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") - private String secondaryUploadDate; - @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") - private String secondaryUploadMoney; + private BigDecimal uploadMoney; @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney") - private String stayDetermineMoney; - @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost") + private BigDecimal stayDetermineMoney; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost") private BigDecimal onceTreatCost; - @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost") private BigDecimal onceSuppCost; - @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost") + @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate") + private String secondaryUploadDate; + @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney") + private BigDecimal secondaryUploadMoney; + @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost") private BigDecimal secondTreatCost; - @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost") + @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost") private BigDecimal secondSuppCost; @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount") - private String diffAmount; + private BigDecimal diffAmount; @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment") private String isAdjustment; - @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney") - private String adjustmentMoney; + @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney") + private BigDecimal adjustmentMoney; + @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney") + private BigDecimal treatAdjustmentMoney; + @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney") + private BigDecimal suppAdjustmentMoney; @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks") private String adjustmentRemarks; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java index 184fe335c6..f323e7dac6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.api.scmvehrebatewith; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.utils.ExportEntityMap; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; @@ -42,32 +43,28 @@ public class ExcelVo { private String purchaseSystemName; @ExportEntityMap(CnName = "品牌名称", EnName = "brandName") private String brandName; - @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName") + @ExportEntityMap(CnName = "车型", EnName = "vehModelName") private String vehModelName; @ExportEntityMap(CnName = "车架号", EnName = "vinNo") private String vinNo; @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice") - private String manufactorSettlementPrice; + private BigDecimal manufactorSettlementPrice; @ExportEntityMap(CnName = "其中运费", EnName = "freight") - private String freight; + private BigDecimal freight; + @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount") + private BigDecimal topAmount; @ExportEntityMap(CnName = "创建日期", EnName = "createTime") private String createTime; @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") private String rebateTypeValue; @ExportEntityMap(CnName = "返利名称", EnName = "rebateName") private String rebateName; - @ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue") - private String calculationModeValue; - @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard") - private String calculationStandard; - @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate") - private String estimateRebate; + @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate") + private BigDecimal estimateRebate; @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost") private BigDecimal expectTreatCost; @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost") private BigDecimal expectSuppCost; - @ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark") - private String expectSuppRemark; @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate") private String palceGenDate; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 960338e126..e82abc234a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -1635,22 +1635,10 @@ public class ScmSpecialRebateService extends MybatisBaseService scmSpecialRebateExcelVos = baseMapper.excelList(qw); for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) { - if (scmSpecialRebateExcelVo.getState().equals("0")){ - scmSpecialRebateExcelVo.setState("未预提"); - }else if (scmSpecialRebateExcelVo.getState().equals("1")){ - scmSpecialRebateExcelVo.setState("预提中"); - }else if (scmSpecialRebateExcelVo.getState().equals("2")){ - scmSpecialRebateExcelVo.setState("待核对"); - }else if (scmSpecialRebateExcelVo.getState().equals("3")){ - scmSpecialRebateExcelVo.setState("核对中"); - }else if (scmSpecialRebateExcelVo.getState().equals("4")){ - scmSpecialRebateExcelVo.setState("已核对"); - }else if (scmSpecialRebateExcelVo.getState().equals("5")){ - scmSpecialRebateExcelVo.setState("分配中"); - }else if (scmSpecialRebateExcelVo.getState().equals("6")){ - scmSpecialRebateExcelVo.setState("已分配"); - } scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime()))); + scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost())); + scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost())); + scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost())); } return scmSpecialRebateExcelVos; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 92b60f152a..ae097cbd7e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -123,6 +123,9 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl BeanUtil.copyProperties(datum,excelVo); excelVo.setRankNo(i); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); + excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost())); + excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost())); + excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost())); i = i + 1; excelVos.add(excelVo); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 2e755fb6d0..6780b741c9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -2033,6 +2033,10 @@ public class ScmVehRebateService extends MybatisBaseService scmVehRebateExcelVos = baseMapper.excelList(qw); + for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) { + scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost())); + scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost())); + } return scmVehRebateExcelVos; } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index 30f98f94c7..ce3350d226 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -134,9 +134,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { BeanUtil.copyProperties(datum,excelVo); excelVo.setRankNo(i); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); - if ("比例".equals(datum.getCalculationModeValue())){ - excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%"); - } + excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost())); + excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost())); i = i + 1; excelVos.add(excelVo); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java index 0929282f8e..49e240cf01 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java @@ -122,9 +122,6 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign { BeanUtil.copyProperties(datum,excelVo); excelVo.setRankNo(i); excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime())); - if ("比例".equals(datum.getCalculationModeValue())){ - excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%"); - } i = i + 1; excelVos.add(excelVo); } diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl index de963e8d5c..01219f4245 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl +++ b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl @@ -20,7 +20,6 @@ xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" - xmlns:w16sdtfl="http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" @@ -32,8 +31,8 @@ 10745413@qq.com 2 0 - 2025-01-08T09:39:00Z - 2025-01-08T09:39:00Z + 2025-01-16T05:43:00Z + 2025-01-16T05:43:00Z 1 80 456 @@ -604,13 +603,15 @@ - + + + @@ -644,6 +645,7 @@ + @@ -675,13 +677,13 @@ - - + + @@ -746,7 +748,7 @@ - + @@ -762,8 +764,8 @@ - + @@ -774,7 +776,7 @@ - + @@ -786,7 +788,7 @@ - + @@ -802,8 +804,8 @@ - + @@ -813,7 +815,7 @@ - + @@ -836,8 +838,8 @@ - + @@ -847,7 +849,7 @@ - + @@ -870,8 +872,8 @@ - + @@ -881,7 +883,7 @@ - + @@ -904,8 +906,8 @@ - + @@ -915,7 +917,7 @@ - + @@ -938,8 +940,8 @@ - + @@ -949,7 +951,7 @@ - + @@ -972,8 +974,8 @@ - + @@ -983,7 +985,7 @@ - + @@ -995,7 +997,7 @@ - + @@ -1010,8 +1012,8 @@ - + @@ -1021,7 +1023,7 @@ - + @@ -1043,8 +1045,8 @@ - + @@ -1054,7 +1056,7 @@ - + @@ -1076,8 +1078,8 @@ - + @@ -1087,7 +1089,7 @@ - + @@ -1109,8 +1111,8 @@ - + @@ -1120,7 +1122,7 @@ - + @@ -1142,8 +1144,8 @@ - + @@ -1153,7 +1155,7 @@ - + @@ -1175,8 +1177,8 @@ - + @@ -1186,7 +1188,7 @@ - + @@ -1198,7 +1200,7 @@ - + @@ -1207,8 +1209,8 @@ - + @@ -1218,7 +1220,7 @@ - + @@ -1235,8 +1237,8 @@ - + @@ -1246,7 +1248,7 @@ - + @@ -1262,8 +1264,8 @@ - + @@ -1273,7 +1275,7 @@ - + @@ -1290,8 +1292,8 @@ - + @@ -1301,7 +1303,7 @@ - + @@ -1317,8 +1319,8 @@ - + @@ -1328,7 +1330,7 @@ - + @@ -1345,8 +1347,8 @@ - + @@ -1356,7 +1358,7 @@ - + @@ -1372,8 +1374,8 @@ - + @@ -1384,7 +1386,7 @@ - + @@ -1402,8 +1404,8 @@ - + @@ -1413,7 +1415,7 @@ - + @@ -1429,8 +1431,8 @@ - + @@ -1441,7 +1443,7 @@ - + @@ -1459,8 +1461,8 @@ - + @@ -1471,7 +1473,7 @@ - + @@ -1488,8 +1490,8 @@ - + @@ -1500,7 +1502,7 @@ - + @@ -1517,8 +1519,8 @@ - + @@ -1528,7 +1530,7 @@ - + @@ -1541,7 +1543,7 @@ <#list wlList as wl> - + @@ -1550,8 +1552,8 @@ - + @@ -1561,7 +1563,7 @@ - + @@ -1578,8 +1580,8 @@ - + @@ -1589,7 +1591,7 @@ - + @@ -1605,8 +1607,8 @@ - + @@ -1616,7 +1618,7 @@ - + @@ -1633,8 +1635,8 @@ - + @@ -1644,7 +1646,7 @@ - + @@ -1660,8 +1662,8 @@ - + @@ -1671,7 +1673,7 @@ - + @@ -1688,8 +1690,8 @@ - + @@ -1699,7 +1701,7 @@ - + @@ -1715,8 +1717,8 @@ - + @@ -1726,7 +1728,7 @@ - + @@ -1743,8 +1745,8 @@ - + @@ -1754,7 +1756,7 @@ - + @@ -1770,8 +1772,8 @@ - + @@ -1781,7 +1783,7 @@ - + @@ -1798,8 +1800,8 @@ - + @@ -1809,7 +1811,7 @@ - + @@ -1825,8 +1827,8 @@ - + @@ -1836,7 +1838,7 @@ - + @@ -1852,8 +1854,8 @@ - + @@ -1863,7 +1865,7 @@ - + @@ -1876,7 +1878,7 @@ - + @@ -1885,8 +1887,8 @@ - + @@ -1896,7 +1898,7 @@ - + @@ -1913,8 +1915,8 @@ - + @@ -1931,8 +1933,8 @@ - + @@ -1950,8 +1952,8 @@ - + @@ -1968,8 +1970,8 @@ - + @@ -1979,7 +1981,7 @@ - + @@ -1996,8 +1998,8 @@ - + @@ -2007,7 +2009,7 @@ - + @@ -2023,8 +2025,8 @@ - + @@ -2035,7 +2037,7 @@ - + @@ -2053,8 +2055,8 @@ - + @@ -2064,7 +2066,7 @@ - + @@ -2080,8 +2082,8 @@ - + @@ -2091,7 +2093,7 @@ - + @@ -2108,8 +2110,8 @@ - + @@ -2119,7 +2121,7 @@ - + @@ -2135,8 +2137,8 @@ - + @@ -2146,7 +2148,7 @@ - + @@ -2162,8 +2164,8 @@ - + @@ -2173,7 +2175,7 @@ - + @@ -2185,7 +2187,7 @@ - + @@ -2194,8 +2196,8 @@ - + @@ -2205,7 +2207,7 @@ - + @@ -2222,8 +2224,8 @@ - + @@ -2233,7 +2235,7 @@ - + @@ -2245,15 +2247,15 @@ - + - + @@ -2263,7 +2265,7 @@ - + @@ -2275,7 +2277,7 @@ - + @@ -2291,8 +2293,8 @@ - + @@ -2302,7 +2304,7 @@ - + @@ -2327,8 +2329,8 @@ - + - + @@ -2348,8 +2350,8 @@ ${lc.comment!} - + @@ -2360,7 +2362,7 @@ - + @@ -2384,8 +2386,8 @@ - + @@ -2397,8 +2399,8 @@ - + @@ -2408,7 +2410,7 @@ - + @@ -2424,7 +2426,7 @@ <#list lcList as lc> <#if (lc_index>0)> - + @@ -2440,8 +2442,8 @@ - + @@ -2468,8 +2470,8 @@ - + - + @@ -2489,8 +2491,8 @@ ${lc.comment!} - + @@ -2501,7 +2503,7 @@ - + @@ -2528,8 +2530,8 @@ - + @@ -2541,8 +2543,8 @@ - + @@ -2553,7 +2555,7 @@ - + @@ -2568,7 +2570,7 @@ - + @@ -2595,7 +2597,7 @@ - + @@ -2607,8 +2609,8 @@ - + @@ -2617,7 +2619,7 @@ - + @@ -2638,8 +2640,8 @@ - + @@ -2648,7 +2650,7 @@ - + @@ -2669,8 +2671,8 @@ - + @@ -2679,7 +2681,7 @@ - + @@ -2700,8 +2702,8 @@ - + @@ -2711,7 +2713,7 @@ - + @@ -2731,9 +2733,9 @@ - - - + + diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl deleted file mode 100644 index 01219f4245..0000000000 --- a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd1.ftl +++ /dev/null @@ -1,2744 +0,0 @@ - - - - - God - 10745413@qq.com - 2 - 0 - 2025-01-16T05:43:00Z - 2025-01-16T05:43:00Z - 1 - 80 - 456 - 3 - 1 - 535 - 16 - - - 2052-12.1.0.18912 - 904253E002864ACF82CED81570235AD9_12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${title!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 分公司： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${useOrgName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 创建部门： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${deptName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 创建人： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${createByName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 创建日期： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${createTime!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 办结日期： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${finishTime!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 审批编号： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${billNo!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - - - - - - - - - - 采购系统 - - - - - - - - - - - - - - - - - - - - - - - - - - 品牌 - - - - - - - - - - - - - - - - - - - - - - - - - - - 返利类型 - - - - - - - - - - - - - - - - - - - - - - - - - - 台数 - - - - - - - - - - - - - - - - - - - - - - - - - - - 预提金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - 其中预提费用 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 上传金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - 其中待确定金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 其中费用 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 返利调整金额 - - - - - - - - - - - - - - - - - - - - - - - - - - - 其中费用调整金额 - - - - - <#list wlList as wl> - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.id!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.cgxt!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.pp!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.fllx!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.ts!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.ytje!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.ytfy!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.scje!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.dqdje!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.fy!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.tzje!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${wl.fytzje!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 合计 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${tst!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${ytjet!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${ytfyt!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${scjet!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${dqdjet!} - - - - - - - - - - - - - - - - - - - - - - - - - - - ${fyt!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${tzjet!} - - - - - - - - - - - - - - - - - - - - - - - - - - ${fytzjet!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 备注 - - - - - - - - - - - - - - - - - - - - - - - - - - - ${remarks!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 明细见导表 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 审批流程 - - - - <#list lcList as lc> - <#if (lc_index==0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - - - - - - - - - - - - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - - - <#list lcList as lc> - <#if (lc_index>0)> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.comment!} - - - - - - - - - - - - - - - - - - - - ${lc.name!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${lc.spsj!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 下载人： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${downName!} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 下载时间： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${downTime!} - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl index de963e8d5c..01219f4245 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl +++ b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/zxhd.ftl @@ -20,7 +20,6 @@ xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" - xmlns:w16sdtfl="http://schemas.microsoft.com/office/word/2024/wordml/sdtformatlock" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wsp="http://schemas.microsoft.com/office/word/2003/wordml/sp2" @@ -32,8 +31,8 @@ 10745413@qq.com 2 0 - 2025-01-08T09:39:00Z - 2025-01-08T09:39:00Z + 2025-01-16T05:43:00Z + 2025-01-16T05:43:00Z 1 80 456 @@ -604,13 +603,15 @@ - + + + @@ -644,6 +645,7 @@ + @@ -675,13 +677,13 @@ - - + + @@ -746,7 +748,7 @@ - + @@ -762,8 +764,8 @@ - + @@ -774,7 +776,7 @@ - + @@ -786,7 +788,7 @@ - + @@ -802,8 +804,8 @@ - + @@ -813,7 +815,7 @@ - + @@ -836,8 +838,8 @@ - + @@ -847,7 +849,7 @@ - + @@ -870,8 +872,8 @@ - + @@ -881,7 +883,7 @@ - + @@ -904,8 +906,8 @@ - + @@ -915,7 +917,7 @@ - + @@ -938,8 +940,8 @@ - + @@ -949,7 +951,7 @@ - + @@ -972,8 +974,8 @@ - + @@ -983,7 +985,7 @@ - + @@ -995,7 +997,7 @@ - + @@ -1010,8 +1012,8 @@ - + @@ -1021,7 +1023,7 @@ - + @@ -1043,8 +1045,8 @@ - + @@ -1054,7 +1056,7 @@ - + @@ -1076,8 +1078,8 @@ - + @@ -1087,7 +1089,7 @@ - + @@ -1109,8 +1111,8 @@ - + @@ -1120,7 +1122,7 @@ - + @@ -1142,8 +1144,8 @@ - + @@ -1153,7 +1155,7 @@ - + @@ -1175,8 +1177,8 @@ - + @@ -1186,7 +1188,7 @@ - + @@ -1198,7 +1200,7 @@ - + @@ -1207,8 +1209,8 @@ - + @@ -1218,7 +1220,7 @@ - + @@ -1235,8 +1237,8 @@ - + @@ -1246,7 +1248,7 @@ - + @@ -1262,8 +1264,8 @@ - + @@ -1273,7 +1275,7 @@ - + @@ -1290,8 +1292,8 @@ - + @@ -1301,7 +1303,7 @@ - + @@ -1317,8 +1319,8 @@ - + @@ -1328,7 +1330,7 @@ - + @@ -1345,8 +1347,8 @@ - + @@ -1356,7 +1358,7 @@ - + @@ -1372,8 +1374,8 @@ - + @@ -1384,7 +1386,7 @@ - + @@ -1402,8 +1404,8 @@ - + @@ -1413,7 +1415,7 @@ - + @@ -1429,8 +1431,8 @@ - + @@ -1441,7 +1443,7 @@ - + @@ -1459,8 +1461,8 @@ - + @@ -1471,7 +1473,7 @@ - + @@ -1488,8 +1490,8 @@ - + @@ -1500,7 +1502,7 @@ - + @@ -1517,8 +1519,8 @@ - + @@ -1528,7 +1530,7 @@ - + @@ -1541,7 +1543,7 @@ <#list wlList as wl> - + @@ -1550,8 +1552,8 @@ - + @@ -1561,7 +1563,7 @@ - + @@ -1578,8 +1580,8 @@ - + @@ -1589,7 +1591,7 @@ - + @@ -1605,8 +1607,8 @@ - + @@ -1616,7 +1618,7 @@ - + @@ -1633,8 +1635,8 @@ - + @@ -1644,7 +1646,7 @@ - + @@ -1660,8 +1662,8 @@ - + @@ -1671,7 +1673,7 @@ - + @@ -1688,8 +1690,8 @@ - + @@ -1699,7 +1701,7 @@ - + @@ -1715,8 +1717,8 @@ - + @@ -1726,7 +1728,7 @@ - + @@ -1743,8 +1745,8 @@ - + @@ -1754,7 +1756,7 @@ - + @@ -1770,8 +1772,8 @@ - + @@ -1781,7 +1783,7 @@ - + @@ -1798,8 +1800,8 @@ - + @@ -1809,7 +1811,7 @@ - + @@ -1825,8 +1827,8 @@ - + @@ -1836,7 +1838,7 @@ - + @@ -1852,8 +1854,8 @@ - + @@ -1863,7 +1865,7 @@ - + @@ -1876,7 +1878,7 @@ - + @@ -1885,8 +1887,8 @@ - + @@ -1896,7 +1898,7 @@ - + @@ -1913,8 +1915,8 @@ - + @@ -1931,8 +1933,8 @@ - + @@ -1950,8 +1952,8 @@ - + @@ -1968,8 +1970,8 @@ - + @@ -1979,7 +1981,7 @@ - + @@ -1996,8 +1998,8 @@ - + @@ -2007,7 +2009,7 @@ - + @@ -2023,8 +2025,8 @@ - + @@ -2035,7 +2037,7 @@ - + @@ -2053,8 +2055,8 @@ - + @@ -2064,7 +2066,7 @@ - + @@ -2080,8 +2082,8 @@ - + @@ -2091,7 +2093,7 @@ - + @@ -2108,8 +2110,8 @@ - + @@ -2119,7 +2121,7 @@ - + @@ -2135,8 +2137,8 @@ - + @@ -2146,7 +2148,7 @@ - + @@ -2162,8 +2164,8 @@ - + @@ -2173,7 +2175,7 @@ - + @@ -2185,7 +2187,7 @@ - + @@ -2194,8 +2196,8 @@ - + @@ -2205,7 +2207,7 @@ - + @@ -2222,8 +2224,8 @@ - + @@ -2233,7 +2235,7 @@ - + @@ -2245,15 +2247,15 @@ - + - + @@ -2263,7 +2265,7 @@ - + @@ -2275,7 +2277,7 @@ - + @@ -2291,8 +2293,8 @@ - + @@ -2302,7 +2304,7 @@ - + @@ -2327,8 +2329,8 @@ - + - + @@ -2348,8 +2350,8 @@ ${lc.comment!} - + @@ -2360,7 +2362,7 @@ - + @@ -2384,8 +2386,8 @@ - + @@ -2397,8 +2399,8 @@ - + @@ -2408,7 +2410,7 @@ - + @@ -2424,7 +2426,7 @@ <#list lcList as lc> <#if (lc_index>0)> - + @@ -2440,8 +2442,8 @@ - + @@ -2468,8 +2470,8 @@ - + - + @@ -2489,8 +2491,8 @@ ${lc.comment!} - + @@ -2501,7 +2503,7 @@ - + @@ -2528,8 +2530,8 @@ - + @@ -2541,8 +2543,8 @@ - + @@ -2553,7 +2555,7 @@ - + @@ -2568,7 +2570,7 @@ - + @@ -2595,7 +2597,7 @@ - + @@ -2607,8 +2609,8 @@ - + @@ -2617,7 +2619,7 @@ - + @@ -2638,8 +2640,8 @@ - + @@ -2648,7 +2650,7 @@ - + @@ -2669,8 +2671,8 @@ - + @@ -2679,7 +2681,7 @@ - + @@ -2700,8 +2702,8 @@ - + @@ -2711,7 +2713,7 @@ - + @@ -2731,9 +2733,9 @@ - - - + +