From 1cc8d9ef619f08e8754a5a7cd94dc24e711baa4b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 11 Oct 2024 14:18:47 +0800
Subject: [PATCH] 1

---
 .../scm/api/scmspecialrebate/OneExcelVo.java  |  28 +++++++--------
 .../scm/api/scmspecialrebate/TwoExcelVo.java  |  34 +++++++++---------
 .../scm/api/scmvehrebate/OneExcelVo.java      |  28 +++++++--------
 .../scm/api/scmvehrebate/ScmVehRebateVo.java  |   2 ++
 .../scm/api/scmvehrebate/TwoExcelVo.java      |  34 +++++++++---------
 .../ScmVehrebateCheckapplyVo.java             |   2 +-
 ...ScmVehrebateCheckapplydetailDetailsVo.java |   2 +-
 .../ScmSpecialRebateService.java              |   8 -----
 .../biz/scmvehrebate/ScmVehRebateMapper.xml   |   2 ++
 .../biz/scmvehrebate/ScmVehRebateService.java |   8 -----
 .../ScmVehrebateCheckapplyMapper.java         |  21 -----------
 .../ScmVehrebateCheckapplyMapper.xml          |   9 +----
 .../ScmVehrebateCheckapplydetailMapper.xml    |   4 +--
 .../resources/static/单车返利管理.xls   | Bin 18432 -> 18432 bytes
 14 files changed, 71 insertions(+), 111 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java
index 13f992d16d..fd567e6764 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java
@@ -11,46 +11,46 @@ import lombok.Data;
 @Data
 public class OneExcelVo {
 
-    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    @ExportEntityMap(CnName = "采购系统*", EnName = "purchaseSystemName")
     private String purchaseSystemName;
 
-    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    @ExportEntityMap(CnName = "品牌名称*", EnName = "brandName")
     private String brandName;
 
-    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    @ExportEntityMap(CnName = "创建日期*", EnName = "createTime")
     private String createTime;
 
-    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName")
     private String rebateName;
 
-    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue")
     private String rebateTypeValue;
 
-    @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate")
     private String estimateRebate;
 
-    @ExportEntityMap(CnName = "其中预提费用", EnName = "expectCost")
+    @ExportEntityMap(CnName = "其中预提费用*", EnName = "expectCost")
     private String expectCost;
 
-    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    @ExportEntityMap(CnName = "所属年月*", EnName = "palceGenDate")
     private String palceGenDate;
 
-    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    @ExportEntityMap(CnName = "上传日期*", EnName = "uploadDate")
     private String uploadDate;
 
-    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    @ExportEntityMap(CnName = "上传金额*", EnName = "uploadMoney")
     private String uploadMoney;
 
-    @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
+    @ExportEntityMap(CnName = "待确定金额*", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
+    @ExportEntityMap(CnName = "其中支出费用*", EnName = "onceItureCost")
     private String onceItureCost;
 
-    @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用*", EnName = "onceTreatCost")
     private String onceTreatCost;
 
-    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用*", EnName = "onceSuppCost")
     private String onceSuppCost;
 
     @ExportEntityMap(CnName = "抵顶费用说明", EnName = "onceSuppRemark")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java
index b12a2834cd..3bea60b78b 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java
@@ -11,55 +11,55 @@ import lombok.Data;
 @Data
 public class TwoExcelVo {
 
-    @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
+    @ExportEntityMap(CnName = "采购系统*", EnName = "purchaseSystemName")
     private String purchaseSystemName;
 
-    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    @ExportEntityMap(CnName = "品牌名称*", EnName = "brandName")
     private String brandName;
 
-    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    @ExportEntityMap(CnName = "创建日期*", EnName = "createTime")
     private String createTime;
 
-    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName")
     private String rebateName;
 
-    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue")
     private String rebateTypeValue;
 
-    @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate")
     private String estimateRebate;
 
-    @ExportEntityMap(CnName = "其中预提费用", EnName = "expectCost")
+    @ExportEntityMap(CnName = "其中预提费用*", EnName = "expectCost")
     private String expectCost;
 
-    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    @ExportEntityMap(CnName = "所属年月*", EnName = "palceGenDate")
     private String palceGenDate;
 
-    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    @ExportEntityMap(CnName = "上传日期*", EnName = "uploadDate")
     private String uploadDate;
 
-    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    @ExportEntityMap(CnName = "上传金额*", EnName = "uploadMoney")
     private String uploadMoney;
 
-    @ExportEntityMap(CnName = "其中费用", EnName = "money")
+    @ExportEntityMap(CnName = "其中费用*", EnName = "money")
     private String money;
 
-    @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
+    @ExportEntityMap(CnName = "待确定金额*", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    @ExportEntityMap(CnName = "二次上传日期*", EnName = "secondaryUploadDate")
     private String secondaryUploadDate;
 
-    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    @ExportEntityMap(CnName = "二次上传金额*", EnName = "secondaryUploadMoney")
     private String secondaryUploadMoney;
 
-    @ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
+    @ExportEntityMap(CnName = "其中支出费用*", EnName = "secondItureCost")
     private String secondItureCost;
 
-    @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用*", EnName = "secondTreatCost")
     private String secondTreatCost;
 
-    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用*", EnName = "secondSuppCost")
     private String secondSuppCost;
 
     @ExportEntityMap(CnName = "抵顶费用说明", EnName = "secondSuppRemark")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java
index 8be0b3af68..fecebb5b52 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java
@@ -15,56 +15,56 @@ import java.util.Date;
 public class OneExcelVo {
 
     //车架号
-    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    @ExportEntityMap(CnName = "车架号*", EnName = "vinNo")
     private String vinNo;
 
     //厂家结算价
-    @ExportEntityMap(CnName = "厂家结算价", EnName = "manufactorSettlementPrice")
+    @ExportEntityMap(CnName = "厂家结算价*", EnName = "manufactorSettlementPrice")
     private String manufactorSettlementPrice;
 
     //其中运费金额
-    @ExportEntityMap(CnName = "其中运费金额", EnName = "freight")
+    @ExportEntityMap(CnName = "其中运费金额*", EnName = "freight")
     private String freight;
 
     //创建日期
-    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    @ExportEntityMap(CnName = "创建日期*", EnName = "createTime")
     private String createTime;
 
     //返利名称
-    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName")
     private String rebateName;
 
     //返利类型
-    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue")
     private String rebateTypeValue;
 
     //预提返利
-    @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate")
     private String estimateRebate;
 
-    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    @ExportEntityMap(CnName = "其中预提费用*", EnName = "withholdCost")
     private String withholdCost;
 
     //所属年月
-    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    @ExportEntityMap(CnName = "所属年月*", EnName = "palceGenDate")
     private String palceGenDate;
 
     //上传日期
-    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    @ExportEntityMap(CnName = "上传日期*", EnName = "uploadDate")
     private String uploadDate;
 
     //上传金额
-    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    @ExportEntityMap(CnName = "上传金额*", EnName = "uploadMoney")
     private String uploadMoney;
 
     //待确定金额
-    @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
+    @ExportEntityMap(CnName = "待确定金额*", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    @ExportEntityMap(CnName = "待支付费用", EnName = "onceTreatCost")
+    @ExportEntityMap(CnName = "待支付费用*", EnName = "onceTreatCost")
     private String onceTreatCost;
 
-    @ExportEntityMap(CnName = "抵顶费用", EnName = "onceSuppCost")
+    @ExportEntityMap(CnName = "抵顶费用*", EnName = "onceSuppCost")
     private String onceSuppCost;
 
     @ExportEntityMap(CnName = "抵顶费用说明", EnName = "onceSuppRemark")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
index 00807bd89c..ca0286383d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
@@ -130,6 +130,8 @@ public class ScmVehRebateVo implements Vo {
     private Integer onceCheckState;
     @ApiModelProperty("其中预计费用")
     private BigDecimal expectCost;
+    @ApiModelProperty("其中预提费用")
+    private BigDecimal withholdCost;
     @ApiModelProperty("预计待支付费用")
     private BigDecimal expectTreatCost;
     @ApiModelProperty("预计抵顶费用")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java
index b1c52f2bf0..559943ead1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java
@@ -15,66 +15,66 @@ import java.util.Date;
 public class TwoExcelVo {
 
     //车架号
-    @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
+    @ExportEntityMap(CnName = "车架号*", EnName = "vinNo")
     private String vinNo;
 
     //厂家结算价
-    @ExportEntityMap(CnName = "厂家结算价", EnName = "manufactorSettlementPrice")
+    @ExportEntityMap(CnName = "厂家结算价*", EnName = "manufactorSettlementPrice")
     private String manufactorSettlementPrice;
 
     //其中运费金额
-    @ExportEntityMap(CnName = "其中运费金额", EnName = "freight")
+    @ExportEntityMap(CnName = "其中运费金额*", EnName = "freight")
     private String freight;
 
-    @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
+    @ExportEntityMap(CnName = "创建日期*", EnName = "createTime")
     private String createTime;
 
     //返利名称
-    @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
+    @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName")
     private String rebateName;
 
     //返利类型
-    @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
+    @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue")
     private String rebateTypeValue;
 
     //预提返利
-    @ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate")
     private String estimateRebate;
 
-    @ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
+    @ExportEntityMap(CnName = "其中预提费用*", EnName = "withholdCost")
     private String withholdCost;
 
     //所属年月
-    @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
+    @ExportEntityMap(CnName = "所属年月*", EnName = "palceGenDate")
     private String palceGenDate;
 
     //上传日期
-    @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
+    @ExportEntityMap(CnName = "上传日期*", EnName = "uploadDate")
     private String uploadDate;
 
     //上传金额
-    @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
+    @ExportEntityMap(CnName = "上传金额*", EnName = "uploadMoney")
     private String uploadMoney;
 
     //待确定金额
-    @ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
+    @ExportEntityMap(CnName = "待确定金额*", EnName = "stayDetermineMoney")
     private String stayDetermineMoney;
 
-    @ExportEntityMap(CnName = "其中费用", EnName = "qzMoney")
+    @ExportEntityMap(CnName = "其中费用*", EnName = "qzMoney")
     private String qzMoney;
 
     //二次上传日期
-    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    @ExportEntityMap(CnName = "二次上传日期*", EnName = "secondaryUploadDate")
     private String secondaryUploadDate;
 
     //二次上传金额
-    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    @ExportEntityMap(CnName = "二次上传金额*", EnName = "secondaryUploadMoney")
     private String secondaryUploadMoney;
 
-    @ExportEntityMap(CnName = "待支付费用", EnName = "secondTreatCost")
+    @ExportEntityMap(CnName = "待支付费用*", EnName = "secondTreatCost")
     private String secondTreatCost;
 
-    @ExportEntityMap(CnName = "抵顶费费用", EnName = "secondSuppCost")
+    @ExportEntityMap(CnName = "抵顶费费用*", EnName = "secondSuppCost")
     private String secondSuppCost;
 
     @ExportEntityMap(CnName = "抵顶费用说明", EnName = "secondSuppRemark")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java
index 7c18c5f6b0..492e747a04 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java
@@ -68,7 +68,7 @@ public class ScmVehrebateCheckapplyVo implements Vo {
     @ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
     @ApiModelProperty("其中预提费用")
-    private String expectCost;
+    private String withholdCost;
     @ApiModelProperty("上传金额")
     private String uploadMoney; // 上传金额
     @ApiModelProperty("待确定金额")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java
index dcb85a9d7b..204e187f83 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java
@@ -68,7 +68,7 @@ public class ScmVehrebateCheckapplydetailDetailsVo implements Vo {
     @ApiModelProperty("预提金额")
     private String withRebate; // 预提金额
     @ApiModelProperty("其中预提费用")
-    private String expectCost;
+    private String withholdCost;
     @ApiModelProperty("上传金额")
     private String uploadMoney; // 上传金额
     @ApiModelProperty("待确定金额")
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 490b2a9a3e..48ef439ecc 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
@@ -825,10 +825,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceSuppRemark())) {
-                    checkWord.add("抵顶费用说明不能为空");
-                    break;
-                }
                 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                 //上传返利金额
                 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceItureCost())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@@ -1364,10 +1360,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondSuppRemark())) {
-                    checkWord.add("抵顶费用说明不能为空");
-                    break;
-                }
                 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                 //上传返利金额
                 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getMoney())).subtract(new BigDecimal(excelInfo.getSecondItureCost())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
index 5175e056da..55d7d369fb 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
@@ -8,6 +8,7 @@
         *,
         sid AS vehRebateSid,
         expectTreatCost + expectSuppCost AS expectCost,
+        expectTreatCost + expectSuppCost AS withholdCost,
         onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
         FROM
         scm_veh_rebate
@@ -21,6 +22,7 @@
         *,
         sid AS vehRebateSid,
         expectTreatCost + expectSuppCost AS expectCost,
+        expectTreatCost + expectSuppCost AS withholdCost,
         onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
         FROM
         scm_veh_rebate
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 676cb6f1d5..8b690dc03b 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
@@ -1325,10 +1325,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getOnceSuppRemark())) {
-                    checkWord.add("抵顶费用说明不能为空");
-                    break;
-                }
                 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                 //上传返利金额
                 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@@ -1828,10 +1824,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                         break;
                     }
                 }
-                if (StringUtils.isBlank(excelInfo.getSecondSuppRemark())) {
-                    checkWord.add("抵顶费用说明不能为空");
-                    break;
-                }
                 int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
                 //上传返利金额
                 BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java
index 931231f684..af4f796f70 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java
@@ -38,32 +38,11 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-scm(单车返利核对) <br/>
- * File: ScmVehrebateCheckapplyMapper.java <br/>
- * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyMapper <br/>
- * Description: 单车返利核对申请表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-29 16:01:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface ScmVehrebateCheckapplyMapper extends BaseMapper<ScmVehrebateCheckapply> {
 
-	//@Update("update scm_vehrebate_checkapply set name=#{msg} where id=#{id}")
-	//IPage<ScmVehrebateCheckapplyVo> voPage(IPage<ScmVehrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehrebateCheckapply> qw);
-	
 	IPage<ScmVehrebateCheckapplyVo> selectPageVo(IPage<ScmVehrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapply> qw);
 	
-	List<ScmVehrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapply> qw);
-	
-	@Select("select * from scm_vehrebate_checkapply")
-	List<ScmVehrebateCheckapplyVo> selectListVo();
-
     int updateFlowFiled(Map<String, Object> beanToMap);
 
     int selectBySid(String join);
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
index 505777d35a..94e3f061b8 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
@@ -11,7 +11,7 @@
         SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
         SUM(svr.`adjustmentMoney`) adjustmentMoney,
         SUM(svr.onceTreatCost + svr.onceSuppCost + svr.secondTreatCost + svr.secondSuppCost) money,
-        SUM(svr.expectTreatCost + svr.expectSuppCost) expectCost
+        SUM(svr.expectTreatCost + svr.expectSuppCost) withholdCost
         FROM
         scm_vehrebate_checkapply svc
         LEFT JOIN scm_vehrebate_checkapplydetail svcd
@@ -23,13 +23,6 @@
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
-        SELECT * FROM scm_vehrebate_checkapply
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
     <update id="updateFlowFiled">
         UPDATE scm_vehrebate_checkapply
         SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
index 0ed7eeb040..5434e6fe20 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
@@ -29,7 +29,7 @@
                SUM(svc.`uploadMoney`)                                                               uploadMoney,
                SUM(svc.`stayDetermineMoney`)                                                        stayDetermineMoney,
                SUM(svc.`adjustmentMoney`)                                                           adjustmentMoney,
-               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        expectCost,
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
                SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money
         FROM scm_vehrebate_checkapplydetail svc
         WHERE svc.`mainSid` = #{sid}
@@ -46,7 +46,7 @@
                SUM(svc.`uploadMoney`)                                                               uploadMoney,
                SUM(svc.`stayDetermineMoney`)                                                        stayDetermineMoney,
                SUM(svc.`adjustmentMoney`)                                                           adjustmentMoney,
-               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        expectCost,
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
                SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money
         FROM scm_vehrebate_checkapplydetail svc
         WHERE svc.`mainSid` = #{sid}
diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/static/单车返利管理.xls b/anrui-scm/anrui-scm-biz/src/main/resources/static/单车返利管理.xls
index d5875f9351617f74a4264f94e3fd2f0b3515fc05..f12a9834745d8c6b0868455aeb5b75aff8b39c85 100644
GIT binary patch
delta 219
zcmZpez}PT>aYGIZ+kri7{$0|Oi&)wi4LAQ}`DV;`eewqj*ZMvNE(QiLW?^7V>))3C
zJy?r@m4Wd}zh+Q%O?Nn)!yEFU63kiHJ-wPe<5(bE=HkS;Gqe~u7#Pa}b^Ti7^;2*7
zS@vp_YB8`wgtjJ?&4387F)+e7U%L6yfYxw1B*n#)#Bro+F-%@(>Bx9=^9Rd+jC^bi
kEI?N=GOz(53(Mv|)?XMm*`=_uF{I!2>yqA_<vfiA0D#m&_5c6?

delta 211
zcmZpez}PT>aYGIZTR~by<2R|vMJ#QMikpA3d^2V|KKX-%YkeI97Xt$rGcz!z^>0i6
z9?ZhPc%@%6sJf;*9LnSk`A`XDF6^FO&7N^Akez|CEKt|4HC{jUhM#4xMkyOaU~5v@
z3@8`I{L;;r1~ug3#JMwoOoybnn36b-bS4Hy_Q)5Lk62nWZrx<{kCBg^fgR`)Mj#1<
e?3;OPzA#QUU=i44m%_@{&|(dA{pKv^X)FM_$wIdP