diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index d488fd1ccc..71f8aa078a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -521,11 +521,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                         String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
                         BaseVehmodelVo baseVehmodelVo = baseVehmodelConfigService.selectVehPur(vehicleSid, configSid, buyerOrgSid);
                         if (baseVehmodelVo == null) {
+                            BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(booad.getVinNo(), baseInternalPurchase.getSellerOrgSid());
+                            String insideCode = baseVehicle.getInsideCode();
                             BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
                             baseVehmodelConfig.setModelSid(vehicleSid);
                             baseVehmodelConfig.setConfigurationItemsSid(configSid);
                             baseVehmodelConfig.setUseOrgSid(buyerOrgSid);
                             baseVehmodelConfig.setGuidedPrice(new BigDecimal(booad.getGuidedPrice()));
+                            baseVehmodelConfig.setInsideCode(insideCode);
                             baseVehmodelConfigService.save(baseVehmodelConfig);
                         }
                     }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
index 4fc429e4b1..c4130643c9 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
@@ -63,16 +63,21 @@ public interface ScmVehRebateFeign {
     @ResponseBody
     public ResultBean<PagerVo<ScmVehRebateVo>> listPage(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
 
-    @ApiOperation("单车返利预提申请选择单车返利信息")
+    @ApiOperation("单车返利未预提申请选择单车返利信息")
     @PostMapping("/withApplyGetVehRebate")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
 
-    @ApiOperation("单车返利核对申请选择单车返利信息")
+    @ApiOperation("单车返利核对申请选择待核对单车返利信息")
     @PostMapping("/checkApplyGetVehRebate")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
 
+    @ApiOperation("单车返利核对申请选择已上传单车返利信息")
+    @PostMapping("/checkApplyGetAlreadyUploadVehRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(@RequestBody PagerQuery<ScmVehRebateQuery> pq);
+
     @ApiOperation("新增")
     @PostMapping("/save")
     @ResponseBody
@@ -82,6 +87,11 @@ public interface ScmVehRebateFeign {
     @PostMapping("/update")
     @ResponseBody
     public ResultBean update(@RequestBody ScmVehRebateVehDto dto);
+
+    @ApiOperation("调整")
+    @PostMapping("/adjustment")
+    @ResponseBody
+    public ResultBean adjustment(@RequestBody ScmVehRebateVehAdjDto dto);
         
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
index a90df51409..e7a23733be 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java
@@ -64,6 +64,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(ScmVehRebateDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/save无法访问");
@@ -74,6 +79,11 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean delBySids( String[] sids){
 		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebate/delBySids无法访问");
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java
new file mode 100644
index 0000000000..3b320889ce
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehAdjDto.java
@@ -0,0 +1,50 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebate;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "单车返利表 数据传输对象", description = "单车返利表 数据传输对象")
+public class ScmVehRebateVehAdjDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("二次上传日期")
+    private String secondaryUploadDate; // 二次上传日期
+	@ApiModelProperty("二次上传金额")
+    private String secondaryUploadMoney; // 二次上传金额
+	@ApiModelProperty("待确定金额")
+    private String stayDetermineMoney; // 待确定金额
+	@ApiModelProperty("费用")
+    private String cost; // 费用
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
index 8da4b4327d..e18f5d11fc 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
@@ -52,6 +52,8 @@ public class ScmVehRebateVehDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("状态")
+    private String state; // 状态
     @ApiModelProperty("备注")
     private String remarks; // 备注
 	@ApiModelProperty("品牌sid")
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 e51fbd2d24..cb3a946818 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
@@ -57,7 +57,7 @@ public class ScmVehRebateVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime; // 创建日期
-    @ApiModelProperty("状态（0未提计，1已提计，2待核对，3已核对）")
+    @ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
     private String state; // 状态
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
@@ -87,6 +87,8 @@ public class ScmVehRebateVo implements Vo {
     private String estimateRebate; // 预计返利
 	@ApiModelProperty("所属年月")
     private String palceGenDate; // 所属年月
+    @ApiModelProperty("所属年月(页面展示)")
+    private String palceGenDateCopy; // 所属年月(页面展示)
 	@ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
 	@ApiModelProperty("上传日期")
@@ -119,5 +121,6 @@ public class ScmVehRebateVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-
+    @ApiModelProperty("上传状态(0未调整、1已调整、2未上传、3已上传)")
+    private String uploadState; // 上传状态
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java
new file mode 100644
index 0000000000..2ea74346c1
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapply.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply <br/>
+ * Description: 单车返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表", description = "单车返利核对申请表")
+@TableName("scm_vehrebate_checkapply")
+public class ScmVehrebateCheckapply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java
new file mode 100644
index 0000000000..f68e8922ba
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java
@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表 视图数据详情", description = "单车返利核对申请表 视图数据详情")
+public class ScmVehrebateCheckapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+    @ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+    @ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+    @ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+	@ApiModelProperty("本月核对本月已上传单车返利信息")
+    private List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息
+    @ApiModelProperty("本月核对往月已上传单车返利信息")
+    private List<ScmVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java
new file mode 100644
index 0000000000..44de46431c
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDto.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto <br/>
+ * Description: 单车返利核对申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表 数据传输对象", description = "单车返利核对申请表 数据传输对象")
+public class ScmVehrebateCheckapplyDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("本月核对本月已上传单车返利信息")
+    private List<ScmVehrebateCheckapplydetailDto> scmWhenVehrebateCheckapplydetailDetails; // 本月核对本月已上传单车返利信息
+    @ApiModelProperty("本月核对往月已上传单车返利信息")
+    private List<ScmVehrebateCheckapplydetailDto> scmLastVehrebateCheckapplydetailDetails; // 本月核对往月已上传单车返利信息
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java
new file mode 100644
index 0000000000..9277e62ff2
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeign <br/>
+ * Description: 单车返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "单车返利核对申请表")
+@FeignClient(
+        contextId = "anrui-scm-ScmVehrebateCheckapply",
+        name = "anrui-scm",
+        path = "v1/scmvehrebatecheckapply",
+        fallback = ScmVehrebateCheckapplyFeignFallback.class)
+public interface ScmVehrebateCheckapplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehrebateCheckapplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java
new file mode 100644
index 0000000000..0d923f9222
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeignFallback <br/>
+ * Description: 单车返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmVehrebateCheckapplyFeignFallback implements ScmVehrebateCheckapplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(PagerQuery<ScmVehrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmvehrebatecheckapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehrebateCheckapplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmvehrebatecheckapply/fetchDetailsBySid无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java
new file mode 100644
index 0000000000..2ec3ed0a56
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyQuery.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery <br/>
+ * Description: 单车返利核对申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表 查询条件", description = "单车返利核对申请表 查询条件")
+public class ScmVehrebateCheckapplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+}
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
new file mode 100644
index 0000000000..4c3782aa1a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyVo.java
@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo <br/>
+ * Description: 单车返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表 视图数据对象", description = "单车返利核对申请表 视图数据对象")
+public class ScmVehrebateCheckapplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+    @ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+    @ApiModelProperty("待确定金额")
+    private String stayDetermineMoney; // 待确定金额
+    @ApiModelProperty("费用")
+    private String money; // 费用
+    @ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java
new file mode 100644
index 0000000000..393019baac
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetail.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetail.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表_返利列表", description = "单车返利核对申请表_返利列表")
+@TableName("scm_vehrebate_checkapplydetail")
+public class ScmVehrebateCheckapplydetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("单车返利sid")
+    private String vehRebateSid; // 单车返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}
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
new file mode 100644
index 0000000000..e84529f83c
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java
@@ -0,0 +1,86 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表_返利列表 视图数据详情", description = "单车返利核对申请表_返利列表 视图数据详情")
+public class ScmVehrebateCheckapplydetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("所属年月")
+    private String palceGenDate; // 所属年月
+    @ApiModelProperty("所属年月(页面展示)")
+    private String palceGenDateCopy; // 所属年月(页面展示)
+    @ApiModelProperty("返利类型key")
+    private String rebateTypeKey; // 返利类型key
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue; // 返利类型value
+    @ApiModelProperty("台数")
+    private String num; // 台数
+    @ApiModelProperty("预提数量")
+    private String withholdingAmount; // 预提数量
+    @ApiModelProperty("上传数量")
+    private String uploadAmount; // 上传数量
+    @ApiModelProperty("预提金额")
+    private String withRebate; // 预提金额
+    @ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+    @ApiModelProperty("待确定金额")
+    private String stayDetermineMoney; // 待确定金额
+    @ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+    @ApiModelProperty("费用")
+    private String money; // 费用
+	@ApiModelProperty("单车返利sid")
+    private String vehRebateSid; // 单车返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+    @ApiModelProperty("单车返利sid")
+    private List<String> vehRebateSids; // 单车返利sid
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java
new file mode 100644
index 0000000000..66eac7e50d
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDto.java
@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表_返利列表 数据传输对象", description = "单车返利核对申请表_返利列表 数据传输对象")
+public class ScmVehrebateCheckapplydetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("单车返利sid")
+    private List<String> vehRebateSids; // 单车返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java
new file mode 100644
index 0000000000..f644123ff1
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java
@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign <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
+ */
+@Api(tags = "单车返利核对申请表_返利列表")
+@FeignClient(
+        contextId = "anrui-scm-ScmVehrebateCheckapplydetail",
+        name = "anrui-scm",
+        path = "v1/scmvehrebatecheckapplydetail",
+        fallback = ScmVehrebateCheckapplydetailFeignFallback.class)
+public interface ScmVehrebateCheckapplydetailFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplydetailQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java
new file mode 100644
index 0000000000..d425151fd0
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeignFallback <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
+ */
+@Component
+public class ScmVehrebateCheckapplydetailFeignFallback implements ScmVehrebateCheckapplydetailFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(PagerQuery<ScmVehrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmVehrebateCheckapplydetailDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatecheckapplydetail/delBySids无法访问");
+	}
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailQuery.java
new file mode 100644
index 0000000000..f0682dc164
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表_返利列表 查询条件", description = "单车返利核对申请表_返利列表 查询条件")
+public class ScmVehrebateCheckapplydetailQuery implements Query {
+
+	@ApiModelProperty("单车返利sid")
+    private String vehRebateSid; // 单车返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java
new file mode 100644
index 0000000000..f8f817e569
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo <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
+ */
+@Data
+@ApiModel(value = "单车返利核对申请表_返利列表 视图数据对象", description = "单车返利核对申请表_返利列表 视图数据对象")
+public class ScmVehrebateCheckapplydetailVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("单车返利sid")
+    private String vehRebateSid; // 单车返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
index 4cd9446945..69334686d0 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
@@ -63,6 +63,8 @@ public class ScmVehRebateWithApplyVo implements Vo {
     private String brandName; // 品牌名称
 	@ApiModelProperty("预提申请")
     private String withApply; // 预提申请
+    @ApiModelProperty("预提返利合计")
+    private String withRebateTotal; // 预提返利合计
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
index 95a469348c..bbba578f08 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,7 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 	
 	@Select("select * from scm_veh_rebate")
 	List<ScmVehRebateVo> selectListVo();
+
+	@Update("update from scm_veh_rebate set state = 1 where sid = #{sid}")
+    void updateState(String sid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
index 03f23cf6cb..f8b61b5a98 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
@@ -80,6 +80,13 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 		return rb.success().setData(pv);
 	}
 
+	@Override
+	public ResultBean<PagerVo<ScmVehRebateVo>> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehRebateVo> pv = scmVehRebateService.checkApplyGetAlreadyUploadVehRebate(pq);
+		return rb.success().setData(pv);
+	}
+
 	@Override
 	public ResultBean save(@RequestBody ScmVehRebateDto dto){
 		return scmVehRebateService.saveAll(dto);
@@ -88,10 +95,16 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
 	@Override
 	public ResultBean update(ScmVehRebateVehDto dto) {
 		ResultBean rb = ResultBean.fireFail();
+		dto.setState("3");
 		scmVehRebateService.updateBySid(dto,dto.getSid());
 		return rb.success().setMsg("修改成功");
 	}
 
+	@Override
+	public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
+		return scmVehRebateService.adjustment(dto);
+	}
+
 	@Override
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
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 42a42f3ab1..bdb8832c7b 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
@@ -26,6 +26,8 @@
 package com.yxt.anrui.scm.biz.scmvehrebate;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.scm.api.scmvehrebate.*;
@@ -38,6 +40,7 @@ import com.yxt.common.core.vo.PagerVo;
 
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -153,12 +156,65 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
         qw.eq("createOrgSid",query.getCreateOrgSid());
-        qw.eq("state", 2);
+        qw.ne("state", 0);
+        IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehRebateVo record : pagging.getRecords()) {
+            //上传状态：未上传
+            if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())){
+                record.setUploadState("2");
+            }
+            //上传状态：已上传
+            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) &&  record.getIsAdjustment().equals("否")){
+                record.setUploadState("3");
+            }
+            //上传状态：未调整
+            if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney()) &&  record.getIsAdjustment().equals("是")){
+                record.setUploadState("0");
+            }
+        }
+        PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<ScmVehRebateVo> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
+        ScmVehRebateQuery query = pq.getParams();
+        QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.like("vehModelName", query.getVehModelName());
+        }
+        if (StringUtils.isNotBlank(query.getVinNo())) {
+            qw.like("vinNo", query.getVinNo());
+        }
+        if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
+            qw.eq("rebateTypeKey", query.getRebateTypeKey());
+        }
+        if (StringUtils.isNotBlank(query.getRebateName())) {
+            qw.like("rebateName", query.getRebateName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("createOrgSid",query.getCreateOrgSid());
+        qw.eq("state", 3);
         if (query.getSidList().size() > 0) {
             qw.notIn("sid", query.getSidList());
         }
         IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehRebateVo record : pagging.getRecords()) {
+            String palceGenDate = record.getPalceGenDate();
+            Date parse = DateUtil.parse(palceGenDate);
+            int year = DateUtil.year(parse);
+            int month = DateUtil.month(parse) + 1;
+            String palceGenDateCopy = year + "年" + month + "月";
+            record.setPalceGenDateCopy(palceGenDateCopy);
+        }
         PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -201,4 +257,26 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         return rb.success().setMsg("保存成功");
     }
+
+    public void updateState(String sid) {
+        baseMapper.updateState(sid);
+    }
+
+    public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        ScmVehRebate scmVehRebate = fetchBySid(sid);
+        ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto();
+        BeanUtil.copyProperties(scmVehRebate,scmVehRebateVehDto);
+        scmVehRebateVehDto.setSecondaryUploadDate(dto.getSecondaryUploadDate());
+        scmVehRebateVehDto.setSecondaryUploadMoney(dto.getSecondaryUploadMoney());
+        scmVehRebateVehDto.setStayDetermineMoney(dto.getStayDetermineMoney());
+        int mon = Integer.parseInt(scmVehRebateVehDto.getMoney());
+        int cost = Integer.parseInt(dto.getCost());
+        String money = String.valueOf(mon + cost);
+        scmVehRebateVehDto.setMoney(money);
+        scmVehRebateVehDto.setAdjustmentMoney(dto.getAdjustmentMoney());
+        updateBySid(scmVehRebateVehDto,sid);
+        return rb.success().setMsg("调整成功");
+    }
 }
\ No newline at end of file
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
new file mode 100644
index 0000000000..ce61948f81
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
+
+import java.util.List;
+
+/**
+ * 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();
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..e69676daf4
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
+        SELECT
+        svc.*,
+        SUM(svr.`estimateRebate`) estimateRebate,
+        SUM(svr.`uploadMoney`) uploadMoney,
+        SUM(svr.`stayDetermineMoney`) stayDetermineMoney,
+        SUM(svr.`adjustmentMoney`) adjustmentMoney,
+        SUM(svr.`money`) money
+        FROM
+        scm_vehrebate_checkapply svc
+        LEFT JOIN scm_vehrebate_checkapplydetail svcd
+        ON svc.`sid` = svcd.`mainSid`
+        LEFT JOIN scm_veh_rebate svr
+        ON svr.`sid` = svcd.`vehRebateSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo">
+        SELECT * FROM scm_vehrebate_checkapply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>
\ 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
new file mode 100644
index 0000000000..d4f1dd5efc
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
+
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyFeign;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyRest <br/>
+ * Description: 单车返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:00 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "单车返利核对申请表")
+@RestController("com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyRest")
+@RequestMapping("v1/scmvehrebatecheckapply")
+public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
+
+	@Autowired
+	private ScmVehrebateCheckapplyService scmVehrebateCheckapplyService;
+	@Autowired
+	private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehrebateCheckapplyVo> pv = scmVehrebateCheckapplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehrebateCheckapplyDto dto){
+		return scmVehrebateCheckapplyService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return scmVehrebateCheckapplyService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return scmVehrebateCheckapplyService.fetchDetailsBySid(sid);
+	}
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
new file mode 100644
index 0000000000..824552015e
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
@@ -0,0 +1,246 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapply.ScmVehrebateCheckapplyService <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
+ */
+@Service
+public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehrebateCheckapplyMapper, ScmVehrebateCheckapply> {
+
+    @Autowired
+    ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
+
+    private QueryWrapper<ScmVehrebateCheckapply> createQueryWrapper(ScmVehrebateCheckapplyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmVehrebateCheckapplyVo> listPageVo(PagerQuery<ScmVehrebateCheckapplyQuery> pq) {
+        ScmVehrebateCheckapplyQuery query = pq.getParams();
+        QueryWrapper<ScmVehrebateCheckapply> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("svc.brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getCheckApply())) {
+            qw.like("svc.checkApply", query.getCheckApply());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (svc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("svc.createOrgSid", query.getCreateOrgSid());
+        IPage<ScmVehrebateCheckapply> page = PagerUtil.queryToPage(pq);
+        IPage<ScmVehrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<ScmVehrebateCheckapplyVo> records = pagging.getRecords();
+        for (ScmVehrebateCheckapplyVo record : records) {
+            record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
+            record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
+            record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0,record.getStayDetermineMoney().lastIndexOf(".")));
+            record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
+            record.setMoney(record.getMoney().substring(0,record.getMoney().lastIndexOf(".")));
+        }
+        PagerVo<ScmVehrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(ScmVehrebateCheckapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<ScmVehrebateCheckapplydetailDto> scmWhenVehrebateCheckapplydetailDetails = dto.getScmWhenVehrebateCheckapplydetailDetails();
+        List<ScmVehrebateCheckapplydetailDto> scmLastVehrebateCheckapplydetailDetails = dto.getScmLastVehrebateCheckapplydetailDetails();
+        if (scmWhenVehrebateCheckapplydetailDetails.size() < 1 && scmLastVehrebateCheckapplydetailDetails.size() < 1) {
+            return rb.setMsg("请选择已核对单车返利信息");
+        }
+        if (StringUtils.isBlank(dtoSid)) {
+            String sid = this.insertByDto(dto).getData();
+            if (scmWhenVehrebateCheckapplydetailDetails.size() > 0) {
+                for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) {
+                    for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
+                        ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
+                        scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
+                        scmVehrebateCheckapplydetail1.setMainSid(sid);
+                        scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
+                    }
+                }
+            }
+            if (scmLastVehrebateCheckapplydetailDetails.size() > 0) {
+                for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) {
+                    for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
+                        ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
+                        scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
+                        scmVehrebateCheckapplydetail1.setMainSid(sid);
+                        scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
+                    }
+                }
+            }
+            return rb.success().setMsg("添加成功");
+        }
+        ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(dtoSid);
+        if (scmVehrebateCheckapply == null) {
+            return rb.setMsg("该核对申请单不存在");
+        }
+        this.updateByDto(dto);
+        scmVehrebateCheckapplydetailService.delByMainSid(dtoSid);
+        if (scmWhenVehrebateCheckapplydetailDetails.size() > 0) {
+            for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmWhenVehrebateCheckapplydetailDetails) {
+                for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
+                    ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
+                    scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
+                    scmVehrebateCheckapplydetail1.setMainSid(dtoSid);
+                    scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
+                }
+            }
+        }
+        if (scmLastVehrebateCheckapplydetailDetails.size() > 0) {
+            for (ScmVehrebateCheckapplydetailDto scmVehrebateCheckapplydetail : scmLastVehrebateCheckapplydetailDetails) {
+                for (String vehRebateSid : scmVehrebateCheckapplydetail.getVehRebateSids()) {
+                    ScmVehrebateCheckapplydetail scmVehrebateCheckapplydetail1 = new ScmVehrebateCheckapplydetail();
+                    scmVehrebateCheckapplydetail1.setVehRebateSid(vehRebateSid);
+                    scmVehrebateCheckapplydetail1.setMainSid(dtoSid);
+                    scmVehrebateCheckapplydetailService.save(scmVehrebateCheckapplydetail1);
+                }
+            }
+        }
+        return rb.success().setMsg("修改成功");
+    }
+
+    public ResultBean<String> insertByDto(ScmVehrebateCheckapplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehrebateCheckapply entity = new ScmVehrebateCheckapply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+        return rb.success().setData(entity.getSid());
+    }
+
+    public void updateByDto(ScmVehrebateCheckapplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        ScmVehrebateCheckapply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmVehrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmVehrebateCheckapply entity = fetchBySid(sid);
+        ScmVehrebateCheckapplyDetailsVo vo = new ScmVehrebateCheckapplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        delBySids(sids);
+        for (String sid : sids) {
+            scmVehrebateCheckapplydetailService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmVehrebateCheckapplyDetailsVo scmVehrebateCheckapplyDetailsVo = new ScmVehrebateCheckapplyDetailsVo();
+        ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(sid);
+        BeanUtil.copyProperties(scmVehrebateCheckapply,scmVehrebateCheckapplyDetailsVo);
+        List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
+        if (scmWhenVehrebateCheckapplydetailDetailsVos.size() > 0){
+            for (ScmVehrebateCheckapplydetailDetailsVo scmWhenVehrebateCheckapplydetailDetailsVo : scmWhenVehrebateCheckapplydetailDetailsVos) {
+                String vehRebateSid = scmWhenVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
+                String[] vehRebateSids = vehRebateSid.split(",");
+                scmWhenVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
+                scmWhenVehrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
+                scmWhenVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
+                scmWhenVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
+                scmWhenVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
+                scmWhenVehrebateCheckapplydetailDetailsVo.setMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
+            }
+        }
+        scmVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(scmWhenVehrebateCheckapplydetailDetailsVos);
+        List<ScmVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
+        if (scmLastVehrebateCheckapplydetailDetailsVos.size() > 0){
+            for (ScmVehrebateCheckapplydetailDetailsVo scmLastVehrebateCheckapplydetailDetailsVo : scmLastVehrebateCheckapplydetailDetailsVos) {
+                String vehRebateSid = scmLastVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
+                String[] vehRebateSids = vehRebateSid.split(",");
+                scmLastVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
+                scmLastVehrebateCheckapplydetailDetailsVo.setWithRebate(scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
+                scmLastVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
+                scmLastVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
+                scmLastVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
+                scmLastVehrebateCheckapplydetailDetailsVo.setMoney(scmLastVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
+                String palceGenDate = scmLastVehrebateCheckapplydetailDetailsVo.getPalceGenDate();
+                Date parse = DateUtil.parse(palceGenDate);
+                int year = DateUtil.year(parse);
+                int month = DateUtil.month(parse) + 1;
+                String palceGenDateCopy = year + "年" + month + "月";
+                scmLastVehrebateCheckapplydetailDetailsVo.setPalceGenDateCopy(palceGenDateCopy);
+            }
+        }
+        scmVehrebateCheckapplyDetailsVo.setScmLastVehrebateCheckapplydetailDetails(scmLastVehrebateCheckapplydetailDetailsVos);
+        return rb.success().setData(scmVehrebateCheckapplyDetailsVo);
+    }
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
new file mode 100644
index 0000000000..ca997e45af
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper <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 ScmVehrebateCheckapplydetailMapper extends BaseMapper<ScmVehrebateCheckapplydetail> {
+
+	//@Update("update scm_vehrebate_checkapplydetail set name=#{msg} where id=#{id}")
+	//IPage<ScmVehrebateCheckapplydetailVo> voPage(IPage<ScmVehrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehrebateCheckapplydetail> qw);
+	
+	IPage<ScmVehrebateCheckapplydetailVo> selectPageVo(IPage<ScmVehrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapplydetail> qw);
+	
+	List<ScmVehrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehrebateCheckapplydetail> qw);
+	
+	@Select("select * from scm_vehrebate_checkapplydetail")
+	List<ScmVehrebateCheckapplydetailVo> selectListVo();
+
+	@Delete("delete from scm_vehrebate_checkapplydetail where mainSid = #{sid}")
+    void delByMainSid(String sid);
+
+	List<ScmVehrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
+
+	List<ScmVehrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..ffdca20f7e
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo">
+        SELECT * FROM scm_vehrebate_checkapplydetail
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo">
+        SELECT * FROM scm_vehrebate_checkapplydetail
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchWhenDetailsVoBySid"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo">
+        SELECT svr.rebateTypeKey,
+               svr.`rebateTypeValue`,
+               SUM(svr.`estimateRebate`)        withRebate,
+               COUNT(*)                         num,
+               GROUP_CONCAT(svc.`vehRebateSid`) vehRebateSid,
+               SUM(svr.`uploadMoney`)           uploadMoney,
+               SUM(svr.`stayDetermineMoney`)    stayDetermineMoney,
+               SUM(svr.`adjustmentMoney`)       adjustmentMoney,
+               SUM(svr.`money`)                 money
+        FROM scm_vehrebate_checkapplydetail svc
+                     LEFT JOIN scm_veh_rebate svr
+                ON svr.`sid` = svc.`vehRebateSid`
+        WHERE svc.`mainSid` = #{sid}
+          AND DATE_FORMAT(svr.palceGenDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        GROUP BY svr.`rebateTypeKey`
+    </select>
+
+    <select id="fetchLastDetailsVoBySid"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo">
+        SELECT svr.palceGenDate,
+               SUM(svr.`estimateRebate`)        withRebate,
+               COUNT(*)                         withholdingAmount,
+               COUNT(*)                         uploadAmount,
+               GROUP_CONCAT(svc.`vehRebateSid`) vehRebateSid,
+               SUM(svr.`uploadMoney`)           uploadMoney,
+               SUM(svr.`stayDetermineMoney`)    stayDetermineMoney,
+               SUM(svr.`adjustmentMoney`)       adjustmentMoney,
+               SUM(svr.`money`)                 money
+        FROM scm_vehrebate_checkapplydetail svc
+                     LEFT JOIN scm_veh_rebate svr
+                ON svr.`sid` = svc.`vehRebateSid`
+        WHERE svc.`mainSid` = #{sid}
+          AND DATE_FORMAT(svr.palceGenDate, '%Y%m') != DATE_FORMAT(CURDATE(), '%Y%m')
+        GROUP BY svr.palceGenDate
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java
new file mode 100644
index 0000000000..b902d686ab
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailRest <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
+ */
+@Api(tags = "单车返利核对申请表_返利列表")
+@RestController("com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailRest")
+@RequestMapping("v1/scmvehrebatecheckapplydetail")
+public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplydetailFeign {
+
+	@Autowired
+	private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmVehrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmVehrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmVehrebateCheckapplydetailVo> pv = scmVehrebateCheckapplydetailService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmVehrebateCheckapplydetailDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehrebateCheckapplydetailService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmVehrebateCheckapplydetailService.delBySids(sids);
+		return rb.success();
+	}
+}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java
new file mode 100644
index 0000000000..9fed7b812a
--- /dev/null
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java
@@ -0,0 +1,115 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplydetailService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService <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
+ */
+@Service
+public class ScmVehrebateCheckapplydetailService extends MybatisBaseService<ScmVehrebateCheckapplydetailMapper, ScmVehrebateCheckapplydetail> {
+	private QueryWrapper<ScmVehrebateCheckapplydetail> createQueryWrapper(ScmVehrebateCheckapplydetailQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmVehrebateCheckapplydetail> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmVehrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmVehrebateCheckapplydetailQuery> pq) {
+		ScmVehrebateCheckapplydetailQuery query = pq.getParams();
+		QueryWrapper<ScmVehrebateCheckapplydetail> qw = createQueryWrapper(query);
+		IPage<ScmVehrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
+		IPage<ScmVehrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmVehrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmVehrebateCheckapplydetailDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmVehrebateCheckapplydetailDto dto){
+		ScmVehrebateCheckapplydetail entity = new ScmVehrebateCheckapplydetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmVehrebateCheckapplydetailDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmVehrebateCheckapplydetail entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public void delByMainSid(String sid) {
+		baseMapper.delByMainSid(sid);
+	}
+
+	public List<ScmVehrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid) {
+		return baseMapper.fetchWhenDetailsVoBySid(sid);
+	}
+
+	public List<ScmVehrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid) {
+		return baseMapper.fetchLastDetailsVoBySid(sid);
+	}
+}
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
index 2e333dedca..6cc5971275 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
@@ -69,4 +69,7 @@ public interface ScmVehRebateWithMapper extends BaseMapper<ScmVehRebateWith> {
     void delByMainSid(String dtoSid);
 
     List<ScmVehRebateWithDetailsVo> fetchByMainSid(String sid);
+
+	@Select("select vehRebateSid from scm_veh_rebate_with where mainSid = #{businessSid}")
+	List<String> fetchVehReBateSidByMainSid(String businessSid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
index ce2b9e0221..4e17e5300f 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
@@ -20,7 +20,7 @@
     <select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo">
         SELECT svr.rebateTypeKey,
                svr.`rebateTypeValue`,
-               SUM(svr.`estimateRebate`)         estimateRebate,
+               SUM(svr.`estimateRebate`)         withRebate,
                COUNT(*)                          num,
                GROUP_CONCAT(svrw.`vehRebateSid`) vehRebateSid
         FROM scm_veh_rebate_with svrw
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
index 4edf3ab07e..73fecc3e56 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
@@ -151,4 +151,8 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
         }
         return rb.success().setData(scmVehRebateDetailsVos);
     }
+
+    public List<String> fetchVehReBateSidByMainSid(String businessSid) {
+        return baseMapper.fetchVehReBateSidByMainSid(businessSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
index cb8863cb60..be11bc0208 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
@@ -1,28 +1,42 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
-		SELECT * FROM scm_veh_rebate_with_apply <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
-		SELECT * FROM scm_veh_rebate_with_apply <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
+        SELECT
+        svrwa.*,
+        SUM(svr.`estimateRebate`) withRebateTotal
+        FROM
+        scm_veh_rebate_with_apply svrwa
+        LEFT JOIN scm_veh_rebate_with svrw
+        ON svrwa.`sid` = svrw.`mainSid`
+        LEFT JOIN scm_veh_rebate svr
+        ON svr.`sid` = svrw.`vehRebateSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 
-	<update id="updateFlowFiled">
-		UPDATE scm_veh_rebate_with_apply
-		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
-		<if test="procDefId != null and procDefId != ''">
-			, procDefId=#{procDefId}
-		</if>
-		<if test="procInsId != null and procInsId != ''">
-			, procInstId=#{procInsId}
-		</if>
-		<if test="taskId != null and taskId != ''">
-			, taskId=#{taskId}
-		</if>
-		WHERE sid=#{sid}
+    <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
+        SELECT * FROM scm_veh_rebate_with_apply
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <update id="updateFlowFiled">
+        UPDATE scm_veh_rebate_with_apply
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid=#{sid}
     </update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
index 6884c354cf..73788ceabf 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
@@ -45,8 +45,8 @@ import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto;
+import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
 import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService;
-import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -62,7 +62,6 @@ import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -85,6 +84,8 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
     @Autowired
     private ScmVehRebateWithService scmVehRebateWithService;
     @Autowired
+    private ScmVehRebateService scmVehRebateService;
+    @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private FlowableFeign flowableFeign;
@@ -104,19 +105,24 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
         ScmVehRebateWithApplyQuery query = pq.getParams();
         QueryWrapper<ScmVehRebateWithApply> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getBrandSid())) {
-            qw.eq("brandSid", query.getBrandSid());
+            qw.eq("svrwa.brandSid", query.getBrandSid());
         }
         if (StringUtils.isNotBlank(query.getWithApply())) {
-            qw.like("withApply", query.getWithApply());
+            qw.like("svrwa.withApply", query.getWithApply());
         }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
-        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
-        qw.eq("createOrgSid", query.getCreateOrgSid());
+        qw.eq("svrwa.createOrgSid", query.getCreateOrgSid());
         IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (ScmVehRebateWithApplyVo record : pagging.getRecords()) {
+            String withRebateTotal = record.getWithRebateTotal();
+            withRebateTotal = withRebateTotal.substring(0, withRebateTotal.lastIndexOf("."));
+            record.setWithRebateTotal(withRebateTotal);
+        }
         PagerVo<ScmVehRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -203,6 +209,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
         for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
             String[] vehRebateSids = scmVehRebateWithDetailsVo.getVehRebateSid().split(",");
             scmVehRebateWithDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
+            String withRebate = scmVehRebateWithDetailsVo.getWithRebate();
+            withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
+            scmVehRebateWithDetailsVo.setWithRebate(withRebate);
         }
         scmVehRebateWithApplyDetailsVo.setScmVehRebateWiths(scmVehRebateWithDetailsVos);
         return rb.success().setData(scmVehRebateWithApplyDetailsVo);
@@ -310,6 +319,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid());
+        List<String> vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid());
         if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -317,6 +327,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (String vehRebateSid : vehRebateSids) {
+                    scmVehRebateService.updateState(vehRebateSid);
+                }
             }
             return rb.success().setData(resultBean.getData());
         } else {