diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
index 237a266ea6..39485a44ff 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
@@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -56,6 +58,9 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("创建日期")
+    private Date createTime;
     @ApiModelProperty("备注")
     private String remarks; // 备注
     @ApiModelProperty("申请部门sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java
index 7089cb6585..46a7e7be3c 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java
@@ -26,10 +26,8 @@
 package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*;
+import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmSpecialRebatedistributeDelegateQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -118,4 +116,14 @@ public interface ScmSpecialrebateCheckapplyFeign {
     @GetMapping(value = "/getPreviousNodesForReject")
     ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody ScmSpecialRebateCheckApplyDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody ScmSpecialRebateCheckApplyDelegateQuery delegateQuery);
+
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java
index 3f7d7fa749..127a018b64 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java
@@ -26,7 +26,9 @@
 package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -104,12 +106,22 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate
 	}
 
 	@Override
-	public ResultBean<List<com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo>> getNextNodesForSubmit(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
 		return null;
 	}
 
 	@Override
-	public ResultBean<List<com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo>> getPreviousNodesForReject(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery delegateQuery) {
+		return null;
+	}
+
+	@Override
+	public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery delegateQuery) {
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyDelegateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyDelegateQuery.java
new file mode 100644
index 0000000000..cb0c22ac62
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/flow/ScmSpecialRebateCheckApplyDelegateQuery.java
@@ -0,0 +1,23 @@
+package com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/11
+ **/
+@Data
+public class ScmSpecialRebateCheckApplyDelegateQuery {
+
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java
index ca5218a637..58556027bb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeign.java
@@ -27,7 +27,6 @@ package com.yxt.anrui.scm.api.scmspecialrebatedistribute;
 
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.*;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -119,10 +118,10 @@ public interface ScmSpecialrebatedistributeFeign {
     @ApiOperation(value = "加签")
     @PutMapping(value = "/delegate")
     @ResponseBody
-    public ResultBean delegate(@RequestBody ScmScmSpecialRebatedistributeDelegateQuery delegateQuery);
+    public ResultBean delegate(@RequestBody ScmSpecialRebatedistributeDelegateQuery delegateQuery);
 
     @ApiOperation(value = "转办")
     @PutMapping(value = "/assignTask")
     @ResponseBody
-    public ResultBean assignTask(@RequestBody ScmScmSpecialRebatedistributeDelegateQuery delegateQuery);
+    public ResultBean assignTask(@RequestBody ScmSpecialRebatedistributeDelegateQuery delegateQuery);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeignFallback.java
index fbe63f3c82..89fe0f07f1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeFeignFallback.java
@@ -113,12 +113,12 @@ public class ScmSpecialrebatedistributeFeignFallback implements ScmSpecialrebate
 	}
 
 	@Override
-	public ResultBean delegate(ScmScmSpecialRebatedistributeDelegateQuery delegateQuery) {
+	public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery delegateQuery) {
 		return null;
 	}
 
 	@Override
-	public ResultBean assignTask(ScmScmSpecialRebatedistributeDelegateQuery delegateQuery) {
+	public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery delegateQuery) {
 		return null;
 	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmScmSpecialRebatedistributeDelegateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmSpecialRebatedistributeDelegateQuery.java
similarity index 89%
rename from anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmScmSpecialRebatedistributeDelegateQuery.java
rename to anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmSpecialRebatedistributeDelegateQuery.java
index 2674edd70b..402299e731 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmScmSpecialRebatedistributeDelegateQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/flow/ScmSpecialRebatedistributeDelegateQuery.java
@@ -9,7 +9,7 @@ import lombok.Data;
  * @date: 2024/5/11
  **/
 @Data
-public class ScmScmSpecialRebatedistributeDelegateQuery {
+public class ScmSpecialRebatedistributeDelegateQuery {
 
     private String userSid;
     @ApiModelProperty("流程实例id")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
index 3e0fa22781..b29792a033 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
@@ -29,10 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -128,4 +125,14 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
 	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
 		return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query);
 	}
+
+	@Override
+	public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) {
+		return scmSpecialrebateCheckapplyService.delegate(query);
+	}
+
+	@Override
+	public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) {
+		return scmSpecialrebateCheckapplyService.assignTask(query);
+	}
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
index e78aff87ee..5b7816eca2 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -46,6 +47,7 @@ import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialRebateCheckApplyDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
@@ -534,4 +536,20 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
 //        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
         return rb.success().setData(voList);
     }
+
+    public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.assignTask(delegateQuery);
+        return rb.success();
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
index a89c91d417..f92ba1fd37 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribute;
+
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeDetailsVo;
@@ -141,12 +141,12 @@ public class ScmSpecialrebatedistributeRest implements ScmSpecialrebatedistribut
 	}
 
 	@Override
-	public ResultBean delegate(ScmScmSpecialRebatedistributeDelegateQuery query) {
+	public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) {
 		return scmSpecialrebatedistributeService.delegate(query);
 	}
 
 	@Override
-	public ResultBean assignTask(ScmScmSpecialRebatedistributeDelegateQuery query) {
+	public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) {
 		return scmSpecialrebatedistributeService.assignTask(query);
 	}
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
index 6ae828db45..4f757f78aa 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java
@@ -44,12 +44,11 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeVo;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmScmSpecialRebatedistributeDelegateQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmSpecialRebatedistributeDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.SubmitScmSpecialRebatedistributeDto;
 import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetail;
 import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDto;
-import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailService;
 import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService;
@@ -64,7 +63,6 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribu
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeDto;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeFeign;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -469,7 +467,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
         return rb.success().setData(voList);
     }
 
-    public ResultBean delegate(ScmScmSpecialRebatedistributeDelegateQuery query) {
+    public ResultBean delegate(ScmSpecialRebatedistributeDelegateQuery query) {
         ResultBean rb = ResultBean.fireFail();
         FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
         BeanUtil.copyProperties(query, delegateQuery);
@@ -477,7 +475,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService<ScmSpe
         return rb.success();
     }
 
-    public ResultBean assignTask(ScmScmSpecialRebatedistributeDelegateQuery query) {
+    public ResultBean assignTask(ScmSpecialRebatedistributeDelegateQuery query) {
         ResultBean rb = ResultBean.fireFail();
         FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
         BeanUtil.copyProperties(query, delegateQuery);
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialRebateDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialRebateDetailsVo.java
new file mode 100644
index 0000000000..9398a8a662
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialRebateDetailsVo.java
@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply;
+
+
+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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo <br/>
+ * Description: 专项返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情")
+public class AppSpecialRebateDetailsVo implements Vo {
+
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue;
+    @ApiModelProperty("返利名称")
+    private String rebateName;
+    @ApiModelProperty("预计返利")
+    private String estimateRebate;
+    @ApiModelProperty("其中预提费用")
+    private BigDecimal withholdCost;
+    @ApiModelProperty("预计待支付费用")
+    private BigDecimal expectTreatCost;
+    @ApiModelProperty("预计支出费用")
+    private BigDecimal expectItureCost;
+    @ApiModelProperty("上传日期")
+    private String uploadDate;
+    @ApiModelProperty("上传金额")
+    private String uploadMoney;
+    @ApiModelProperty("待确定金额(动态)")
+    private String stayDetermineMoney;
+    @ApiModelProperty("费用")
+    private String money;
+    @ApiModelProperty("差异金额")
+    private BigDecimal diffAmount;
+    @ApiModelProperty("是否调整")
+    private String isAdjustment; // 是否调整
+    @ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+    @ApiModelProperty("调整说明")
+    private String adjustmentRemarks;
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java
new file mode 100644
index 0000000000..95cb5fea86
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply;
+
+
+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;
+import java.util.List;
+
+/**
+ * Project: anrui-scm(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo <br/>
+ * Description: 专项返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表 视图数据详情", description = "专项返利核对申请表 视图数据详情")
+public class AppSpecialrebateCheckapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("核对申请标题")
+    private String checkApply;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("创建日期")
+    private Date createTime;
+    @ApiModelProperty("备注")
+    private String remarks;
+	@ApiModelProperty("流程实例的sid")
+    private String procInsId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("按返利类型统计")
+    private List<AppSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails;
+    @ApiModelProperty("按预提年月统计")
+    private List<AppSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetails;
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java
new file mode 100644
index 0000000000..e7a56f4096
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyFeign.java
@@ -0,0 +1,73 @@
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply;
+
+
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "售后盘盈入库")
+@FeignClient(
+        contextId = "terminal-AppSpecialrebateCheckapply",
+        name = "anrui-terminal",
+        path = "v1/specialrebatecheckapply")
+public interface AppSpecialrebateCheckapplyFeign {
+
+    @ApiOperation("详情")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<AppSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("明细")
+    @GetMapping("/specialRebateCheckDetails/{sid}")
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid);
+
+    /**********************************************流程********************************************/
+
+    @ApiOperation("办理")
+    @PutMapping("/agreeCreditInfo")
+    @ResponseBody
+    ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
+
+    @ApiOperation("驳回")
+    @PutMapping("/rejectCreditInfo")
+    @ResponseBody
+    ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("撤回")
+    @PutMapping("/recallCreditInfo")
+    @ResponseBody
+    ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("终止")
+    @PutMapping("/stopCreditInfo")
+    @ResponseBody
+    ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
+
+    @ApiOperation(value = "加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
+
+    @ApiOperation(value = "转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java
new file mode 100644
index 0000000000..8d54a8d754
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply;
+
+
+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: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "专项返利核对申请表_返利列表 视图数据详情", description = "专项返利核对申请表_返利列表 视图数据详情")
+public class AppSpecialrebateCheckapplydetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+    @ApiModelProperty("返利类型value")
+    private String rebateTypeValue; // 返利类型value
+    @ApiModelProperty("台数")
+    private String num; // 台数
+    @ApiModelProperty("预提金额")
+    private String withRebate; // 预提金额
+    @ApiModelProperty("其中预提费用")
+    private String withholdCost;
+    @ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+    @ApiModelProperty("待确定金额")
+    private String stayDetermineMoney; // 待确定金额
+    @ApiModelProperty("费用")
+    private String money;
+    @ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+    @ApiModelProperty("费用调整金额")
+    private String fyAdjustmentMoney;
+
+    @ApiModelProperty("专项返利sid")
+    private String specialRebateSid; // 专项返利sid
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppDelegateQuery.java
new file mode 100644
index 0000000000..0da2bee9ad
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppDelegateQuery.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/9/28 10:16
+ */
+@Data
+public class AppDelegateQuery {
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowDto.java
new file mode 100644
index 0000000000..f0ed96b98a
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowDto.java
@@ -0,0 +1,37 @@
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:09
+ * @Description
+ */
+@Data
+public class AppFlowDto implements Dto {
+    private static final long serialVersionUID = 3626473483180150495L;
+
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：procInsId")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowQuery.java
new file mode 100644
index 0000000000..f4c9215bd2
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowQuery.java
@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:15
+ * @Description
+ */
+@Data
+public class AppFlowQuery implements Query {
+    private static final long serialVersionUID = 5514095179438249641L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowTaskQuery.java
new file mode 100644
index 0000000000..c6fbe9d95b
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/flowable/AppFlowTaskQuery.java
@@ -0,0 +1,47 @@
+package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/9 14:11
+ * @Description
+ */
+@Data
+public class AppFlowTaskQuery implements Query {
+    private static final long serialVersionUID = -7082170710942810289L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyRest.java
new file mode 100644
index 0000000000..a8cd33fb1a
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyRest.java
@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.specialrebatecheckapply;
+
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialRebateDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialrebateCheckapplyDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialrebateCheckapplyFeign;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("v1/specialrebatecheckapply")
+public class AppSpecialrebateCheckapplyRest implements AppSpecialrebateCheckapplyFeign {
+
+    @Autowired
+    private AppSpecialrebateCheckapplyService appSpecialrebateCheckapplyService;
+
+    @Override
+    public ResultBean<AppSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
+        return appSpecialrebateCheckapplyService.fetchDetailsBySid(sid);
+    }
+
+    @Override
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
+        return appSpecialrebateCheckapplyService.specialRebateCheckDetails(sid);
+    }
+
+    @Override
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        return appSpecialrebateCheckapplyService.agreeCreditInfo(dto);
+    }
+
+    @Override
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        return appSpecialrebateCheckapplyService.rejectCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        return appSpecialrebateCheckapplyService.recallCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        return appSpecialrebateCheckapplyService.stopCreditInfo(query);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        return appSpecialrebateCheckapplyService.getFlowOperateTitle(query);
+    }
+
+    @Override
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        return appSpecialrebateCheckapplyService.delegate(delegateQuery);
+    }
+
+    @Override
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        return appSpecialrebateCheckapplyService.assignTask(delegateQuery);
+    }
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java
new file mode 100644
index 0000000000..7bba103ba7
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java
@@ -0,0 +1,202 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.specialrebatecheckapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyFeign;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.ScmSpecialRebateCheckApplyDelegateQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.GetNodeVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialRebateDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialrebateCheckapplyDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppDelegateQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowDto;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowQuery;
+import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowTaskQuery;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AppSpecialrebateCheckapplyService {
+
+    @Resource
+    private ScmSpecialrebateCheckapplyFeign scmSpecialrebateCheckapplyFeign;
+    @Resource
+    private ScmSpecialrebateCheckapplydetailFeign scmSpecialrebateCheckapplydetailFeign;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    public ResultBean<AppSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialrebateCheckapplyDetailsVo data = scmSpecialrebateCheckapplyFeign.fetchDetailsBySid(sid).getData();
+        AppSpecialrebateCheckapplyDetailsVo appSpecialrebateCheckapplyDetailsVo = new AppSpecialrebateCheckapplyDetailsVo();
+        appSpecialrebateCheckapplyDetailsVo.setProcInsId(data.getProcInstId());
+        BeanUtil.copyProperties(data,appSpecialrebateCheckapplyDetailsVo);
+        List<AppSpecialrebateCheckapplydetailDetailsVo> when = appSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails();
+        List<AppSpecialrebateCheckapplydetailDetailsVo> last = appSpecialrebateCheckapplyDetailsVo.getScmLastSpecialrebateCheckapplydetailDetails();
+        for (AppSpecialrebateCheckapplydetailDetailsVo specialrebateCheckapplydetailDetailsVo : when) {
+            specialrebateCheckapplydetailDetailsVo.setSid(specialrebateCheckapplydetailDetailsVo.getSpecialRebateSid());
+        }
+        for (AppSpecialrebateCheckapplydetailDetailsVo specialrebateCheckapplydetailDetailsVo : last) {
+            specialrebateCheckapplydetailDetailsVo.setSid(specialrebateCheckapplydetailDetailsVo.getSpecialRebateSid());
+        }
+        return rb.success().setData(appSpecialrebateCheckapplyDetailsVo);
+    }
+
+    public ResultBean<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AppSpecialRebateDetailsVo> appSpecialRebateDetailsVos = new ArrayList<>();
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailFeign.specialRebateCheckDetails(sid).getData();
+        for (ScmSpecialRebateDetailsVo datum : data) {
+            AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
+            BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo);
+            appSpecialRebateDetailsVos.add(appSpecialRebateDetailsVo);
+        }
+        return rb.success().setData(appSpecialRebateDetailsVos);
+    }
+
+    public ResultBean agreeCreditInfo(AppFlowDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        ScmSpecialRebateCheckApplyCompleteDto scmSpecialRebateCheckApplyCompleteDto = new ScmSpecialRebateCheckApplyCompleteDto();
+        BeanUtil.copyProperties(dto, scmSpecialRebateCheckApplyCompleteDto);
+        scmSpecialRebateCheckApplyCompleteDto.setOrgSidPath(orgSidPath);
+        ResultBean resultBean = scmSpecialrebateCheckapplyFeign.complete(scmSpecialRebateCheckApplyCompleteDto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(query, flowTaskVo);
+        ResultBean resultBean = scmSpecialrebateCheckapplyFeign.taskReject(flowTaskVo);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(query, flowTaskVo);
+        ResultBean resultBean = scmSpecialrebateCheckapplyFeign.revokeProcess(flowTaskVo);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowTaskVo flowTaskVo = new FlowTaskVo();
+        BeanUtil.copyProperties(query, flowTaskVo);
+        ResultBean resultBean = scmSpecialrebateCheckapplyFeign.breakProcess(flowTaskVo);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setData(resultBean.getData());
+    }
+
+    public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        GetNodeQuery getNodeQuery = new GetNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<GetNodeVo>> getPreviousNodesForReject = scmSpecialrebateCheckapplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<GetNodeVo>> getNextNodesForSubmit = scmSpecialrebateCheckapplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
+    public ResultBean delegate(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateCheckApplyDelegateQuery delegateQuery1 = new
+                ScmSpecialRebateCheckApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        scmSpecialrebateCheckapplyFeign.delegate(delegateQuery1);
+        return rb.success();
+    }
+
+    public ResultBean assignTask(AppDelegateQuery delegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmSpecialRebateCheckApplyDelegateQuery delegateQuery1 = new
+                ScmSpecialRebateCheckApplyDelegateQuery();
+        BeanUtil.copyProperties(delegateQuery, delegateQuery1);
+        scmSpecialrebateCheckapplyFeign.assignTask(delegateQuery1);
+        return rb.success();
+    }
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeService.java
index 6e9fb5f29b..dd4745b2bd 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatedistribute/AppSpecialrebatedistributeService.java
@@ -37,7 +37,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribu
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeFeign;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.GetNodeVo;
-import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmScmSpecialRebatedistributeDelegateQuery;
+import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmSpecialRebatedistributeDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.ScmSpecialRebatedistributeCompleteDto;
 import com.yxt.anrui.terminal.api.supplychain.specialrebatedistribute.AppSpecialRebateDisGetVehVo;
 import com.yxt.anrui.terminal.api.supplychain.specialrebatedistribute.flowable.AppDelegateQuery;
@@ -183,8 +183,8 @@ public class AppSpecialrebatedistributeService {
 
     public ResultBean delegate(AppDelegateQuery delegateQuery) {
         ResultBean rb = ResultBean.fireFail();
-        ScmScmSpecialRebatedistributeDelegateQuery delegateQuery1 = new
-                ScmScmSpecialRebatedistributeDelegateQuery();
+        ScmSpecialRebatedistributeDelegateQuery delegateQuery1 = new
+                ScmSpecialRebatedistributeDelegateQuery();
         BeanUtil.copyProperties(delegateQuery, delegateQuery1);
         scmSpecialrebatedistributeFeign.delegate(delegateQuery1);
         return rb.success();
@@ -192,8 +192,8 @@ public class AppSpecialrebatedistributeService {
 
     public ResultBean assignTask(AppDelegateQuery delegateQuery) {
         ResultBean rb = ResultBean.fireFail();
-        ScmScmSpecialRebatedistributeDelegateQuery delegateQuery1 = new
-                ScmScmSpecialRebatedistributeDelegateQuery();
+        ScmSpecialRebatedistributeDelegateQuery delegateQuery1 = new
+                ScmSpecialRebatedistributeDelegateQuery();
         BeanUtil.copyProperties(delegateQuery, delegateQuery1);
         scmSpecialrebatedistributeFeign.assignTask(delegateQuery1);
         return rb.success();
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java
index 3b8c67dc08..ce0002aa09 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java
@@ -20,7 +20,9 @@ public class AsBusrepairBwBillPageListQuery implements Query {
     private String customerName;
     @ApiModelProperty("车牌号")
     private String vehMark;
-    //进场时间开始时间-进厂时间结束时间
-    private String entryTimeStart;
-    private String entryTimeEnd;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+    @ApiModelProperty("结算日期")
+    private String settleTimeStart;
+    private String settleTimeEnd;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapply.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapply.java
index c3f095748f..f012ee2763 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapply.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapply.java
@@ -62,6 +62,10 @@ public class AsBwinvoiceapply extends BaseEntity {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("开票单位sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("开票单位名称")
+    private String purchaseSystemName;
 	@ApiModelProperty("开票名称")
     private String invoiceTitle; // 开票名称
 	@ApiModelProperty("开票类型key")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDetailsVo.java
index 4c8a43e669..8b7475b189 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDetailsVo.java
@@ -74,6 +74,10 @@ public class AsBwinvoiceapplyDetailsVo implements Vo {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("开票单位sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("开票单位名称")
+    private String purchaseSystemName;
 	@ApiModelProperty("开票名称")
     private String invoiceTitle; // 开票名称
 	@ApiModelProperty("开票类型key")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDto.java
index d0851cfd6f..ad71e7a155 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapply/AsBwinvoiceapplyDto.java
@@ -70,6 +70,10 @@ public class AsBwinvoiceapplyDto implements Dto {
     private String deptSid; // 申请部门sid
 	@ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
+    @ApiModelProperty("开票单位sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("开票单位名称")
+    private String purchaseSystemName;
 	@ApiModelProperty("开票名称")
     private String invoiceTitle; // 开票名称
 	@ApiModelProperty("开票类型key")
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java
index 3eaeae8e02..83c731c732 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetail.java
@@ -85,4 +85,10 @@ public class AsBwinvoiceapplyDetail extends BaseEntity {
     private BigDecimal totalAmount; // 费用合计
     @ApiModelProperty("加税点项目")
     private String taxItems;
+    @ApiModelProperty("维修单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+    @ApiModelProperty("优惠")
+    private BigDecimal discountAmount;
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java
index ec0358c02f..66437782da 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDetailsVo.java
@@ -86,4 +86,10 @@ public class AsBwinvoiceapplyDetailDetailsVo implements Vo {
     private BigDecimal totalAmount; // 费用合计
     @ApiModelProperty("加税点项目")
     private String taxItems;
+    @ApiModelProperty("维修单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+    @ApiModelProperty("优惠")
+    private BigDecimal discountAmount;
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java
index bc36920adf..0e891494a6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailDto.java
@@ -86,4 +86,10 @@ public class AsBwinvoiceapplyDetailDto implements Dto {
     private BigDecimal totalAmount; // 费用合计
     @ApiModelProperty("加税点项目")
     private String taxItems;
+    @ApiModelProperty("维修单类型key")
+    private String billTypeKey;
+    @ApiModelProperty("维修单类型")
+    private String billType;
+    @ApiModelProperty("优惠")
+    private BigDecimal discountAmount;
 }
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 6b59506d60..713b996b6e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -1857,9 +1857,12 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         if (StringUtils.isNotBlank(query.getVehMark())) {
             qw.like("b.vehMark", query.getVehMark());
         }
+        if (StringUtils.isNotBlank(query.getBillType())) {
+            qw.like("a.billType", query.getBillType());
+        }
         //进厂时间开始时间-进厂时间结束时间
-        qw.apply(StringUtils.isNotBlank(query.getEntryTimeStart()), "date_format (a.entryTime,'%Y-%m-%d') >= date_format('" + query.getEntryTimeStart() + "','%Y-%m-%d')").
-                apply(StringUtils.isNotBlank(query.getEntryTimeEnd()), "date_format (a.entryTime,'%Y-%m-%d') <= date_format('" + query.getEntryTimeEnd() + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotBlank(query.getSettleTimeStart()), "date_format (a.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getSettleTimeEnd()), "date_format (a.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleTimeEnd() + "','%Y-%m-%d')"
                 );
         qw.eq("a.useOrgSid", useOrgSid);
         qw.eq("a.subject", "保外");