diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
index 7769e7a7b6..a9409bcf26 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
@@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -160,4 +161,9 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     public ResultBean<BaseManufacturerVo> queryBycertOrg(@PathVariable("certOrg") String certOrg);
 
+    @ApiOperation("厂家采购获取分公司销售通路")
+    @GetMapping("/selectNameByOrg")
+    @ResponseBody
+    ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query);
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
index 1bfa444cc8..9bac03f491 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
@@ -90,4 +90,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<BaseManufacturerVo> queryBycertOrg(String certOrg) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
new file mode 100644
index 0000000000..bdf7a9a58d
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 10:57
+ * @Description
+ */
+@Data
+public class BaseManufacturerListQuery implements Query {
+    private static final long serialVersionUID = -8298971718012436562L;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java
new file mode 100644
index 0000000000..ee475b4417
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 10:55
+ * @Description
+ */
+@Data
+public class BaseManufacturerListVo implements Vo {
+    private static final long serialVersionUID = 4951280280938626700L;
+    @ApiModelProperty("供应商sid")
+    private String sid;
+    @ApiModelProperty("供应商销售通路")
+    private String name;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
index f0fdc138f8..e891e03891 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
@@ -89,7 +89,7 @@ public interface BaseMiddlemanFeign {
     ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(@Valid @RequestBody PagerQuery<BaseMiddleQuery> query);
 
     @ApiOperation("车辆出库中介人员")
-    @PostMapping("/selectMiddleList")
+    @GetMapping("/selectMiddleList")
     @ResponseBody
     ResultBean<List<BaseMiddleListVo>> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
index e260fd4874..28f68ca407 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
@@ -140,4 +140,13 @@ public class BaseVehicle extends BaseEntity {
     private String witPinStateValue;
     @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
     private String isProblemVeh;
+    @ApiModelProperty(value = "采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty(value = "采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty(value = "厂家销售通路sid")
+    private String manufSaleAccessSid;
+    @ApiModelProperty(value = "厂家销售通路名称")
+    private String manufSaleAccessName;
+
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
index 44e77c77fa..9b205afa71 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
@@ -106,4 +106,12 @@ public class BaseVehicleDto implements Dto {
     private String witPinStateValue;
     @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
     private String isProblemVeh;
+    @ApiModelProperty(value = "采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty(value = "采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty(value = "厂家销售通路sid")
+    private String manufSaleAccessSid;
+    @ApiModelProperty(value = "厂家销售通路名称")
+    private String manufSaleAccessName;
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
index 71bddc72d3..3bb82628a3 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
@@ -166,6 +166,17 @@ public interface BaseVehicleFeign {
     @ResponseBody
     @ApiOperation(value = "导入")
     public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException;
+
+
+    /**
+     * 修改保存
+     *
+     * @param sid 车辆sid
+     * @return
+     */
+    @ApiOperation("修改车辆台账备注")
+    @PostMapping("/updateVehRemarks/{remarks}/{sid}")
+    public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid);
     /***************************************************** PC现车接口 **********************************************************/
 
     /**
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
index 176442b218..f5ec3ad9e9 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
@@ -98,6 +98,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateVehRemarks(String remarks, String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<BaseVehicleListVo>> exiCarPagerList(PagerQuery<ExiCarQuery> pq) {
         return null;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
index f43c6d442d..999140d48f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
@@ -95,4 +95,12 @@ public class BaseVehicleSelectVo implements Vo {
     private String useOrgName;
     @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
     private String isProblemVeh;
+    @ApiModelProperty(value = "采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty(value = "采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty(value = "厂家销售通路sid")
+    private String manufSaleAccessSid;
+    @ApiModelProperty(value = "厂家销售通路名称")
+    private String manufSaleAccessName;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
index 8704f5c822..767a2ea9c1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
@@ -106,6 +106,14 @@ public class BaseVehicleVo implements Vo {
     private Long libraryAge;
     @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）")
     private String isProblemVeh;
+    @ApiModelProperty(value = "采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty(value = "采购系统名称")
+    private String purchaseSystemName;
+    @ApiModelProperty(value = "厂家销售通路sid")
+    private String manufSaleAccessSid;
+    @ApiModelProperty(value = "厂家销售通路名称")
+    private String manufSaleAccessName;
 
     //车型配置
     @ApiModelProperty("车身颜色(陕汽必须的字段)")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
new file mode 100644
index 0000000000..f68c39411b
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
@@ -0,0 +1,61 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 16:45
+ * @Description
+ */
+@Data
+public class BaseVehicleOutDetailsVo implements Vo {
+    private static final long serialVersionUID = -7699189616162991308L;
+
+    private String vinSid;
+    private String vinNo;
+    @ApiModelProperty("出库类型")
+    private String type;
+    private String typeKey;
+    @ApiModelProperty("销售部门sid")
+    private String orgSid;
+    @ApiModelProperty("销售部门名称")
+    private String orgName;
+    @ApiModelProperty("销售专员sid")
+    private String staffSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("合同编号")
+    private String concatNo;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("是否为终端客户:1是0不是")
+    private String isTerminal;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("赠品说明")
+    private String giftsDescription;
+
+    @ApiModelProperty("销售折让")
+    private String salesAllowance;
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+    @ApiModelProperty("中介人1sid")
+    private String middleOneSid;
+    @ApiModelProperty("返利金额1")
+    private String rebateMoneyOne;
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+    @ApiModelProperty("中介人2sid")
+    private String middleTwoSid;
+    @ApiModelProperty("返利金额2")
+    private String rebateMoneyTwo;
+    @ApiModelProperty("备注")
+    private String remarks;
+    private String saleDate;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
index e1aff860e3..2198a2266a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
@@ -5,9 +5,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Author dimengzhe
@@ -30,6 +28,13 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/pagerList")
     @ResponseBody
     ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(@RequestBody PagerQuery<BaseVehicleOutQuery> query);
+
+    @ApiOperation("出库详情")
+    @GetMapping("/details/{sid}")
+    @ResponseBody
+    ResultBean<BaseVehicleOutDetailsVo> details(@PathVariable("sid") String sid);
+
+
 }
 
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
index 588f946f93..4f1253e432 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
@@ -13,6 +13,9 @@ import lombok.Data;
 public class BaseVehicleOutVo implements Vo {
     private static final long serialVersionUID = -1711615769602118459L;
 
+    @ApiModelProperty("sid")
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vinSid;
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
index d4c06a9fc0..ddbcf3adb0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
@@ -67,4 +67,9 @@ public class BusVehicleApply extends BaseEntity {
     private String userSids;
     private String userNames;
 
+    @ApiModelProperty("采购部门名称")
+    private String orgDeptName;
+    @ApiModelProperty("采购部门sid")
+    private String orgDeptSid;
+
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
index 99b2d7706f..3c52bba8ac 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
@@ -57,4 +57,9 @@ public class BusVehicleApplyDetailsVo implements Vo {
     private String userSids;
     private String userNames;
     private String nodeState;
+
+    @ApiModelProperty("采购部门名称")
+    private String orgDeptName;
+    @ApiModelProperty("采购部门sid")
+    private String orgDeptSid;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
index db790f4e2f..7a55d26bb0 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
@@ -63,8 +63,13 @@ public class BusVehicleApplyDto implements Dto {
 
     @ApiModelProperty("订金付款备注")
     private String payRemarks;
-
+    @ApiModelProperty("选择的销售经理sid")
     private String userSids;
     private String userNames;
 
+    @ApiModelProperty("采购部门名称")
+    private String orgDeptName;
+    @ApiModelProperty("采购部门sid")
+    private String orgDeptSid;
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
index 28977d56bc..e36fd593f5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
@@ -25,13 +25,13 @@ import lombok.Data;
 public class BusVehicleApplyDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("排产申请sid")
+    @ApiModelProperty("排产申请sid")
     private String applySid;
-	@ApiModelProperty("车型sid")
+    @ApiModelProperty("车型sid")
     private String vehicleSid;
-	@ApiModelProperty("车型名称")
+    @ApiModelProperty("车型名称")
     private String vehicleName;
-	@ApiModelProperty("排产数量")
+    @ApiModelProperty("排产数量")
     private String quantity;
     @ApiModelProperty("使用订金")
     private Integer useDeposit;
@@ -47,4 +47,9 @@ public class BusVehicleApplyDetail extends BaseEntity {
     private String insideCode;
     @ApiModelProperty(value = "厂家合同价")
     private Integer contractPrice;
+
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty("厂家销售通路sid")
+    private String actualSid;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
index eda3859918..a29a7da269 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
@@ -45,11 +45,15 @@ public class BusVehicleApplyDetailDto implements Dto {
     @ApiModelProperty("申请订金")
     private String applyForDeposit;
     @ApiModelProperty("备注")
-    private String remarks; // 备注
+    private String remarks;
     @ApiModelProperty("内部编码")
     private String insideCode;
     @ApiModelProperty(value = "厂家合同价")
     private String contractPrice;
 
     private BusVehicleApplySzDto busVehicleApplySz;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty("厂家销售通路sid")
+    private String actualSid;
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
index 3815496a7e..8f4c4ae661 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
@@ -55,4 +55,8 @@ public class BusVehicleApplyDetailVo implements Vo {
 
     @ApiModelProperty(value = "上装指导价")
     private Integer guidePrice;
+    @ApiModelProperty("厂家销售通路")
+    private String actualPay;
+    @ApiModelProperty("厂家销售通路sid")
+    private String actualSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
index 108b110a10..c9b20f5dbe 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
@@ -117,4 +117,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     List<Map<String, String>> wcgysNamesDown(String orgSid);
 
     List<Map<String, String>> bankNamesDown(String manufacturerSid);
+
+    List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index c549673163..2fb8dcdda8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -164,4 +164,8 @@
         WHERE manufacturerSid = #{manufacturerSid}
         AND isDelete = 0
     </select>
+
+    <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
+        select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
index 7a82050560..7ec09fe7a5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
@@ -1,15 +1,10 @@
 package com.yxt.anrui.base.biz.basemanufacturer;
 
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.interfaces.DecodedJWT;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemanufacturer.*;
 import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
 import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.utils.ExportExcelUtils;
-import com.yxt.common.base.utils.JWTUtil;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -19,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -168,4 +162,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         BaseManufacturerVo vo = baseManufacturerService.queryBycertOrg(certOrg);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
+        return baseManufacturerService.selectNameByOrg(query);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index a54b49bd59..8b05b69281 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -407,4 +407,12 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
         return rb.success().setData(bankNames);
     }
+
+    public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
+        ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
+        String useOrgSid = query.getUseOrgSid();
+        String supplierTypeValue = "主机厂";
+        List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue);
+        return rb.success().setData(list);
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
index b6d4eed199..9e7ceeb329 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
@@ -460,4 +461,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
 
     IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
+
+    @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
+    ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
index 8f1016587f..83c059b4e6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@@ -420,6 +420,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         }
     }
 
+    @Override
+    public ResultBean updateVehRemarks(String remarks, String sid) {
+        return baseVehicleService.updateVehRemarks(remarks,sid);
+    }
+
     /**
      * pc端现车分页列表
      *
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 5b100b6133..0b894d1c1c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2102,10 +2102,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             baseVehicleCertificate.setVehicleSid(new_baseVehicle.getSid());
             baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
             baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
-            baseVehicleCertificate.setCreateOrgSid(baseVehicle.getCreateOrgSid());
-            baseVehicleCertificate.setCreateOrgName(baseVehicle.getCreateOrgName());
-            baseVehicleCertificate.setUseOrgSid(baseVehicle.getUseOrgSid());
-            baseVehicleCertificate.setUseOrgName(baseVehicle.getUseOrgName());
+            baseVehicleCertificate.setCreateOrgSid(new_baseVehicle.getCreateOrgSid());
+            baseVehicleCertificate.setCreateOrgName(new_baseVehicle.getCreateOrgName());
+            baseVehicleCertificate.setUseOrgSid(new_baseVehicle.getUseOrgSid());
+            baseVehicleCertificate.setUseOrgName(new_baseVehicle.getUseOrgName());
             baseVehicleCertificateService.save(baseVehicleCertificate);
             return rb.success().setMsg("调车入库新增调入方车辆台账据成功");
         }
@@ -2641,4 +2641,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         PagerVo<InputVinListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean updateVehRemarks(String remarks, String sid) {
+        return baseMapper.updateVehRemarks(remarks,sid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
index 382fe7ad9a..7ac5ab7c4d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
 
 
     IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
+
+    BaseVehicleOutDetailsVo details(String sid);
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
index 57636e87d2..642e706a88 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
@@ -42,10 +42,40 @@
                bvo.middleOne,
                bvo.middleTwo,
                bvo.rebateMoneyOne,
-               bvo.rebateMoneyTwo
+               bvo.rebateMoneyTwo,
+               bv.configName           as modelConfig,
+               bvo.sid
         from base_vehicle_out bvo
+                 left join base_vehicle bv on bv.sid = bvo.vinSid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
+        select vinSid,
+               vinNo,
+               type,
+               typeKey,
+               orgSid,
+               orgName,
+               staffName,
+               staffSid,
+               concatNo,
+               price,
+               case isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+               customerName,
+               customerSid,
+               mobile,
+               giftsDescription,
+               salesAllowance,
+               middleOne,
+               middleTwo,
+               rebateMoneyOne,
+               rebateMoneyTwo,
+               remarks,
+               saleDate
+        from base_vehicle_out
+        where sid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
index 157475632e..8afc9e4c9c 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
@@ -1,9 +1,6 @@
 package com.yxt.anrui.base.biz.basevehicleout;
 
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -36,4 +33,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         PagerVo<BaseVehicleOutVo> pv = baseVehicleOutService.pagerList(query);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
+        return baseVehicleOutService.details(sid);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
index 6ee0246721..80334eb196 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@@ -4,10 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
-import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
+import com.yxt.anrui.base.api.basevehicleout.*;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -99,4 +96,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
+        ResultBean<BaseVehicleOutDetailsVo> rb = ResultBean.fireFail();
+        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid);
+        return rb.success().setData(baseVehicleOutDetailsVo);
+    }
 }
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index b15a784f1f..e039930ac5 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -37,6 +37,8 @@ public enum ProcDefEnum {
     SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"),
     SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"),
     SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"),
+    SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"),
+    SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
     ;
 
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 6e284f469a..fb7efbb98e 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -450,7 +450,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .includeProcessVariables()
                 .includeTaskLocalVariables()
                 .or()
-                .taskVariableValueEquals("orgSidPath","111222333")
+                //.taskVariableValueEquals("orgSidPath","111222333")
                 //.taskCandidateGroupIn(roleSidList)
                 .taskAssigneeLike("%" + userSid + "%")
                 .endOr()
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml
index 42fdaed56c..10eae4a793 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml
+++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml
@@ -45,7 +45,7 @@ logging:
 
 
 flowable:
-  database-schema-update: true
+  database-schema-update: flase
   common:
     app:
       idm-url: http://localhost:7001/flowable-idm
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
index d710445e2d..a49d26d9dd 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
@@ -85,4 +85,9 @@ public interface SysMappingFeign {
     @PostMapping("/selectMappingInfo")
     @ResponseBody
     public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
+
+    @ApiOperation("回显映射")
+    @GetMapping("/selectMappingListInfo/{dictSid}")
+    @ResponseBody
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@PathVariable("dictSid") String dictSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
index 1aa609b3c8..69b4ad0a12 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
@@ -79,4 +79,9 @@ public class SysMappingFeignFallback implements SysMappingFeign {
 	public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
index 879377e42e..ffd6fa92bb 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
@@ -139,4 +139,9 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("当前分公司销售部门及部门人员")
     ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
+
+    @GetMapping("/selectOrgLists")
+    @ResponseBody
+    @ApiOperation("当前分公司下所有部门")
+    ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
index a7bd307be5..2c64662f4d 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
@@ -142,4 +142,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
new file mode 100644
index 0000000000..a93ab2d4d1
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 11:28
+ * @Description
+ */
+@Data
+public class SysOrganizationListsVo implements Vo {
+    private static final long serialVersionUID = -7021974833444298712L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+}
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
index 0020c83dea..0f8c0efd34 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -67,4 +68,9 @@ public interface SysMappingMapper extends BaseMapper<SysMapping> {
     List<SysMappingVo> selectListVo();
 
     SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper<SysMappingInfoVo> qw);
+
+    List<SysMappingInfoVo> selectMappingListInfo(@Param("dictSid") String dictSid);
+
+    @Delete("delete from sys_mapping where dictSid = #{dictSid}")
+    void deleteByDictSid(@Param("dictSid") String dictSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
index 91f7ceda36..71dff95347 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
@@ -44,5 +44,16 @@
         LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
         <where>${ew.sqlSegment}</where>
     </select>
+    <select id="selectMappingListInfo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo">
+        SELECT sm.dictSid,
+               sm.map_sourceKey,
+               sm.map_sourceValue,
+               sm.map_object,
+               sm.map_item,
+               sm.map_itemKey,
+               sm.map_itemValue
+        FROM sys_mapping sm
+        WHERE sm.dictSid = #{dictSid}
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
index 19db2ebc09..b71b59ae62 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
@@ -110,4 +110,11 @@ public class SysMappingRest implements SysMappingFeign {
         SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
+        ResultBean<List<SysMappingInfoVo>> rb = ResultBean.fireFail();
+        List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
+        return rb.success().setData(vo);
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
index 1475ffac0a..a2735afab6 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
@@ -135,11 +135,14 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     }
 
     public void saveMappingList(List<SysMappingDto> dto) {
-        for (SysMappingDto sysMappingDto : dto) {
-            SysMapping entity = new SysMapping();
-            BeanUtil.copyProperties(sysMappingDto, entity);
-            entity.setCreateBySid(sysMappingDto.getUserSid());
-            save(entity);
+        if (dto.size() > 0) {
+            baseMapper.deleteByDictSid(dto.get(0).getDictSid());
+            for (SysMappingDto sysMappingDto : dto) {
+                SysMapping entity = new SysMapping();
+                BeanUtil.copyProperties(sysMappingDto, entity);
+                entity.setCreateBySid(sysMappingDto.getUserSid());
+                save(entity);
+            }
         }
     }
 
@@ -163,4 +166,8 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
         SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw);
         return vo;
     }
+
+    public List<SysMappingInfoVo> selectMappingListInfo(String dictSid) {
+        return baseMapper.selectMappingListInfo(dictSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
index d10355bfe8..40a43556b5 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
@@ -106,6 +106,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrgVo getListOrgByBrand(String sid);
 
     List<SysOrganizationListVo> selectOrgList(String orgSid);
+    List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
index 9a0dd40813..b6a16a4e9b 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
@@ -181,6 +181,12 @@
           and orgAttributeKey = 'DP03_SYS'
     </select>
 
+    <select id="selectOrgLists" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListsVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+    </select>
+
     <select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
         select distinct si.name staffName, si.sid staffSid
         from sys_staff_org so
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
index eaa7f0230c..0e6a71822d 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
@@ -361,4 +361,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
     public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
         return sysOrganizationService.selectOrgList(query);
     }
+
+    @Override
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return sysOrganizationService.selectOrgLists(query);
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
index 31f1711941..114f94ca94 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@@ -495,4 +495,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         return rb.success().setData(sysOrganizationListVos);
     }
+
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListsVo>> rb = ResultBean.fireFail();
+        //根据用户sid查询分公司sid
+        String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+        String orgSid = getOrgSid(orgDeptSid);
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListsVo> sysOrganizationListVos = baseMapper.selectOrgLists(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        return rb.success().setData(sysOrganizationListVos);
+
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
index 6b66c7c0a2..f2c19e9b57 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
@@ -33,4 +33,7 @@ public class ScmApplyInboundVehicle extends BaseEntity {
     
 	@ApiModelProperty("车架号(VIN)")
     private String vinNo;
+
+    @ApiModelProperty("发动机号")
+    private String engineNo;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
index 2990c9cbd4..54a7026f04 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
@@ -38,6 +38,9 @@ public class ScmApplyInboundVehicleDto implements Dto {
 	@ApiModelProperty("车架号(VIN)")
     private String vinNo;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
     @ApiModelProperty("备注")
     private String remarks;
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
index 8d360546a4..a8f45ce2de 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
@@ -36,6 +36,9 @@ public class ScmApplyInboundVehicleVo implements Vo {
 	@ApiModelProperty("车架号(VIN)")
     private String vinNo;
 
+    @ApiModelProperty("发动机号")
+    private String engineNo;
+
     @ApiModelProperty("备注")
     private String remarks;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
index 6db8157bf0..536c7995d7 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
@@ -75,4 +75,21 @@ public interface ScmCollectionRebateFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("回款返利未预提申请选择回款返利信息")
+    @PostMapping("/withApplyGetCollectionRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
+
+    @ApiOperation("回款返利核对申请选择待核对回款返利信息")
+    @PostMapping("/checkApplyGetCollectionRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
+
+    @ApiOperation("回款返利核对申请选择已上传回款返利信息")
+    @PostMapping("/checkApplyGetAlreadyUploadCollectionRebate")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
+
+
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java
index 0b28c726a6..1f0d4752d1 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java
@@ -69,4 +69,19 @@ public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-scm/scmcollectionrebate/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
index 0b1e52672a..5767a216dc 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-scm(回款返利) <br/>
  * File: ScmCollectionRebateQuery.java <br/>
@@ -51,13 +53,19 @@ public class ScmCollectionRebateQuery implements Query {
 
 	@ApiModelProperty("回款方式key")
     private String collectionTypeKey; // 回款方式key
-	@ApiModelProperty("回款日期")
-    private String collectionDate; // 回款日期
-    @ApiModelProperty(value = "创建开始日期")
-    private String createStartTime;
-    @ApiModelProperty(value = "创建结束日期")
-    private String createEndTime;
-	@ApiModelProperty("创建组织sid")
+	@ApiModelProperty("回款开始日期")
+    private String collectionStartDate; // 回款开始日期
+    @ApiModelProperty("回款结束日期")
+    private String collectionEndDate; // 回款结束日期
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+    @ApiModelProperty("状态")
+    private String state; // 状态
+    @ApiModelProperty("回款返利sid")
+    private List<String> sidList; // 回款返利sid
 
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
index 2513f0d8e2..e9ba51f86b 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
@@ -26,12 +26,15 @@
 package com.yxt.anrui.scm.api.scmcollectionrebate;
 
 
+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: ScmCollectionRebateVo.java <br/>
@@ -68,13 +71,17 @@ public class ScmCollectionRebateVo implements Vo {
 	@ApiModelProperty("运费")
     private String freight; // 运费
 	@ApiModelProperty("回款日期")
-    private String collectionDate; // 回款日期
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date collectionDate; // 回款日期
 	@ApiModelProperty("计算标准")
     private String calculationStandard; // 计算标准
 	@ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
 	@ApiModelProperty("预提日期")
-    private String withholdingDate; // 预提日期
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date withholdingDate; // 预提日期
+    @ApiModelProperty("预提日期(页面展示)")
+    private String withholdingDateCopy; // 预提日期(页面展示)
 	@ApiModelProperty("上传日期")
     private String uploadDate; // 上传日期
 	@ApiModelProperty("上传金额")
@@ -91,5 +98,6 @@ public class ScmCollectionRebateVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-
+    @ApiModelProperty("上传状态(2未上传、3已上传)")
+    private String uploadState; // 上传状态
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
index da52c75964..6699fb7bdc 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
@@ -62,6 +62,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
     private String brandName; // 品牌名称
 	@ApiModelProperty("回款申请标题")
     private String collectionApply; // 回款申请标题
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
 	@ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
 	@ApiModelProperty("使用组织sid")
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
index 549723d423..1dc54a067b 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
@@ -25,14 +25,22 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
 
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
 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 io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -75,4 +83,39 @@ public interface ScmCollectionRebateWithApplyFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**************************************回款返利预提审批流程*******************************************/
+
+    @ApiOperation("提交回款返利预提申请")
+    @PostMapping("/submitCollectionRebateWithApply")
+    public ResultBean submitCollectionRebateWithApply(@RequestBody @Valid SubmitScmCollectionRebateWithApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody ScmCollectionRebateWithApplyCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
index 2088bd3d43..2e91422f6d 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
@@ -25,6 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
 
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,4 +74,44 @@ public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionR
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java
new file mode 100644
index 0000000000..a0b95f7c15
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java
new file mode 100644
index 0000000000..4ae014ae7f
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java
new file mode 100644
index 0000000000..1ffedfb6e0
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class ScmCollectionRebateWithApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+//    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables = new HashMap<>();
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java
new file mode 100644
index 0000000000..6ab17f7d3a
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java
@@ -0,0 +1,56 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class ScmCollectionRebateWithApplyTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @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")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java
new file mode 100644
index 0000000000..f83ccec739
--- /dev/null
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
+
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitScmCollectionRebateWithApplyDto extends ScmCollectionRebateWithApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
index 8e42b5956e..af960ebebb 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
@@ -58,4 +58,9 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userName;
 
+    @ApiModelProperty("存放地点sid")
+    private String warehouseSid;
+
+    @ApiModelProperty("存放地点")
+    private String warehouse;
 }
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java
index 286280f908..8b8b52a908 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java
@@ -54,7 +54,7 @@ public class ScmVehInventorymonthVo implements Vo {
 
     private String sid; // sid
     @ApiModelProperty("生成报告状态")
-    private String state;
+    private int state;
     @ApiModelProperty("编号（yyyyMMdd）")
     private String billNo; // 编号（yyyyMMdd）
     @ApiModelProperty("创建时间")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java
index 1305622eea..94045d5eb4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java
@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -62,4 +63,10 @@ public interface ScmCollectionRebateMapper extends BaseMapper<ScmCollectionRebat
 	
 	@Select("select * from scm_collection_rebate")
 	List<ScmCollectionRebateVo> selectListVo();
+
+	@Update("update scm_collection_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{collectionRebateSid}")
+    void updateWithholdingDateBySid(String collectionRebateSid);
+
+	@Update("update scm_collection_rebate set state = 1 where sid = #{collectionRebateSid}")
+	void updateState(String collectionRebateSid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java
index 89c5902953..f47b567c7b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java
@@ -92,13 +92,13 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
             for (String s : stringList) {
                 ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s);
                 if (!scmCollectionRebateWithApply.getNodeState().equals("待提交")) {
-                    return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除");
+                    return rb.setMsg("所选数据中包含已提交回款返利信息，无法删除");
                 }
             }
             ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid);
             Integer state = scmCollectionRebate.getState();
             if (state == 1) {
-                return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除");
+                return rb.setMsg("所选数据中包含已预提回款返利信息，无法删除");
             }
         }
         scmCollectionRebateService.delBySids(sids);
@@ -113,4 +113,25 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
         ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.withApplyGetCollectionRebate(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.checkApplyGetCollectionRebate(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.checkApplyGetAlreadyUploadCollectionRebate(pq);
+        return rb.success().setData(pv);
+    }
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
index a0720980f4..46572d24f1 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmcollectionrebate;
 
 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 org.apache.commons.lang3.StringUtils;
@@ -43,6 +44,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
 
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -74,9 +76,11 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
 			qw.eq("collectionTypeKey",query.getCollectionTypeKey());
 		}
-		if (StringUtils.isNotBlank(query.getCollectionDate())){
-			qw.eq("collectionDate",query.getCollectionDate());
-		}
+		String collectionStartDate = query.getCollectionStartDate();
+		String collectionEndDate = query.getCollectionEndDate();
+		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+				);
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
 		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -122,4 +126,107 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
+
+	public void updateWithholdingDateBySid(String collectionRebateSid) {
+		baseMapper.updateWithholdingDateBySid(collectionRebateSid);
+	}
+
+	public void updateState(String collectionRebateSid) {
+		baseMapper.updateState(collectionRebateSid);
+	}
+
+	public PagerVo<ScmCollectionRebateVo> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		ScmCollectionRebateQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+		}
+		String collectionStartDate = query.getCollectionStartDate();
+		String collectionEndDate = query.getCollectionEndDate();
+		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+				);
+		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", 0);
+		if (query.getSidList().size() > 0) {
+			qw.notIn("sid", query.getSidList());
+		}
+		IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+
+	public PagerVo<ScmCollectionRebateVo> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		ScmCollectionRebateQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+		}
+		String collectionStartDate = query.getCollectionStartDate();
+		String collectionEndDate = query.getCollectionEndDate();
+		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+				);
+		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.ne("state", 0);
+		IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (ScmCollectionRebateVo 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.setUploadState("3");
+			}
+		}
+		PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+
+	public PagerVo<ScmCollectionRebateVo> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
+		ScmCollectionRebateQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
+			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
+		}
+		String collectionStartDate = query.getCollectionStartDate();
+		String collectionEndDate = query.getCollectionEndDate();
+		qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+				);
+		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<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (ScmCollectionRebateVo record : pagging.getRecords()) {
+			Date withholdingDate = record.getWithholdingDate();
+			int year = DateUtil.year(withholdingDate);
+			int month = DateUtil.month(withholdingDate) + 1;
+			String withholdingDateCopy = year + "年" + month + "月";
+			record.setWithholdingDateCopy(withholdingDateCopy);
+		}
+		PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
index 378c4bcf8c..cec421dd78 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
@@ -72,4 +72,7 @@ public interface ScmCollectionRebateWithMapper extends BaseMapper<ScmCollectionR
     void delByMainSid(String dtoSid);
 
 	List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid);
+
+	@Select("select collectionRebateSid from scm_collection_rebate_with where mainSid = #{businessSid}")
+    List<String> fetchCollectionReBateSidByMainSid(String businessSid);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
index f6ba498b97..9dfb98e5ce 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
@@ -119,4 +119,8 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
 	public List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid) {
 		return baseMapper.fetchByMainSid(sid);
 	}
+
+	public List<String> fetchCollectionReBateSidByMainSid(String businessSid) {
+		return baseMapper.fetchCollectionReBateSidByMainSid(businessSid);
+	}
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
index 0a2371cfb2..6909f1dfd7 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
@@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
 import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(回款返利) <br/>
@@ -64,4 +65,6 @@ public interface ScmCollectionRebateWithApplyMapper extends BaseMapper<ScmCollec
 	List<ScmCollectionRebateWithApplyVo> selectListVo();
 
 	int selectBySid(String join);
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
index 0b89e8ae89..8cf6fa8a2c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
@@ -28,4 +28,19 @@
 		WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
 	</select>
+
+	<update id="updateFlowFiled">
+		UPDATE scm_collection_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/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
index d77ed982a6..3ed229fb3b 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
@@ -25,6 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
 
+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.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -91,4 +99,47 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith
     public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
 	}
+
+	@Override
+	public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
+		return scmCollectionRebateWithApplyService.submitCollectionRebateWithApply(dto);
+	}
+
+	@Override
+	public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(dto, bv);
+		bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
+		return scmCollectionRebateWithApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return scmCollectionRebateWithApplyService.revokeProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return scmCollectionRebateWithApplyService.taskReject(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return scmCollectionRebateWithApplyService.breakProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return scmCollectionRebateWithApplyService.flowRecord(procInsId);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return scmCollectionRebateWithApplyService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return scmCollectionRebateWithApplyService.getPreviousNodesForReject(query);
+	}
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
index e466dda661..6baafd4fd3 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
@@ -26,11 +26,26 @@
 package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
 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.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+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.scmcollectionrebatewith.ScmCollectionRebateWith;
 import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
 import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
+import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
 import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -48,8 +63,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-scm(回款返利) <br/>
@@ -67,131 +82,371 @@ import java.util.List;
 @Service
 public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmCollectionRebateWithApplyMapper, ScmCollectionRebateWithApply> {
 
-	@Autowired
-	private ScmCollectionRebateWithService scmCollectionRebateWithService;
-
-	private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
-		return qw;
-	}
-	
-	public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
-		ScmCollectionRebateWithApplyQuery query = pq.getParams();
-		QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getBrandSid())) {
-			qw.eq("scrwa.brandSid", query.getBrandSid());
-		}
-		if (StringUtils.isNotBlank(query.getCollectionApply())) {
-			qw.like("scrwa.withApply", query.getCollectionApply());
-		}
-		String createStartTime = query.getCreateStartTime();
-		String createEndTime = query.getCreateEndTime();
-		qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-				apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-				);
-		qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
-		qw.groupBy("scrwa.sid");
-		qw.orderByDesc("scrwa.createTime");
-		IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
-		IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		String dtoSid = dto.getSid();
-		List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
-		if (scmCollectionRebateWiths == null) {
-			return rb.setMsg("请选择回款返利信息");
-		}
-		if (StringUtils.isBlank(dtoSid)) {
-			String sid = this.insertByDto(dto).getData();
-			for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
-				List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
-				for (String collectionRebateSid : collectionRebateSids) {
-					ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
-					scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
-					scmCollectionRebateWith.setMainSid(sid);
-					scmCollectionRebateWithService.save(scmCollectionRebateWith);
-				}
-			}
-			return rb.success().setMsg("添加成功").setData(sid);
-		}
-		ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
-		if (scmCollectionRebateWithApply == null) {
-			rb.setMsg("该回款返利预提申请单不存在");
-		}
-		this.updateByDto(dto);
-		scmCollectionRebateWithService.delByMainSid(dtoSid);
-		for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
-			List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
-			for (String collectionRebateSid : collectionRebateSids) {
-				ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
-				scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
-				scmCollectionRebateWith.setMainSid(dtoSid);
-				scmCollectionRebateWithService.save(scmCollectionRebateWith);
-			}
-		}
-		return rb.success().setMsg("修改成功").setData(dtoSid);
-	}
-	
-	public ResultBean<String> insertByDto(ScmCollectionRebateWithApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		entity.setNodeState("待提交");
-		baseMapper.insert(entity);
-		return rb.success().setData(entity.getSid());
-	}
-	
-	public void updateByDto(ScmCollectionRebateWithApplyDto dto){
-          String dtoSid = dto.getSid();
+    @Autowired
+    private ScmCollectionRebateWithService scmCollectionRebateWithService;
+    @Autowired
+    private ScmCollectionRebateService scmCollectionRebateService;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+
+    private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
+        ScmCollectionRebateWithApplyQuery query = pq.getParams();
+        QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("scrwa.brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getCollectionApply())) {
+            qw.like("scrwa.withApply", query.getCollectionApply());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
+        qw.groupBy("scrwa.sid");
+        qw.orderByDesc("scrwa.createTime");
+        IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
+        IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
+        if (scmCollectionRebateWiths == null) {
+            return rb.setMsg("请选择回款返利信息");
+        }
+        if (StringUtils.isBlank(dtoSid)) {
+            String sid = this.insertByDto(dto).getData();
+            for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
+                List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
+                for (String collectionRebateSid : collectionRebateSids) {
+                    ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
+                    scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
+                    scmCollectionRebateWith.setMainSid(sid);
+                    scmCollectionRebateWithService.save(scmCollectionRebateWith);
+                }
+            }
+            return rb.success().setMsg("添加成功").setData(sid);
+        }
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
+        if (scmCollectionRebateWithApply == null) {
+            rb.setMsg("该回款返利预提申请单不存在");
+        }
+        this.updateByDto(dto);
+        scmCollectionRebateWithService.delByMainSid(dtoSid);
+        for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
+            List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
+            for (String collectionRebateSid : collectionRebateSids) {
+                ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
+                scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
+                scmCollectionRebateWith.setMainSid(dtoSid);
+                scmCollectionRebateWithService.save(scmCollectionRebateWith);
+            }
+        }
+        return rb.success().setMsg("修改成功").setData(dtoSid);
+    }
+
+    public ResultBean<String> insertByDto(ScmCollectionRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
+        baseMapper.insert(entity);
+        return rb.success().setData(entity.getSid());
+    }
+
+    public void updateByDto(ScmCollectionRebateWithApplyDto dto) {
+        String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
-		ScmCollectionRebateWithApply entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid){
-		ScmCollectionRebateWithApply entity = fetchBySid(sid);
-		ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
-	public ResultBean delAll(String[] sids) {
-		ResultBean rb = ResultBean.fireFail();
-		//查询该sid中是否有流程不是待提交的
-		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
-		if (count > 0) {
-			return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
-		}
-		delBySids(sids);
-		for (String sid : sids) {
-			scmCollectionRebateWithService.delByMainSid(sid);
-		}
-		return rb.success().setMsg("删除成功");
-	}
-
-	public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
-		ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
-		BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
-		List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
-		for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
-			String[] specialRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
-			scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(specialRebateSids));
-			String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
-			withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
-			scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
-		}
-		scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
-		return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
-	}
+        }
+        ScmCollectionRebateWithApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid) {
+        ScmCollectionRebateWithApply entity = fetchBySid(sid);
+        ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            scmCollectionRebateWithService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
+        BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
+        List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
+        for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
+            String[] collectionRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
+            scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(collectionRebateSids));
+            String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
+            withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
+            scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
+        }
+        scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
+        return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
+    }
+
+    public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, scmCollectionRebateWithApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //=====================添加app所需参数
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
+        //获取回款返利sid
+        List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
+        for (ScmCollectionRebateWithDto scmCollectionRebateWith : scmCollectionRebateWiths) {
+            List<String> collectionRebateSids = scmCollectionRebateWith.getCollectionRebateSids();
+            for (String collectionRebateSid : collectionRebateSids) {
+                scmCollectionRebateService.updateWithholdingDateBySid(collectionRebateSid);
+            }
+        }
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(scmCollectionRebateWithApply.getTaskId());
+            bv.setTaskDefKey(scmCollectionRebateWithApply.getNodeSid());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitScmCollectionRebateWithApplyDto dto, ScmCollectionRebateWithApply scmCollectionRebateWithApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (scmCollectionRebateWithApply != null) {
+                String businessTaskId = scmCollectionRebateWithApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());
+        List<String> collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(scmCollectionRebateWithApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                for (String collectionRebateSid : collectionRebateSids) {
+                    scmCollectionRebateService.updateState(collectionRebateSid);
+                }
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean revokeProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询排内购申请
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmCollectionRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                flowTaskVo.setValues(BeanUtil.beanToMap(scmCollectionRebateWithApply));
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean taskReject(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
+        if (scmCollectionRebateWithApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = scmCollectionRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(FlowTaskVo query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = scmCollectionRebateWithApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean flowRecord(String procInsId) {
+        return flowTaskFeign.businessFlowRecord(procInsId);
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        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<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
index 14b81f7793..a1e03cf5be 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
@@ -118,11 +118,11 @@
     <select id="getMonthByMainSid"
             resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo">
         SELECT count(*),
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '001' and svi.mainSid = #{mainSid}) AS totalNumber,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS normalNumber ,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS lossNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '003' and svi.mainSid = #{mainSid}) AS totalNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS normalNumber ,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS lossNumber,
              (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '002' and svi.mainSid = #{mainSid}) AS damageNumber,
-             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS profitNumber,
+             (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS profitNumber,
              (SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryState = '无' and svi.mainSid = #{mainSid}) AS surplusNumber
         FROM scm_vehicle_inventory svi
         WHERE svi.mainSid = #{mainSid}
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
index 81e7b9800a..1066a8c42c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
@@ -99,7 +99,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<AppVinAndRemarksVo> getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey);
 
-    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
+    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid}")
     void updatePatrolInspectionState(@Param("sid") String sid);
 
     @Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
index a6fa701df0..da3ea775ff 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
@@ -134,7 +134,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             String id = record.getId();
             String createOrgSid = record.getCreateOrgSid();
             List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid);
-            if (scmVehicleStayPatrolinspectionVos.size() > 0){
+            if (scmVehicleStayPatrolinspectionVos.size() > 0) {
                 ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
                 record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
                 record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
@@ -147,7 +147,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             record.setLiableName(scmWarehouse.getLibTubeName());
             String sid1 = record.getSid();
             AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(sid1);
-            if (appScmVehiclePatrolinspectionsheetInfoVo != null){
+            if (appScmVehiclePatrolinspectionsheetInfoVo != null) {
                 record.setSituationExplain(appScmVehiclePatrolinspectionsheetInfoVo.getExplain());
                 record.setProblems(appScmVehiclePatrolinspectionsheetInfoVo.getProblems());
                 String sid = appScmVehiclePatrolinspectionsheetInfoVo.getSid();
@@ -209,6 +209,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
+        qw.and(wrapper -> wrapper.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001"));
         qw.eq("svp.isDelete", 0);
         if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
             qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
@@ -216,7 +217,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
             qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
         }
-        qw.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001");
         AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
         List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
@@ -328,15 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
     }
 
-    public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid,String vin) {
-        return baseMapper.selectByMandSid(sid,vin);
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid, String vin) {
+        return baseMapper.selectByMandSid(sid, vin);
     }
 
     public void deleteByVinNo(String vinNo, String id) {
-        baseMapper.deleteByVinNo(vinNo,id);
+        baseMapper.deleteByVinNo(vinNo, id);
     }
 
-    public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo,String useOrgSid) {
-        return baseMapper.selectByVinNo(vinNo,useOrgSid);
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo, String useOrgSid) {
+        return baseMapper.selectByVinNo(vinNo, useOrgSid);
     }
 }
\ No newline at end of file
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
index 38b2b47502..ebc5c259d5 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
@@ -21,21 +21,21 @@
 
     <select id="getInspection"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo">
-        SELECT sid,
-               mainSid          as recordSid,
-               vinNo            as vin,
-               model,
-               modelSid,
-               situationExplain as `explain`,
-               problems,
-               results,
-               dutyName         as liableName,
-               dutySid          as liableSid,
-               location,
-               address,
-               createBySid      as userSid
-        FROM scm_vehicle_patrolinspectionsheet
-        WHERE mainSid = #{recordSid}
+        SELECT svps.sid,
+               svps.mainSid          as recordSid,
+               svps.vinNo            as vin,
+               svps.model,
+               svps.modelSid,
+               svps.situationExplain as `explain`,
+               svps.problems,
+               svps.results,
+               svps.dutyName         as liableName,
+               svps.dutySid          as liableSid,
+               svps.location,
+               svps.address,
+               svps.createBySid      as userSid
+        FROM scm_vehicle_patrolinspectionsheet svps
+        WHERE svps.mainSid = #{recordSid}
     </select>
 
     <select id="getPCInspection"
@@ -76,7 +76,7 @@
                svp.patrolInspectionDate,
                svp.patrolInspectionName
         from scm_vehicle_patrolinspection svp
-                     left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
+                 left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
         where svp.sid = #{recordSid}
     </select>
 
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
index c1027d1afc..7220f29fe0 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
@@ -123,7 +123,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
             record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
             record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
-            if (record.getState().equals(0)) {
+            if (record.getState() == 0) {
                 if (vo.getSurplusNumber() == 0) {
                     record.setShowBtn(true);
                 } else {
@@ -317,9 +317,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         //本次应盘数量
         vo.setTotalNumber(String.valueOf(appScmVehInventorymonthVo.getTotalNumber()));
 
-        String inventoryStateKey1 = "001";
-        String inventoryStateKey2 = "002";
-        String inventoryStateKey3 = "003";
+        String inventoryStateKey1 = "003";
+        String inventoryStateKey2 = "004";
+        String inventoryStateKey3 = "002";
         List<AppVinAndRemarksVo> profitRemarks = scmVehicleInventoryService.getMonthRemarksByMainSid(sid, inventoryStateKey1);
         String profitRemark = "";
         for (AppVinAndRemarksVo remark : profitRemarks) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
index 21023e0a7f..3004e8eb51 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
@@ -29,21 +29,28 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 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.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
+import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
+import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -88,7 +95,13 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     @Autowired
     ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
     @Autowired
+    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
+    @Autowired
     ScmVehPatrolinspectionreportService scmVehPatrolinspectionreportService;
+    @Autowired
+    FileUploadComponent fileUploadComponent;
+    @Autowired
+    ScmFileService scmFileService;
 
     private QueryWrapper<ScmVehPatrolinspectionmonth> createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -175,6 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
         List<String> vinNoList = new ArrayList<>();
+        List<String> mainList = new ArrayList<>();
         List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
         List<AppScmInventoryRecordsVo> list = new ArrayList<>();
         if (patrolinspectionVos.size() > 0) {
@@ -186,7 +200,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 }
                 if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     String vinNo = patrolinspectionVo.getVinNo();
+                    String sid = patrolinspectionVo.getSid();
                     vinNoList.add(vinNo);
+                    mainList.add(sid);
                 }
                 if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
                     scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
@@ -221,6 +237,52 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
+            if (mainList.size() > 0) {
+                for (String sid : mainList) {
+                    AppScmVehiclePatrolinspectionsheetInfoVo inspection = scmVehiclePatrolinspectionsheetService.getInspection(sid);
+                    ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+                    scmVehiclePatrolinspection.setVinNo(inspection.getVin());
+                    scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
+                    BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
+                    scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
+                    scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
+                    scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");
+                    scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
+                    scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+                    ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
+                    scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());
+                    scmVehiclePatrolinspectionsheet.setVinNo(inspection.getVin());
+                    scmVehiclePatrolinspectionsheet.setDutySid(inspection.getLiableSid());
+                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setCreateBySid(inspection.getUserSid());
+                    scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+                    scmVehiclePatrolinspectionsheet.setModel(inspection.getModel());
+                    scmVehiclePatrolinspectionsheet.setModelSid(inspection.getModelSid());
+                    scmVehiclePatrolinspectionsheet.setLocation(inspection.getLocation());
+                    scmVehiclePatrolinspectionsheet.setAddress(inspection.getAddress());
+                    scmVehiclePatrolinspectionsheet.setProblems(inspection.getProblems());
+                    scmVehiclePatrolinspectionsheet.setSituationExplain(inspection.getExplain());
+                    scmVehiclePatrolinspectionsheet.setResults(inspection.getResults());
+                    scmVehiclePatrolinspectionsheetService.save(scmVehiclePatrolinspectionsheet);
+                    String s1 = "";
+                    String type = "06"; //巡检相关照片
+                    List<String> images = inspection.getImages();
+                    for (String s : images) {
+                        if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                            s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                        }
+                        ScmFile scmFile1 = new ScmFile();
+                        scmFile1.setAttachType(type);
+                        scmFile1.setFileName("巡检相关照片");
+                        scmFile1.setFilePath(s1);
+                        scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
+                        scmFileService.save(scmFile1);
+                    }
+                }
+            }
         } else {
             return rb.setMsg("暂无需要巡检记录");
         }