Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApply.java

@@ -78,5 +78,7 @@ public class BaseAccadjApply extends BaseEntity {
     private String nodeState; // 流程状态
 	@ApiModelProperty("taskId")
     private String taskId; // taskId
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDetailsVo.java

@@ -73,6 +73,8 @@ public class BaseAccadjApplyDetailsVo implements Vo {
     private String instanceId; // 流程实例的sid
     @ApiModelProperty("taskId")
     private String taskId; // taskId
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("调账车辆列表")
     private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyDto.java

@@ -75,6 +75,8 @@ public class BaseAccadjApplyDto implements Dto {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("调账车辆类型sid")
     private List<String> accSids; // 调账车辆类型sid
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java

@@ -71,4 +71,7 @@ public class BaseDiscountpackage extends BaseEntity {
     private String procInstId;
     @ApiModelProperty("任务id")
     private String taskId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java

@@ -83,6 +83,9 @@ public class BaseDiscountpackageDto implements Dto {
     @ApiModelProperty("任务id")
     private String taskId;
 
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+
     @ApiModelProperty("销售车辆列表")
     private List<BaseDiscountpackageVehDto> baseDiscountpackageVehs;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java

@@ -56,4 +56,7 @@ public class BaseDiscountpackagePageListVo implements Vo {
     private String procInstId;
     @ApiModelProperty("任务id")
     private String taskId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java

@@ -81,6 +81,9 @@ public class BaseDiscountpackageVo implements Vo {
     @ApiModelProperty("任务id")
     private String taskId;
 
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+
     @ApiModelProperty("销售车辆列表")
     private List<BaseDiscountpackageVehDetailsVo> baseDiscountpackageVehs;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountVo.java

@@ -31,4 +31,6 @@ public class BaseSalesDicountVo implements Vo {
     @ApiModelProperty("是否有效")
     private String isEmploy;
 
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java

@@ -90,4 +90,6 @@ public class BaseInternalPurchase extends BaseEntity {
     private String callInBuyerOrgSid; // 调入方采购部门sid
     @ApiModelProperty("调入方采购部门名称")
     private String callInBuyerOrgName; // 调入方采购部门名称
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java

@@ -102,6 +102,9 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
     private String callInBuyerOrgSid; // 调入方采购部门sid
     @ApiModelProperty("调入方采购部门名称")
     private String callInBuyerOrgName; // 调入方采购部门名称
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("内购车辆列表")
     private List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicles; // 内购车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java

@@ -86,6 +86,8 @@ public class BaseInternalPurchaseDto implements Dto {
     private String callInBuyerOrgSid; // 调入方采购部门sid
     @ApiModelProperty("调入方采购部门名称")
     private String callInBuyerOrgName; // 调入方采购部门名称
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
     @ApiModelProperty("内购车辆列表")
     private List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles; // 内购车辆列表
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java

@@ -79,4 +79,7 @@ public class BaseModelModprice extends BaseEntity {
 	private String procInstId;
 	@ApiModelProperty(value = "任务id")
 	private String taskId;
+
+	@ApiModelProperty("申请人组织路径")
+	private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java

@@ -73,6 +73,9 @@ public class BaseModelModpriceDetailVo implements Vo {
 	private String createBySid;
 	@ApiModelProperty(value = "使用组织sid")
 	private String useOrgSid;
+
+	@ApiModelProperty("申请人组织路径")
+	private String orgSidPath; // 申请人组织路径
 	@ApiModelProperty("调价申请车型列表")
 	private List<BaseModelModpriceModelVo> baseModelModpriceModels; // 调价申请车型列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java

@@ -64,6 +64,10 @@ public class BaseModelModpriceDto implements Dto {
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
+
+	@ApiModelProperty("申请人组织路径")
+	private String orgSidPath; // 申请人组织路径
+
 	@ApiModelProperty("调价申请车型列表")
 	private List<BaseModelModpriceModelDto> baseModelModpriceModels; // 调价申请车型列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@@ -157,4 +157,7 @@ public class BaseOutsourcingApplication extends BaseEntity {
     private String approvalSid; // 销售经理sid
     @ApiModelProperty("销售经理姓名")
     private String approvalName; // 销售经理姓名
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@@ -163,4 +163,7 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
     private String approvalSid; // 销售经理sid
     @ApiModelProperty("销售经理姓名")
     private String approvalName; // 销售经理姓名
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@@ -182,4 +182,7 @@ public class BaseOutsourcingApplicationDto implements Dto {
 	private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
 	@ApiModelProperty("合同附件信息")
 	private CommonAppendix contract;
+
+	@ApiModelProperty("申请人组织路径")
+	private String orgSidPath; // 申请人组织路径
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleQuery.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 11:26
+ * @Description 采购退库选择车辆数据对象
+ */
+@Data
+public class BaseChoiceVehicleQuery implements Query {
+
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
+    @ApiModelProperty(value = "车型名称和编码")
+    private String modelNameAndCode;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty("车身颜色key")
+    private String carColorKey;
+    @ApiModelProperty("存放地点sid")
+    private String location;
+
+    @ApiModelProperty(value = "已选择的车辆的车架号")
+    private List<String> vinNoList = new ArrayList<>();
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "调入分公司sid")
+    private String buyerOrgSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/12 11:26
+ * @Description 采购退库选择车辆数据对象
+ */
+@Data
+public class BaseChoiceVehicleVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty(value = "品牌")
+    private String brandName;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+    @ApiModelProperty(value = "颜色")
+    private String color;
+    @ApiModelProperty(value = "存放地点")
+    private String location;
+    @ApiModelProperty(value = "厂家结算价")
+    private String guidedPrice;
+
+    @ApiModelProperty(value = "车型sid")
+    private String carModelSid;
+    @ApiModelProperty(value = "入库日期")
+    private String priceDate;
+    @ApiModelProperty(value = "销售日期")
+    private String salesDate;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -269,7 +269,7 @@ public interface BaseVehicleFeign {
 
     @ApiOperation("采购退库选择车辆分页列表")
     @PostMapping("/vehicleReturnList")
-    ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);
+    ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(@RequestBody PagerQuery<BaseChoiceVehicleQuery> pagerQuery);
 
     @ApiOperation("客户查询选择车辆分页列表")
     @PostMapping("/vehicleCrmList")
@@ -289,11 +289,15 @@ public interface BaseVehicleFeign {
 
     @ApiOperation("未售买断选择车辆分页列表")
     @PostMapping("/vehicleActualList")
-    ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);
+    ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(@RequestBody PagerQuery<BaseChoiceVehicleQuery> pagerQuery);
 
     @ApiOperation("调车申请选择车辆分页列表")
     @PostMapping("/vehiclePurchaseList")
-    ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(@RequestBody PagerQuery<BaseVehiclePurchaseQuery> pagerQuery);
+    ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(@RequestBody PagerQuery<BaseChoiceVehicleQuery> pagerQuery);
+
+    @ApiOperation("回款返利选择车辆分页列表")
+    @PostMapping("/vehicleCollectionList")
+    ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(@RequestBody PagerQuery<BaseChoiceVehicleQuery> pagerQuery);
 
     @ApiOperation("调车申请查询调出分公司车架号和库存地点")
     @PostMapping("/purSellVinNoAndLoc")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -152,7 +152,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         return null;
     }
 
@@ -177,12 +177,17 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         return null;
     }
 
     @Override
-    public ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -82,4 +82,7 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人的orgSidPath")
+    private String orgSidPath;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -82,4 +82,7 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty(value = "供应商sid")
     private String supplierSid;
 
+    @ApiModelProperty("申请人orgSidPath")
+    private String orgSidPath;
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -169,10 +169,23 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     public ResultBean<String> saveOrUpdateDto(BaseAccadjApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         List<String> accSids = dto.getAccSids();
         if (StringUtils.isBlank(dtoSid)) {//新增
             dto.setApplyDate(DateUtil.today());
             dto.setNodeState("待提交");
+            dto.setOrgSidPath(orgSidPath);
             ResultBean resultBean = this.insertByDto(dto);
             String sid = (String) resultBean.getData();
             for (String accSid : accSids) {
@@ -187,6 +200,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         if (baseAccadjApply == null) {
             rb.setMsg("该调账申请不存在");
         }
+        dto.setOrgSidPath(orgSidPath);
         this.updateByDto(dto);
         baseAccadjApplyeVehService.delByMainSid(dtoSid);
         for (String accSid : accSids) {
@@ -283,18 +297,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
     public ResultBean submitAccAdjApply(SubmitBaseAccAdjApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         List<String> purchaseSids = dto.getAccSids();
-        //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
-        //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BaseAccadjApply baseAccadjApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseAccadjApply);
         if (r == 3) {
@@ -315,8 +317,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
+        BaseAccadjApply baseAccadjApply1 = fetchBySid(businessSid);
         //用户的部门全路径sid
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(baseAccadjApply1.getOrgSidPath());
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -128,6 +128,13 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
      */
     public ResultBean saveOrUpdateDto(BaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
         BaseDiscountpackage entity = new BaseDiscountpackage();
         String orgSid = "";
         ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
@@ -138,6 +145,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         BeanUtil.copyProperties(dto, entity);
         entity.setUseOrg(orgSid);
         entity.setNodeState("待提交");
+        entity.setOrgSidPath(orgSidPath);
         save(entity);
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
         for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
@@ -161,6 +169,14 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     @Transactional(rollbackFor = Exception.class)
     public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         this.updateBySid(dto.toMap(), sid);
         baseDiscountpackageVehService.deleteByMainSid(sid);
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
@@ -410,13 +426,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
 
     public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
-        if (!orgByStaffSid.getSuccess()) {
-            return rb.setMsg(orgByStaffSid.getMsg());
-        }
-        //用户的组织全路径
-        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+
         BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseDiscountpackage);
         if (r == 3) {
@@ -450,8 +460,9 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        BaseDiscountpackage baseDiscountpackage1 = fetchBySid(businessSid);
         //用户的部门全路径sid
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(baseDiscountpackage1.getOrgSidPath());
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -204,6 +204,18 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
     public ResultBean<String> saveAll(BaseInternalPurchaseDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        //根据用户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();
         List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
         if (baseInternalPurchaseVehicles.size() < 1) {
             return rb.setMsg("请选择调车申请车辆");
@@ -227,6 +239,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             String billNo = getApplyCode(dto.getCreateBySid());
             baseInternalPurchase.setNodeState("待提交");
             baseInternalPurchase.setApplyNo(billNo);
+            baseInternalPurchase.setOrgSidPath(orgSidPath);
             save(baseInternalPurchase);
             for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = new BaseInternalPurchaseVehicle();
@@ -250,6 +263,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         if (baseInternalPurchase == null) {
             return rb.setMsg("该内购申请单不存在");
         }
+        dto.setOrgSidPath(orgSidPath);
         updateBySid(dto.toMap(), dtoSid);
         baseInternalPurchaseVehicleService.delByMainSid(dtoSid);
         for (BaseInternalPurchaseVehicleDto baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
@@ -306,18 +320,6 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 return rb.setMsg("选择的车架号为" + baseVehicle.getVinNo() + "的车辆已在审批过程中，请重新选择");
             }
         }
-        //根据用户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();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseInternalPurchase);
         if (r == 3) {
@@ -342,8 +344,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        BaseInternalPurchase baseInternalPurchase1 = fetchBySid(businessSid);
         //用户的部门全路径sid
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(baseInternalPurchase1.getOrgSidPath());
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -126,6 +126,18 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
     public ResultBean<String> saveOrUpdateAll(BaseModelModpriceDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        //根据用户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();
         List<BaseModelModpriceModelDto> baseModelModpriceModels = dto.getBaseModelModpriceModels();
         if (StringUtils.isBlank(sid)) {//新增
             BaseModelModprice baseModelModprice = new BaseModelModprice();
@@ -134,6 +146,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
             baseModelModprice.setSid(sid1);
             baseModelModprice.setCreateBySid(dto.getCreateBySid());
             baseModelModprice.setNodeState("待提交");
+            baseModelModprice.setOrgSidPath(orgSidPath);
             save(baseModelModprice);
             for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
                 BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
@@ -147,6 +160,7 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         if (baseModelModprice == null) {
             return rb.setMsg("该车型调价单不存在");
         }
+        dto.setOrgSidPath(orgSidPath);
         updateBySid(dto.toMap(), sid);
         baseModelModpriceModelService.delByMainSid(sid);
         for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
@@ -202,18 +216,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public ResultBean submitBaseModelModPrice(SubmitBaseModelModPriceDto 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();
         BaseModelModprice baseModelModprice = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, baseModelModprice);
         if (r == 3) {
@@ -234,8 +236,9 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
+        BaseModelModprice baseModelModprice1 = fetchBySid(businessSid);
         //用户的部门全路径sid
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(baseModelModprice1.getOrgSidPath());
         //业务sid
         bv.setBusinessSid(businessSid);
         //用户sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java

@@ -120,13 +120,6 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio
 	public ResultBean complete( BusinessVariablesDto bvd) {
 		BusinessVariables bv=new BusinessVariables();
 		BeanUtil.copyProperties(bvd,bv);
-		/*bv.setUserSid(bvd.getUserSid());
-		bv.setOrgSidPath(bvd.getOrgSidPath());
-		bv.setTaskDefKey(bvd.getTaskDefKey());
-		bv.setTaskId(bvd.getTaskId());
-		bv.setInstanceId(bvd.getInstanceId());
-		bv.setComment(bvd.getComment());
-		bv.setBusinessSid(bvd.getBusinessSid());*/
 		bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
 		bv.setFormVariables(BeanUtil.beanToMap(bvd));
 		return baseOutsourcingApplicationService.complete(bv);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -196,6 +196,9 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
     public ResultBean saveOrUpdateDto(BaseOutsourcingApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        //取组织架构的全路径sid
+        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();
+        String applyOrgSidPath = sysStaffOrg.getOrgSidPath();
         BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
         List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos();
         CommonAppendix contract = dto.getContract();
@@ -252,6 +255,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             String useOrgSid = dto.getUseOrgSid();
             String orgCode = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getOrgCode();
             entity.setOrgCode(orgCode);
+            entity.setOrgSidPath(applyOrgSidPath);
             save(entity);
             for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
                 BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();
@@ -269,6 +273,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             }
             return rb.success().setMsg("添加成功").setData(entity.getSid());
         }
+        dto.setOrgSidPath(applyOrgSidPath);
         updateBySid(dto, sid);
         baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);
         for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
@@ -393,19 +398,15 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
     }
 
     public ResultBean submitBaseOutSourcingApplication(SubmitBaseOutSourcingApplicationDto dto) {
-        //取组织架构的全路径sid
-        SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()).getData();
-        String orgSidPath = sysStaffOrg.getOrgSidPath();
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         String busSid = dto.getBusinessSid();
         if (StringUtils.isBlank(busSid)) {
-          /* String billNo = getApplyCode(dto.getUserSid());
-            dto.setApplicationCode(billNo); */
             ResultBean resultBean = saveOrUpdateDto(dto);//insert
             String businessSid = resultBean.getData().toString();
+            BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(dto, bv);
-            bv.setOrgSidPath(orgSidPath);
+            bv.setOrgSidPath(baseOutsourcingApplication.getOrgSidPath());
             bv.setBusinessSid(businessSid);
             bv.setUserSid(dto.getUserSid());
             //================添加app参数开始
@@ -414,14 +415,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
             appMap.put("sid", businessSid);
             variables.put("app", appMap);
-            //=================添加app参数结束
-            bv.setFormVariables(variables);
-            bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
             //判断是否有指定审批人
             String isSaleOrgApproval = dto.getIsSaleOrgApproval();
+            Boolean isAdj = false;
             if ("1".equals(isSaleOrgApproval)){
                 bv.setNextNodeUserSids(dto.getApprovalSid());
+                isAdj = true;
+                variables.put("isAdj",isAdj);
+            }else {
+                variables.put("isAdj",isAdj);
             }
+            //=================添加app参数结束
+            bv.setFormVariables(variables);
+            bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
             //如果taskid从业务的数据库中查询出来，那这个taskid 和当前的关系是什么  如果数据库中查询出来的taskid是第四个环节的id,但是目前是做的第一次的提交操作。
             // 应该是也不允许走if 也不运行走else  那应该如何验证这个id是否允许走else呢？
             // 取出来业务数据的taskid和前端传递的taskid作比较 来判断数据的是否有效 本质上是数据版本一致性的问题
@@ -429,7 +435,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             UpdateFlowFieldVo uff = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(uff));
             //======================添加消息推送开始
-            BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
             MessageFlowVo messageFlowVo = new MessageFlowVo();
             BeanUtil.copyProperties(uff, messageFlowVo);
@@ -445,19 +450,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
             //======================添加消息推送结束
             return resultBean1;
         }
-        ResultBean rb = submitBusinessData(dto, busSid, orgSidPath);
+        ResultBean rb = submitBusinessData(dto, busSid);
         return rb;
     }
 
     private synchronized ResultBean submitBusinessData(SubmitBaseOutSourcingApplicationDto dto,
-                                                       String businessSid, String orgSidPath) {
+                                                       String businessSid) {
         saveOrUpdateDto(dto);
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
         BaseOutsourcingApplicationDto booad = baseMapper.getBySid(businessSid);
         String businessTaskid = booad.getTaskId();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(dto, bv);
-        bv.setOrgSidPath(orgSidPath);
+        bv.setOrgSidPath(booad.getOrgSidPath());
         bv.setBusinessSid(businessSid);
         bv.setUserSid(dto.getUserSid());
         //================添加app参数开始
@@ -466,14 +471,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
-        //=================添加app参数结束
-        bv.setFormVariables(variables);
-        bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
         //判断是否有指定审批人
         String isSaleOrgApproval = dto.getIsSaleOrgApproval();
+        Boolean isAdj = false;
         if ("1".equals(isSaleOrgApproval)){
             bv.setNextNodeUserSids(dto.getApprovalSid());
+            isAdj = true;
+            variables.put("isAdj",isAdj);
+        }else {
+            variables.put("isAdj",isAdj);
         }
+        //=================添加app参数结束
+        bv.setFormVariables(variables);
+        bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
             // 新提交 taskid都是空的
             saveOrUpdateDto(dto);//update
@@ -551,10 +561,17 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
         ResultBean rrb = ResultBean.fireFail();
         BaseOutsourcingApplication booad = fetchBySid(bv.getBusinessSid());
         String businessTaskid = booad.getTaskId();
+        Boolean isAdj = false;
         if (businessTaskid.equals(bv.getTaskId())) { //只有数据一致的时候才能进行下一步
             //=================添加app相关参数
             Map<String, Object> appMap = new HashMap<>();
             appMap.put("sid", bv.getBusinessSid());
+            if("1".equals(booad.getIsSaleOrgApproval())){
+                isAdj = true;
+                appMap.put("isAdj",isAdj);
+            }else {
+                appMap.put("isAdj",isAdj);
+            }
             bv.getFormVariables().put("app", appMap);
             //================添加app相关参数
             BaseOutsourcingApplicationDto dto = baseMapper.getBySid(bv.getBusinessSid());
@@ -876,10 +893,19 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
 
     public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(BaseOutsourcingApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BaseOutsourcingApplication booad = fetchBySid(dto.getSid());
+        Boolean isAdj = false;
         BusinessVariables bv = new BusinessVariables();
         bv.setModelId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId());
         bv.setTaskDefKey(dto.getTaskDefKey());
-        bv.setFormVariables(BeanUtil.beanToMap(dto));
+        Map<String, Object> map = BeanUtil.beanToMap(dto);
+        if("1".equals(booad.getIsSaleOrgApproval())){
+            isAdj = true;
+            map.put("isAdj",isAdj);
+        }else {
+            map.put("isAdj",isAdj);
+        }
+        bv.setFormVariables(map);
         ResultBean<List<Map<String, Object>>> processCirculationNodesByMap = flowTaskFeign.getNextNodesForSubmit(bv);
         processCirculationNodesByMap.setCode("200");
         processCirculationNodesByMap.setSuccess(true);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -475,4 +475,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<BaseVehicleCrmVo> vehicleCrmPageList(IPage<BaseVehicleCrmVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page, QueryWrapper<BaseVehicle> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1344,4 +1344,25 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="vehicleCollectionPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseChoiceVehicleVo">
+        SELECT bv.sid,
+        bvm.brandName,
+        bvm.vehicleAlias,
+        bvm.sid as carModelSid,
+        bv.vinNo,
+        bmc.carColor color,
+        bv.locationName location,
+        bv.costPrice as priced,
+        bv.priceDate,
+        bv.salesDate
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_vehmodel_config bvc
+        ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -752,7 +752,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
      * @return
      */
     @Override
-    public ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehicleReturnVo>> vehicleReturnList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleReturnVo>> rb = ResultBean.fireFail();
         PagerVo<BaseVehicleReturnVo> pv = baseVehicleService.vehicleReturnList(pagerQuery);
         return rb.success().setData(pv);
@@ -781,19 +781,26 @@ public class BaseVehicleRest implements BaseVehicleFeign {
     }
 
     @Override
-    public ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehicleActualVo>> vehicleActualList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleActualVo>> rb = ResultBean.fireFail();
         PagerVo<BaseVehicleActualVo> pv = baseVehicleService.vehicleActualList(pagerQuery);
         return rb.success().setData(pv);
     }
 
     @Override
-    public ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
+    public ResultBean<PagerVo<BaseVehiclePurchaseVo>> vehiclePurchaseList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehiclePurchaseVo>> rb = ResultBean.fireFail();
         PagerVo<BaseVehiclePurchaseVo> pv = baseVehicleService.vehiclePurchaseList(pagerQuery);
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseChoiceVehicleVo>> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+        ResultBean<PagerVo<BaseChoiceVehicleVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseChoiceVehicleVo> pv = baseVehicleService.vehicleCollectionList(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<List<Map<String, String>>> purSellVinNoAndLoc(String sellerOrgSid) {
         return baseVehicleService.purSellVinNoAndLoc(sellerOrgSid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -41,6 +41,9 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 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.scmcollectionrebate.ScmCollectionRebate;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
@@ -111,6 +114,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private ScmCollectionRebateVehFeign scmCollectionRebateVehFeign;
 
     /**
      * 车辆信息分页列表
@@ -1433,7 +1438,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param pagerQuery 查询条件
      * @return
      */
-    public PagerVo<BaseVehicleReturnVo> vehicleReturnList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public PagerVo<BaseVehicleReturnVo> vehicleReturnList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehicleReturnVo> page = vehicleReturnPageList(pagerQuery);
         PagerVo<BaseVehicleReturnVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleReturnVo> pv1 = PagerUtil.pageToVo(page, pv);
@@ -1483,7 +1488,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return baseMapper.vehicleCrmPageList(page, qw);
     }
 
-    private IPage<BaseVehicleReturnVo> vehicleReturnPageList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    private IPage<BaseVehicleReturnVo> vehicleReturnPageList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehicleReturnVo> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicle> qw = vehicleReturnWrapper(pagerQuery.getParams());
         return baseMapper.vehicleReturnPageList(page, qw);
@@ -1495,7 +1500,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param params 查询条件
      * @return
      */
-    private QueryWrapper<BaseVehicle> vehicleReturnWrapper(BaseVehicleReturnQuery params) {
+    private QueryWrapper<BaseVehicle> vehicleReturnWrapper(BaseChoiceVehicleQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
             if (StringUtils.isNotBlank(params.getUserSid())) {
@@ -1506,45 +1511,21 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (StringUtils.isNotBlank(params.getBrandSid())) {
                 qw.eq("bvm.carBrand", params.getBrandSid());
             }
-            //功能
-            if (StringUtils.isNotBlank(params.getVehicleType())) {
-                qw.eq("bvm.vehicleType", params.getVehicleType());
-            }
-            //系列
-            if (StringUtils.isNotBlank(params.getProductLine())) {
-                qw.eq("bvm.productLine", params.getProductLine());
-            }
-            //变速箱
-            if (StringUtils.isNotBlank(params.getGearboxType())) {
-                qw.eq("bvm.gearboxType", params.getGearboxType());
-            }
-            //驱动
-            if (StringUtils.isNotBlank(params.getDriveForm())) {
-                qw.eq("bvm.driveForm", params.getDriveForm());
-            }
-            //排放标准
-            if (StringUtils.isNotBlank(params.getEmissionStandard())) {
-                qw.eq("bvm.emissionStandard", params.getEmissionStandard());
-            }
-            //马力
-            if (StringUtils.isNotBlank(params.getPower())) {
-                qw.eq("bvm.power", params.getPower());
+            //车型
+            if (StringUtils.isNotBlank(params.getModelNameAndCode())) {
+                qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
             }
-            //燃料
-            if (StringUtils.isNotBlank(params.getFuelType())) {
-                qw.eq("bvm.fuelType", params.getFuelType());
+            // 车架号
+            if (StringUtils.isNotBlank(params.getVinNo())){
+                qw.like("bv.vinNo",params.getVinNo());
             }
-            //版本
-            if (StringUtils.isNotBlank(params.getVehicleVersion())) {
-                qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
+            // 颜色
+            if (StringUtils.isNotBlank(params.getCarColorKey())){
+                qw.eq("bmc.carColorKey",params.getCarColorKey());
             }
-            //车型
-            if (StringUtils.isNotBlank(params.getVehicleAlias())) {
-                qw.like("bvm.vehicleAlias", params.getVehicleAlias());
-            }
-            //快捷检索车型
-            if (StringUtils.isNotBlank(params.getModelName())) {
-                qw.like("bvm.modelName", params.getModelName());
+            // 存放地点
+            if (StringUtils.isNotBlank(params.getLocation())){
+                qw.eq("bv.location",params.getLocation());
             }
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
@@ -1552,7 +1533,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.isDelete", 0);
             //锁定状态：未锁定
             qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
-//            qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
             //库存状态：库存或调出或内销
             qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode()));
             //买断状态：未买断
@@ -1560,8 +1540,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //订单类型
             qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
             qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode());
-            //调车
-            //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode());
         }
         return qw;
     }
@@ -1648,7 +1626,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param pagerQuery 查询条件
      * @return
      */
-    public PagerVo<BaseVehicleActualVo> vehicleActualList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    public PagerVo<BaseVehicleActualVo> vehicleActualList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehicleActualVo> page = vehicleActualPageList(pagerQuery);
         PagerVo<BaseVehicleActualVo> pv = new PagerVo<>();
         PagerVo<BaseVehicleActualVo> pv1 = PagerUtil.pageToVo(page, pv);
@@ -1661,7 +1639,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param pagerQuery 查询条件
      * @return
      */
-    public PagerVo<BaseVehiclePurchaseVo> vehiclePurchaseList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
+    public PagerVo<BaseVehiclePurchaseVo> vehiclePurchaseList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehiclePurchaseVo> page = vehiclePurchasePageList(pagerQuery);
         /*List<BaseVehiclePurchaseVo> records = page.getRecords();
         for (BaseVehiclePurchaseVo record : records) {
@@ -1686,13 +1664,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         return pv1;
     }
 
-    private IPage<BaseVehiclePurchaseVo> vehiclePurchasePageList(PagerQuery<BaseVehiclePurchaseQuery> pagerQuery) {
+    private IPage<BaseVehiclePurchaseVo> vehiclePurchasePageList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehiclePurchaseVo> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicle> qw = vehiclePurchaseWrapper(pagerQuery.getParams());
         return baseMapper.vehiclePurchasePageList(page, qw);
     }
 
-    private QueryWrapper<BaseVehicle> vehiclePurchaseWrapper(BaseVehiclePurchaseQuery params) {
+    private QueryWrapper<BaseVehicle> vehiclePurchaseWrapper(BaseChoiceVehicleQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
             //品牌
@@ -1701,45 +1679,25 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.useOrgSid", orgSid);
             }
-            //功能
-            if (StringUtils.isNotBlank(params.getVehicleType())) {
-                qw.eq("bvm.vehicleType", params.getVehicleType());
-            }
-            //系列
-            if (StringUtils.isNotBlank(params.getProductLine())) {
-                qw.eq("bvm.productLine", params.getProductLine());
-            }
-            //变速箱
-            if (StringUtils.isNotBlank(params.getGearboxType())) {
-                qw.eq("bvm.gearboxType", params.getGearboxType());
-            }
-            //驱动
-            if (StringUtils.isNotBlank(params.getDriveForm())) {
-                qw.eq("bvm.driveForm", params.getDriveForm());
-            }
-            //排放标准
-            if (StringUtils.isNotBlank(params.getEmissionStandard())) {
-                qw.eq("bvm.emissionStandard", params.getEmissionStandard());
-            }
-            //马力
-            if (StringUtils.isNotBlank(params.getPower())) {
-                qw.eq("bvm.power", params.getPower());
+            //品牌
+            if (StringUtils.isNotBlank(params.getBrandSid())) {
+                qw.eq("bvm.carBrand", params.getBrandSid());
             }
-            //燃料
-            if (StringUtils.isNotBlank(params.getFuelType())) {
-                qw.eq("bvm.fuelType", params.getFuelType());
+            //车型
+            if (StringUtils.isNotBlank(params.getModelNameAndCode())) {
+                qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
             }
-            //版本
-            if (StringUtils.isNotBlank(params.getVehicleVersion())) {
-                qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
+            // 车架号
+            if (StringUtils.isNotBlank(params.getVinNo())){
+                qw.like("bv.vinNo",params.getVinNo());
             }
-            //车型
-            if (StringUtils.isNotBlank(params.getVehicleAlias())) {
-                qw.like("bvm.vehicleAlias", params.getVehicleAlias());
+            // 颜色
+            if (StringUtils.isNotBlank(params.getCarColorKey())){
+                qw.eq("bmc.carColorKey",params.getCarColorKey());
             }
-            //快捷检索车型
-            if (StringUtils.isNotBlank(params.getModelName())) {
-                qw.like("bvm.modelName", params.getModelName());
+            // 存放地点
+            if (StringUtils.isNotBlank(params.getLocation())){
+                qw.eq("bv.location",params.getLocation());
             }
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
@@ -1751,8 +1709,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
             //订单类型
             qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
-            //调车状态：未调车
-            //qw.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.OUTCOLL.getCode());
         }
         return qw;
     }
@@ -1763,7 +1719,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param pagerQuery 查询条件
      * @return
      */
-    private IPage<BaseVehicleActualVo> vehicleActualPageList(PagerQuery<BaseVehicleReturnQuery> pagerQuery) {
+    private IPage<BaseVehicleActualVo> vehicleActualPageList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
         IPage<BaseVehicleActualVo> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<BaseVehicle> qw = vehicleActualWrapper(pagerQuery.getParams());
         return baseMapper.vehicleActualPageList(page, qw);
@@ -1775,58 +1731,33 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @param params 查询条件
      * @return
      */
-    private QueryWrapper<BaseVehicle> vehicleActualWrapper(BaseVehicleReturnQuery params) {
+    private QueryWrapper<BaseVehicle> vehicleActualWrapper(BaseChoiceVehicleQuery params) {
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
         if (params != null) {
             //本分公司
             if (StringUtils.isNotBlank(params.getUserSid())) {
                 String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
                 qw.eq("bv.createOrgSid", orgSid);
-
             }
             //品牌
             if (StringUtils.isNotBlank(params.getBrandSid())) {
                 qw.eq("bvm.carBrand", params.getBrandSid());
             }
-            //功能
-            if (StringUtils.isNotBlank(params.getVehicleType())) {
-                qw.eq("bvm.vehicleType", params.getVehicleType());
-            }
-            //系列
-            if (StringUtils.isNotBlank(params.getProductLine())) {
-                qw.eq("bvm.productLine", params.getProductLine());
-            }
-            //变速箱
-            if (StringUtils.isNotBlank(params.getGearboxType())) {
-                qw.eq("bvm.gearboxType", params.getGearboxType());
-            }
-            //驱动
-            if (StringUtils.isNotBlank(params.getDriveForm())) {
-                qw.eq("bvm.driveForm", params.getDriveForm());
-            }
-            //排放标准
-            if (StringUtils.isNotBlank(params.getEmissionStandard())) {
-                qw.eq("bvm.emissionStandard", params.getEmissionStandard());
+            //车型
+            if (StringUtils.isNotBlank(params.getModelNameAndCode())) {
+                qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
             }
-            //马力
-            if (StringUtils.isNotBlank(params.getPower())) {
-                qw.eq("bvm.power", params.getPower());
+            // 车架号
+            if (StringUtils.isNotBlank(params.getVinNo())){
+                qw.like("bv.vinNo",params.getVinNo());
             }
-            //燃料
-            if (StringUtils.isNotBlank(params.getFuelType())) {
-                qw.eq("bvm.fuelType", params.getFuelType());
+            // 颜色
+            if (StringUtils.isNotBlank(params.getCarColorKey())){
+                qw.eq("bmc.carColorKey",params.getCarColorKey());
             }
-            //版本
-            if (StringUtils.isNotBlank(params.getVehicleVersion())) {
-                qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
-            }
-            //车型
-            if (StringUtils.isNotBlank(params.getVehicleAlias())) {
-                qw.like("bvm.vehicleAlias", params.getVehicleAlias());
-            }
-            //快捷检索车型
-            if (StringUtils.isNotBlank(params.getModelName())) {
-                qw.like("bvm.modelName", params.getModelName());
+            // 存放地点
+            if (StringUtils.isNotBlank(params.getLocation())){
+                qw.eq("bv.location",params.getLocation());
             }
             if (params.getVinNoList().size() > 0) {
                 qw.notIn("bv.vinNo", params.getVinNoList());
@@ -1840,11 +1771,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode());
             //非删除
             qw.eq("bv.isDelete", 0);
-            if (StringUtils.isNotBlank(params.getOrderingNo())) {
-                qw.like("bv.orderingNo", params.getOrderingNo());
-            }
             qw.eq("bv.isProblemVeh", 0);
-
         }
         return qw;
     }
@@ -3285,4 +3212,60 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         PagerVo<BaseDiscountpackageGetVehVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public PagerVo<BaseChoiceVehicleVo> vehicleCollectionList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+        IPage<BaseChoiceVehicleVo> page = vehicleCollectionPageList(pagerQuery);
+        List<BaseChoiceVehicleVo> records = page.getRecords();
+        List<BaseChoiceVehicleVo> newRecords = new ArrayList<>();
+        for (BaseChoiceVehicleVo record : records) {
+            ScmCollectionRebateVehDetailsVo scmCollectionRebateVehDetailsVo = scmCollectionRebateVehFeign.fetchByVehSid(record.getVinNo());
+            if (scmCollectionRebateVehDetailsVo == null){
+                newRecords.add(record);
+            }
+        }
+        page.setRecords(newRecords);
+        PagerVo<BaseChoiceVehicleVo> pv = new PagerVo<>();
+        PagerVo<BaseChoiceVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);
+        return pv1;
+    }
+
+    private IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(PagerQuery<BaseChoiceVehicleQuery> pagerQuery) {
+        IPage<BaseChoiceVehicleVo> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        BaseChoiceVehicleQuery params = pagerQuery.getParams();
+        if (params != null) {
+            //品牌
+            qw.eq("bvm.carBrand", params.getBrandSid());
+            if (StringUtils.isNotBlank(params.getUserSid())) {
+                String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+                qw.eq("bv.useOrgSid", orgSid);
+            }
+            //品牌
+            if (StringUtils.isNotBlank(params.getBrandSid())) {
+                qw.eq("bvm.carBrand", params.getBrandSid());
+            }
+            //车型
+            if (StringUtils.isNotBlank(params.getModelNameAndCode())) {
+                qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
+            }
+            // 车架号
+            if (StringUtils.isNotBlank(params.getVinNo())){
+                qw.like("bv.vinNo",params.getVinNo());
+            }
+            // 颜色
+            if (StringUtils.isNotBlank(params.getCarColorKey())){
+                qw.eq("bmc.carColorKey",params.getCarColorKey());
+            }
+            // 存放地点
+            if (StringUtils.isNotBlank(params.getLocation())){
+                qw.eq("bv.location",params.getLocation());
+            }
+            if (params.getVinNoList().size() > 0) {
+                qw.notIn("bv.vinNo", params.getVinNoList());
+            }
+            qw.eq("bv.isDelete", 0);
+            qw.eq("bv.vehicleState",VehicleState.StockEnum.OUT_STOCK.getCode());
+        }
+        return baseMapper.vehicleCollectionPageList(page, qw);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -153,8 +153,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             //=======================================
             String orgSidPath = scmVehicleActualSalesDto.getOrgSidPath();
             if(StringUtils.isBlank(scmVehicleActualSalesDto.getOrgSidPath())){
-                //查询用户的分公司sid
-                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(scmVehicleActualSalesDto.getUserSid()).getData();
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(scmVehicleActualSalesDto.getUserSid());
                 if (!userVoResultBean.getSuccess()) {
@@ -194,7 +192,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales);
+            BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales,"orgSidPath");
             int i = baseMapper.updateById(baseVehicleActualSales);
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -220,6 +220,22 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {//新增
+            //=======================================
+            String orgSidPath = dto.getOrgSidPath();
+            if(StringUtils.isBlank(orgSidPath)){
+                //根据用户sid获取staffSid
+                ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
+                if (!userVoResultBean.getSuccess()) {
+                    return rb.setMsg(userVoResultBean.getMsg());
+                }
+                //根据staffSid获取用户的组织全路径
+                ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+                if (!staffOrgResultBean.getSuccess()) {
+                    return rb.setMsg(staffOrgResultBean.getMsg());
+                }
+                orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            }
+            //===========================================
             BusVehicleApply entity = new BusVehicleApply();
             BeanUtil.copyProperties(dto, entity, "sid");
             //申请编号规则：单据名称大写首字母+分公司编码+年份+月份+4位顺序号
@@ -227,6 +243,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             String billNo = getApplyCode(dto);
             entity.setApplicationCode(billNo);
             entity.setApplicationDate(DateUtil.today());
+            entity.setOrgSidPath(orgSidPath);
             int i = 0;
             List<BusVehicleApplyDetailDto> busVehicleApplyDetailDtoList = dto.getBusVehicleApplyDetailList();
             for (BusVehicleApplyDetailDto busVehicleApplyDetailDto : busVehicleApplyDetailDtoList) {
@@ -260,7 +277,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (busVehicleApply == null) {
                 return rb.setMsg("该申请不存在");
             }
-            BeanUtil.copyProperties(dto, busVehicleApply);
+            BeanUtil.copyProperties(dto, busVehicleApply,"orgSidPath");
             busVehicleApplyDetailService.delByApplySid(dto.getSid());
             busVehicleApplySzService.deleteByApplySid(dto.getSid());
             int i = 0;
@@ -364,6 +381,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return rb.setMsg("采购原因不能为空");
         }
         //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
         ResultBean<String> resultBean = saveOrUpdateDto(dto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -511,6 +529,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(busVehicleApply.getOrgSidPath());
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1541,6 +1541,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setVinNo(vinList.get(i).toString());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
                             unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     } else {
@@ -1565,7 +1566,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                             unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
                             unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
                             unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
-//                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
                             finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
                         }
                     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceDto.java

@@ -49,4 +49,6 @@ public class AppAdvanceInvoiceDto implements Dto {
     private String taskId;
     @ApiModelProperty("流程实列id")
     private String procInsId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java

@@ -98,4 +98,6 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty(value = "当前用户部门全路径")
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryDto.java

@@ -41,4 +41,6 @@ public class AppArrearsCarryDto implements Dto {
     private String procInsId;
     @ApiModelProperty("用户sid")
     private String taskId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java

@@ -83,4 +83,6 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
+    @ApiModelProperty("当前用户部门的全路径")
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -518,6 +518,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
+        if (StringUtils.isBlank(dto.getOrgSidPath())){
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
         String sid = dto.getContractSid();
         busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
@@ -596,6 +606,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
         int r = submitBusinessData(dto, busAdvanceGinvoiceapply);
         if (r == 3) {
@@ -604,6 +615,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        dto.setOrgSidPath(orgSidPath);
         //新增修改保存
         ResultBean<String> resultBean = saveAdvanceInvoice(dto);
         if (!resultBean.getSuccess()) {
@@ -717,6 +729,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
+            bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         if (bv.getTaskId().equals(busAdvanceGinvoiceapply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -821,6 +838,11 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busAdvanceGinvoiceapply.getOrgSidPath())) {
+            bv.setOrgSidPath(busAdvanceGinvoiceapply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         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());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -606,8 +606,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         ResultBean rb = ResultBean.fireFail();
         // 取出分公司sid
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
-        // 取出当前登录用户信息
-        SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        if (StringUtils.isBlank(dto.getOrgSidPath())){
+            // 取出当前登录用户信息
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         //根据申请sid查询数据
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
         BeanUtil.copyProperties(dto, busArrearsCarryVehicleApply);
@@ -650,6 +660,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid());
         int r = submitBusinessData(dto, busArrearsCarryVehicleApply);
         if (r == 3) {
@@ -771,6 +782,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
+            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -888,6 +904,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         appMap.put("contractSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) {
+            bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath());
+        } else {
+            return rb.setMsg("orgSidPath 为空！");
+        }
         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());

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplication.java

@@ -89,6 +89,7 @@ public class FinBillApplication extends BaseEntity {
     private String nodeState;
     @ApiModelProperty(value = "是否延迟开票")
     private Integer isDelayBill;
-
+    @ApiModelProperty("当前用户部门全路径")
+    private String orgSidPath;
     private String taskId;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -93,6 +93,8 @@ public class FinBillApplicationDto implements Dto {
     private String isHighAndLowOpen;
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("当前用户部门全路径")
+    private String orgSidPath;
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
     @ApiModelProperty("客户开票申请书附件信息")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -91,4 +91,5 @@ public class FinCollectionConfirmation extends BaseEntity {
     private String busSid;
     @ApiModelProperty("业务单据编号")
     private String busNo;
+    private int first;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -51,6 +51,8 @@ import java.util.List;
 @Data
 public class FinCollectionConfirmationDetailsVo implements Vo {
 
+    @ApiModelProperty("sid")
+    private String sid;
     
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -51,9 +51,10 @@ import java.util.List;
 @Data
 public class FinCollectionConfirmationDto implements Dto {
 
+    private static final long serialVersionUID = -403651328937526175L;
     @ApiModelProperty("用户sid")
     private String userSid;
-    @ApiModelProperty("收款确认单sid")
+    @ApiModelProperty("sid")
     private String sid; // 收款确认单sid
     @ApiModelProperty("业务员sid")
     private String staffSid; // 业务员sid
@@ -81,8 +82,8 @@ public class FinCollectionConfirmationDto implements Dto {
     private String paymentVoucherUrl; // 打款凭证Url
 	@ApiModelProperty("汇款确认书Url")
     private String remittanceConfirmationUrl; // 汇款确认书Url
-	@ApiModelProperty("余额")
-    private String balance; // 余额
+/*	@ApiModelProperty("余额")
+    private String balance;*/
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
     @ApiModelProperty("备注")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@@ -66,6 +66,6 @@ public class FinCollectionConfirmationVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty("审核状态（1待审核/2已驳回/3已审核）")
     private Integer auditState; // 审核状态
-    /*@ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
-    private Integer subscriptionState; // 审核状态*/
+    @ApiModelProperty("认款状态（1未认款/2部分认款/3已认款）")
+    private Integer subscriptionState; // 审核状态
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java

@@ -82,4 +82,7 @@ public class FinSelectedReceivablesDetailed extends BaseEntity {
 	private Integer auditState; // 审核状态
 	@ApiModelProperty("审核时间")
 	private String auditDate; // 审核时间
+
+	@ApiModelProperty("应收未收sid")
+	private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java

@@ -49,7 +49,7 @@ import lombok.Data;
 @Data
 public class FinSelectedReceivablesDetailedDto implements Dto {
 
-	@ApiModelProperty("创建人接口")
+	@ApiModelProperty("创建人")
     private String createByName; // 创建人接口
 	@ApiModelProperty("合同sid")
     private String contractSid; // 合同sid
@@ -70,12 +70,15 @@ public class FinSelectedReceivablesDetailedDto implements Dto {
     private String receivablesName; // 应收项目名称
 	@ApiModelProperty("当前应收金额")
     private String currentReceivableMoney; // 当前应收金额
-    @ApiModelProperty("上次认款金额")
-    private String lastSubscriptionMoney; // 上次认款金额
+  /*  @ApiModelProperty("上次认款金额")
+    private String lastSubscriptionMoney; // 上次认款金额*/
 	@ApiModelProperty("认款金额")
     private String subscriptionMoney; // 认款金额
 	@ApiModelProperty("认款申请日期")
     private String subscriptionDate; // 认款申请日期
 	@ApiModelProperty("收款确认单sid")
     private String collSid; // 收款确认单sid
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java

@@ -106,4 +106,7 @@ public class FinSelectedReceivablesDetailedVo implements Vo {
 
     @ApiModelProperty("款项类型value")
     private String paymentTypeValue; // 款项类型value
+
+    @ApiModelProperty("应收未收款项sid")
+    private String receivablesSid;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java

@@ -82,4 +82,9 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
     
 	@ApiModelProperty("当前应收金额")
     private BigDecimal currentReceivableMoney; // 当前应收金额
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
+
+    private Integer subscriptionState;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java

@@ -49,4 +49,8 @@ public class UnCollectionDto implements Dto {
     @ApiModelProperty("用户sid:创建人")
     private String userSid;
 
+
+    @ApiModelProperty("应收金额（不变）")
+    private String reveivableMoney;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -78,7 +78,6 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
-import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -200,6 +199,21 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dto.getOrgSidPath())) {
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            //用户的组织全路径
+            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+            dto.setOrgSidPath(orgSidPath);
+        }
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
         List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
@@ -686,6 +700,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         appMap.put("contractSid", businessSid);
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(finBillApplication.getOrgSidPath());
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -868,6 +883,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         //用户的组织全路径
         String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        dto.setOrgSidPath(orgSidPath);
         FinBillApplication finBillApplication = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, finBillApplication);
         if (r == 3) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -100,4 +101,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
 
 
     List<AppCollectionConfirmationStateVo> selectByState();
+
+    int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -86,4 +86,8 @@
                  left join fin_selected_receivables_detailed fsrd on fcc.sid = fsrd.collSid
         where fcc.auditState = 1
     </select>
+
+    <update id="updateBalanceBySid">
+        update fin_collection_confirmation set balance = #{balanceBigDecimal} where sid = #{sid}
+    </update>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
@@ -48,6 +49,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
@@ -72,6 +74,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -203,7 +206,98 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
     public ResultBean saveAllDto(FinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {
+            //首次认款
+            List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
+            BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) {
+                return rb.setMsg("认款不完全，提交失败");
+            }
+            List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
+            if (paymentVoucherAppendixs.size() == 0) {
+                return rb.setMsg("请上传打款凭证附件");
+            }
+            List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
+            if (remittanceConfirmationAppendixs.size() == 0) {
+                return rb.setMsg("请上传汇款确认书附件");
+            }
+            //对收款申请进行赋值操作
+            FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
+            BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
+            sid = finCollectionConfirmation.getSid();
+            //根据用户sid查询分公司sid
+            String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+            finCollectionConfirmation.setCreateBySid(dto.getUserSid());
+            finCollectionConfirmation.setUseOrgSid(useOrgSid);
+            //附件保存:打款凭证附件
+            paymentVoucherAppendixs.stream().forEach(v -> {
+                CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+                BeanUtil.copyProperties(v, commonAppendixDto);
+                String s = commonAppendixDto.getFilePath();
+                if (s.contains(fileUploadComponent.getUrlPrefix())) {
+                    s = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
+                commonAppendixDto.setFilePath(s);
+                commonAppendixDto.setCreateBySid(dto.getUserSid());
+                commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
+                commonAppendixFeign.save(commonAppendixDto);
+            });
+            String payFilePath = paymentVoucherAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+            finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
+            //汇款确认书附件保存
+            remittanceConfirmationAppendixs.stream().forEach(v -> {
+                CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+                BeanUtil.copyProperties(v, commonAppendixDto);
+                String s = commonAppendixDto.getFilePath();
+                if (s.contains(fileUploadComponent.getUrlPrefix())) {
+                    s = s.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                commonAppendixDto.setLinkSid(finCollectionConfirmation.getSid());
+                commonAppendixDto.setFilePath(s);
+                commonAppendixDto.setCreateBySid(dto.getUserSid());
+                commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
+                commonAppendixFeign.save(commonAppendixDto);
+            });
+            String remFilePath = remittanceConfirmationAppendixs.stream().map(v -> v.getFilePath().replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(","));
+            finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath);
+            //认款明细保存
+            String finalSid = sid;
+            finSelectedReceivablesDetailedDtos.stream().forEach(v -> {//已选
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+                BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
+                finSelectedReceivablesDetailed.setCollSid(finalSid);
+                finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
+                //设置审核状态为待审核(1待审核/2已驳回/3已审核)
+                finSelectedReceivablesDetailed.setAuditState(1);
+                finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
+                //添加已选车架号为临时状态
+                BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+                baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
+                baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
+                baseVehicleTempstateDto.setTempKey("1");
+                baseVehicleTempstateDto.setTempValue("待审核");
+                baseVehicleTempstateDto.setBusSid(finalSid);
+                //根据合同编号和车架号查询该合同的车辆sid
+                ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(v.getContractNo(), v.getVIN());
+                if (resultBean.getSuccess()) {
+                    baseVehicleTempstateDto.setVehSid(resultBean.getData());
+                }
+                ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+                finCollectionConfirmation.setBalance(finCollectionConfirmation.getCollectionMoney());
+                finCollectionConfirmation.setAuditState(1);
+                //1未认款/2部分认款/3已认款
+                finCollectionConfirmation.setPaymentState(1);
+                baseMapper.insert(finCollectionConfirmation);
+
+            });
+
+
+        } else {//认款、多次认款
+
+        }
+       /* FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
         List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
 
         List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
@@ -220,24 +314,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 //        finCollectionConfirmation.setSid(sid1);
         String payFilePath = "";
         String remFilePath = "";
-       /* String staffSid = dto.getStaffSid();
-        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
-        List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
-        String orgSidPath = "";
-        for (SysStaffOrgVo datum : data) {
-            orgSidPath = datum.getOrgSidPath();
-            String[] split = orgSidPath.split("/");
-            for (String s : split) {
-                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
-                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
-                Integer isDept = data1.getIsDept();
-                String psid = data1.getPsid();
-                if (isDept == 0 && !psid.equals(0)) {
-                    orgSidPath = s;
-                    break;
-                }
-            }
-        }*/
         //用户sid
         String createBySid = dto.getUserSid();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(createBySid).getData();
@@ -298,7 +374,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             }
             ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             //已选应收款项-车架号
-           /* String vin = finSelectedReceivablesDetailed.getVIN();
+           String vin = finSelectedReceivablesDetailed.getVIN();
             //已选应收款项-应收项目名称
             String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
             FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
@@ -316,7 +392,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
             FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
             BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
-            finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());*/
+            finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
         }
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
         BigDecimal totalSubscriptionMone = new BigDecimal(0);
@@ -326,14 +402,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         }
         //收款金额
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
-//        BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
-       /* if (subtract.compareTo(BigDecimal.ZERO) < 0) {
+        BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
+      if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
-        }*/
+        }
         finCollectionConfirmation.setBalance(collectionMoney);
+        FinCollectionConfirmation confirmation = fetchBySid(dto.getSid());
+        if (confirmation == null) {
+            finCollectionConfirmation.setBalance(collectionMoney);
+        } else {
+            finCollectionConfirmation.setBalance(confirmation.getBalance());
+        }
+
         finCollectionConfirmation.setAuditState(1);
         finCollectionConfirmation.setPaymentState(1);
-        save(finCollectionConfirmation);
+        save(finCollectionConfirmation);*/
         return rb.success().setMsg("添加成功");
     }
 
@@ -834,20 +917,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
     public ResultBean cashierReject(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.cashierReject(sid);
+        FinCollectionConfirmation confirmation = fetchBySid(sid);
+        if (confirmation == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (confirmation.getFirst() == 1) {
+            return rb.setMsg("不是首次，不允许驳回");
+        }
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
+        finSelectedReceivablesDetailedVos.stream().forEach(v -> {
+            String selectSid = v.getSid();
+            FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
+            finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
+            finSelectedReceivablesDetailed.setAuditState(2);
+            finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
+        });
+        confirmation.setAuditState(2);
+        baseMapper.updateById(confirmation);
+        //删除临时表的数据
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
+
+        /*baseMapper.cashierReject(sid);
         int auditState = 1;
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
             //更新审核时间
             finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2");
-           /* String vin = finSelectedReceivablesDetailedVo.getVIN();
+            String vin = finSelectedReceivablesDetailedVo.getVIN();
             String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
             BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
             String sid1 = finUncollectedReceivablesDetailedVo.getSid();
             BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
             String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
-            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);*/
+            finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);
         }
         FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
@@ -856,13 +959,55 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDto);
         updateBySid(finCollectionConfirmationDto, finCollectionConfirmationDto.getSid());
         //删除临时表的数据
-        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/
         return rb.success().setMsg("驳回成功");
     }
 
     public ResultBean cashierConfirm(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        baseMapper.cashierConfirm(sid);
+        FinCollectionConfirmation confirmation = fetchBySid(sid);
+        if (confirmation == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        //查询该申请下的所有待审核的款项明细
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
+        finSelectedReceivablesDetailedVos.stream().forEach(v -> {
+            //已选款项明细sid
+            String selectSid = v.getSid();
+            //应收未收款项明细sid
+            String receivablesSid = v.getReceivablesSid();
+            FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
+            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney();
+            //更新当前应收金额
+            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney.subtract(new BigDecimal(v.getSubscriptionMoney())));
+            //更新认款状态
+            finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
+            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+            FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
+            //更新已选款项明细的审核状态1待审核/2已驳回/3已审核
+            finSelectedReceivablesDetailed.setAuditState(3);
+            //更新审核时间
+            finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
+            finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
+            //ToDo:查询是否符合待出库的条件
+        });
+        //查询该申请所有的款项明细
+        finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
+        //查询该申请已认款金额总数
+        BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        //与收款金额作比较：更新认款状态  1未认款/2部分认款/3已认款
+        confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) == 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
+        //更新收款申请的余额以及审核状态
+        BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
+        confirmation.setBalance(balanceBigDecimal);
+        confirmation.setAuditState(3);
+        baseMapper.updateById(confirmation);
+        //删除临时表的数据
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
+
+
+
+     /*   baseMapper.cashierConfirm(sid);
         int auditState = 1;
         //总共认款金额
         BigDecimal totalSubscriptionMoney = new BigDecimal(0);
@@ -878,9 +1023,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             String vin = finSelectedReceivablesDetailedVo.getVIN();
             String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
             String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid();
-//            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
-            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecNameOrgSid(vin, receivablesName, useOrgSid);
-//            String sid2 = finUncollectedReceivablesDetailedVo.getSid();
+            FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
+            String sid2 = finUncollectedReceivablesDetailedVo.getSid();
             //应收未收款项-当前应收金额
             BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
             //已选应收款项-认款金额
@@ -889,15 +1033,15 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
             BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
             finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
-        /*    if (subtract.compareTo(BigDecimal.ZERO) == 0) {
+          if (subtract.compareTo(BigDecimal.ZERO) == 0) {
                 int subscriptionState = 3;
                 finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
             } else {
                 int subscriptionState = 2;
                 finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
-            }*/
+            }
         }
-       /* FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
+        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
         BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
         BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMoney);
         if (subtract.compareTo(BigDecimal.ZERO) == 0) {
@@ -906,9 +1050,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         } else {
             int paymentState = 2;
             baseMapper.updatePaymentStateBySid(sid, paymentState);
-        }*/
+        }
+        //更新余额
+        BigDecimal balanceBigDecimal = confirmation.getBalance().subtract(totalSubscriptionMoney);
+        baseMapper.updateBalanceBySid(sid, balanceBigDecimal);
         //删除临时表的数据
-        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
+        ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);*/
         return rb.success().setMsg("款项确认成功");
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -8,33 +8,48 @@ public enum ProcDefEnum {
     ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
-//    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
+    //    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
     //SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//正式销售政策流程定义id
-    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:822504"),//测试销售政策流程定义id
-    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
+    //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
+    //BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
+    //    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
+//    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    FINBILLAPPLICATION("开票申请流程", "process_sndce6s9:1:862516"),//测试（新）2022、11、22
 //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
-    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
+//    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:3:820008"), //测试
+    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:4:862504"), //测试（新）2022、11、22
 //    BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:1:765004"),//本地
 //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_ll25axqj:1:687508"),//本地
-    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
-//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+    //ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
+    //    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
+    //VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+//    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),//测试
+    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:2:862512"),//测试（新）2022、11、22
+//    VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:11:865004"),//TODO:测试
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO
-    SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"),
+    SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
+    //BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
+    //    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
 //    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo
     BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:852504"),//ToDo:测试
 //    SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"),
     SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO
-    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"),
-    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"),
-    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
+    BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
+    BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:867512"),//测试调车流程定义id
+    //SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+    //FINCOSTAPPLY("费用申请", "process_u0pahv0s:5:457512"),
+    //FINPAYAPPLY("付款申请", "process_gin2tntb:3:457508"),
+    BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
+//    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
+    SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:860004"), //TODO:测试
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
     FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
-    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:717504"), //测试调账流程定义id
     //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:695004"),//正式调账流程定义id
     BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java

@@ -75,7 +75,7 @@ public class SysStaffinfoDto implements Dto {
     @ApiModelProperty(value = "住址", required = false)
     private String address;
     @ApiModelProperty(value = "手机号", required = true)
-    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确")
+    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
     @NotBlank(message = "手机号不能为空")
     private String mobile;
     @ApiModelProperty(value = "邮箱", required = false)

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebate.java

@@ -58,8 +58,10 @@ public class ScmCollectionRebate extends BaseEntity {
     private String collectionTypeKey; // 回款方式key
 	@ApiModelProperty("回款方式value")
     private String collectionTypeValue; // 回款方式value
-	@ApiModelProperty("厂家销售通路")
-    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("厂家销售通路key")
+    private String manufaSaleChannel; // 厂家销售通路key
+    @ApiModelProperty("厂家销售通路value")
+    private String manufaSaleChannelValue; // 厂家销售通路value
 	@ApiModelProperty("回款金额")
     private String collectionMoney; // 回款金额
 	@ApiModelProperty("运费")
@@ -88,5 +90,7 @@ public class ScmCollectionRebate extends BaseEntity {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
+    @ApiModelProperty("是否减运费")
+    private String isReduceFreight; // 是否减运费
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDetailsVo.java

@@ -27,6 +27,8 @@ package com.yxt.anrui.scm.api.scmcollectionrebate;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -34,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * Project: anrui-scm(回款返利) <br/>
@@ -69,8 +72,10 @@ public class ScmCollectionRebateDetailsVo implements Vo {
     private String collectionTypeKey; // 回款方式key
 	@ApiModelProperty("回款方式value")
     private String collectionTypeValue; // 回款方式value
-	@ApiModelProperty("厂家销售通路")
-    private String manufaSaleChannel; // 厂家销售通路
+    @ApiModelProperty("厂家销售通路key")
+    private String manufaSaleChannel; // 厂家销售通路key
+    @ApiModelProperty("厂家销售通路value")
+    private String manufaSaleChannelValue; // 厂家销售通路value
 	@ApiModelProperty("回款金额")
     private String collectionMoney; // 回款金额
 	@ApiModelProperty("运费")
@@ -99,5 +104,8 @@ public class ScmCollectionRebateDetailsVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-
+    @ApiModelProperty("是否减运费")
+    private String isReduceFreight; // 是否减运费
+    @ApiModelProperty("回款返利车辆列表")
+    private List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehs;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateDto.java

@@ -26,12 +26,15 @@
 package com.yxt.anrui.scm.api.scmcollectionrebate;
 
 
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-scm(回款返利) <br/>
  * File: ScmCollectionRebateDto.java <br/>
@@ -63,8 +66,10 @@ public class ScmCollectionRebateDto implements Dto {
     private String collectionTypeKey; // 回款方式key
 	@ApiModelProperty("回款方式value")
     private String collectionTypeValue; // 回款方式value
-	@ApiModelProperty("厂家销售通路")
-    private String manufaSaleChannel; // 厂家销售通路
+    @ApiModelProperty("厂家销售通路key")
+    private String manufaSaleChannel; // 厂家销售通路key
+    @ApiModelProperty("厂家销售通路value")
+    private String manufaSaleChannelValue; // 厂家销售通路value
 	@ApiModelProperty("回款金额")
     private String collectionMoney; // 回款金额
 	@ApiModelProperty("运费")
@@ -93,5 +98,8 @@ public class ScmCollectionRebateDto implements Dto {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-
+    @ApiModelProperty("是否减运费")
+    private String isReduceFreight; // 是否减运费
+    @ApiModelProperty("回款返利车辆列表")
+    private List<ScmCollectionRebateVehDto> scmCollectionRebateVehs;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@@ -51,6 +51,8 @@ import java.util.List;
 @ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件")
 public class ScmCollectionRebateQuery implements Query {
 
+    @ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
     @ApiModelProperty("回款方式key")
     private String collectionTypeKey; // 回款方式key
     @ApiModelProperty("回款开始日期")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@@ -64,8 +64,10 @@ public class ScmCollectionRebateVo implements Vo {
     private String collectionTypeKey; // 回款方式key
 	@ApiModelProperty("回款方式value")
     private String collectionTypeValue; // 回款方式value
-	@ApiModelProperty("厂家销售通路")
-    private String manufaSaleChannel; // 厂家销售通路
+    @ApiModelProperty("厂家销售通路key")
+    private String manufaSaleChannel; // 厂家销售通路key
+    @ApiModelProperty("厂家销售通路value")
+    private String manufaSaleChannelValue; // 厂家销售通路value
 	@ApiModelProperty("回款金额")
     private String collectionMoney; // 回款金额
 	@ApiModelProperty("运费")
@@ -98,6 +100,8 @@ public class ScmCollectionRebateVo implements Vo {
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
+    @ApiModelProperty("是否减运费")
+    private String isReduceFreight; // 是否减运费
     @ApiModelProperty("上传状态(2未上传、3已上传)")
     private String uploadState; // 上传状态
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeign.java

@@ -25,14 +25,22 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
 
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
 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,40 @@ public interface ScmCollectionrebateCheckapplyFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**************************************回款返利核对审批流程*******************************************/
+
+    @ApiOperation("提交回款返利核对申请")
+    @PostMapping("/submitCollectionRebateCheckApply")
+    public ResultBean submitCollectionRebateCheckApply(@RequestBody @Valid SubmitScmCollectionRebateCheckApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody ScmCollectionRebateCheckApplyCompleteDto 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);
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyFeignFallback.java

@@ -25,6 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
 
+import com.yxt.anrui.scm.api.flow.FlowTaskVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyCompleteDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
 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 ScmCollectionrebateCheckapplyFeignFallback implements ScmCollection
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-scm/scmcollectionrebatecheckapply/fetchDetailsBySid无法访问");
     }
+
+    @Override
+    public ResultBean submitCollectionRebateCheckApply(SubmitScmCollectionRebateCheckApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(ScmCollectionRebateCheckApplyCompleteDto 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;
+    }
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.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;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/GetNodeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.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;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyCompleteDto.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.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 ScmCollectionRebateCheckApplyCompleteDto 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<>();
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/ScmCollectionRebateCheckApplyTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.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 ScmCollectionRebateCheckApplyTaskQuery 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<>();*/
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/flow/SubmitScmCollectionRebateCheckApplyDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow;
+
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitScmCollectionRebateCheckApplyDto extends ScmCollectionrebateCheckapplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistribution.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistribution.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution <br/>
+ * Description: 回款返利分配表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配表", description = "回款返利分配表")
+@TableName("scm_collection_rebate_distribution")
+public class ScmCollectionRebateDistribution extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withholdingApply; // 预提申请
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("预提返利")
+    private String estimateRebate; // 预提返利
+	@ApiModelProperty("分摊参考比例")
+    private String shareGinExaProportion; // 分摊参考比例
+	@ApiModelProperty("分摊比例")
+    private String shareProportion; // 分摊比例
+	@ApiModelProperty("分摊返利总额")
+    private String shareRebateTotal; // 分摊返利总额
+	@ApiModelProperty("本次返利余额")
+    private String thisRebateBalance; // 本次返利余额
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("分配状态")
+    private String distributionState; // 分配状态
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDetailsVo.java

@@ -0,0 +1,88 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+
+import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo <br/>
+ * Description: 回款返利分配表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配表 视图数据详情", description = "回款返利分配表 视图数据详情")
+public class ScmCollectionRebateDistributionDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withholdingApply; // 预提申请
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("预提返利")
+    private String estimateRebate; // 预提返利
+	@ApiModelProperty("分摊参考比例")
+    private String shareGinExaProportion; // 分摊参考比例
+	@ApiModelProperty("分摊比例")
+    private String shareProportion; // 分摊比例
+	@ApiModelProperty("分摊返利总额")
+    private String shareRebateTotal; // 分摊返利总额
+	@ApiModelProperty("本次返利余额")
+    private String thisRebateBalance; // 本次返利余额
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("分配状态")
+    private String distributionState; // 分配状态
+    @ApiModelProperty("回款返利分配车辆列表")
+    private List<ScmCollectionRebateDistributionVehDetailsVo> scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionDto.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+
+import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionDto <br/>
+ * Description: 回款返利分配表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配表 数据传输对象", description = "回款返利分配表 数据传输对象")
+public class ScmCollectionRebateDistributionDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withholdingApply; // 预提申请
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("预提返利")
+    private String estimateRebate; // 预提返利
+	@ApiModelProperty("分摊参考比例")
+    private String shareGinExaProportion; // 分摊参考比例
+	@ApiModelProperty("分摊比例")
+    private String shareProportion; // 分摊比例
+	@ApiModelProperty("分摊返利总额")
+    private String shareRebateTotal; // 分摊返利总额
+	@ApiModelProperty("本次返利余额")
+    private String thisRebateBalance; // 本次返利余额
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("分配状态")
+    private String distributionState; // 分配状态
+    @ApiModelProperty("回款返利分配车辆列表")
+    private List<ScmCollectionRebateDistributionVehDto> scmCollectionRebateDistributionVehs; // 回款返利分配车辆列表
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeign <br/>
+ * Description: 回款返利分配表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利分配表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebateDistribution",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatedistribution",
+        fallback = ScmCollectionRebateDistributionFeignFallback.class)
+public interface ScmCollectionRebateDistributionFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateDistributionVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateDistributionQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateDistributionDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionFeignFallback <br/>
+ * Description: 回款返利分配表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateDistributionFeignFallback implements ScmCollectionRebateDistributionFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateDistributionVo>> listPage(PagerQuery<ScmCollectionRebateDistributionQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatedistribution/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateDistributionDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistribution/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistribution/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateDistributionDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatedistribution/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionQuery <br/>
+ * Description: 回款返利分配表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配表 查询条件", description = "回款返利分配表 查询条件")
+public class ScmCollectionRebateDistributionQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("预提开始标题")
+    private String withholdingStartApply; // 预提开始标题
+    @ApiModelProperty("预提结束标题")
+    private String withholdingEndApply; // 预提结束标题
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime; // 创建开始日期
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime; // 创建结束日期
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistribution;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistributionVo <br/>
+ * Description: 回款返利分配表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配表 视图数据对象", description = "回款返利分配表 视图数据对象")
+public class ScmCollectionRebateDistributionVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("预提申请")
+    private String withholdingApply; // 预提申请
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("预提返利")
+    private String estimateRebate; // 预提返利
+	@ApiModelProperty("分摊参考比例")
+    private String shareGinExaProportion; // 分摊参考比例
+	@ApiModelProperty("分摊比例")
+    private String shareProportion; // 分摊比例
+	@ApiModelProperty("分摊返利总额")
+    private String shareRebateTotal; // 分摊返利总额
+	@ApiModelProperty("本次返利余额")
+    private String thisRebateBalance; // 本次返利余额
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("分配状态")
+    private String distributionState; // 分配状态
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVeh.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVeh.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVeh <br/>
+ * Description: 回款返利分配车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配车辆表", description = "回款返利分配车辆表")
+@TableName("scm_collection_rebate_distribution_veh")
+public class ScmCollectionRebateDistributionVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车型sid")
+    private String carModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String carModelName; // 车型名称
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("销售日期")
+    private String salesDate; // 销售日期
+	@ApiModelProperty("回款返利分配sid")
+    private String mainSid; // 回款返利分配sid
+	@ApiModelProperty("分配的回款返利")
+    private String distributionCollectionRebate; // 分配的回款返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDetailsVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
+ * Description: 回款返利分配车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配车辆表 视图数据详情", description = "回款返利分配车辆表 视图数据详情")
+public class ScmCollectionRebateDistributionVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String carModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String carModelName; // 车型名称
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("销售日期")
+    private String salesDate; // 销售日期
+	@ApiModelProperty("回款返利分配sid")
+    private String mainSid; // 回款返利分配sid
+	@ApiModelProperty("分配的回款返利")
+    private String distributionCollectionRebate; // 分配的回款返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehDto.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto <br/>
+ * Description: 回款返利分配车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配车辆表 数据传输对象", description = "回款返利分配车辆表 数据传输对象")
+public class ScmCollectionRebateDistributionVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String carModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String carModelName; // 车型名称
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("销售日期")
+    private String salesDate; // 销售日期
+	@ApiModelProperty("回款返利分配sid")
+    private String mainSid; // 回款返利分配sid
+	@ApiModelProperty("分配的回款返利")
+    private String distributionCollectionRebate; // 分配的回款返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeign <br/>
+ * Description: 回款返利分配车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利分配车辆表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebateDistributionVeh",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebatedistributionveh",
+        fallback = ScmCollectionRebateDistributionVehFeignFallback.class)
+public interface ScmCollectionRebateDistributionVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateDistributionVehVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateDistributionVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateDistributionVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateDistributionVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehFeignFallback <br/>
+ * Description: 回款返利分配车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateDistributionVehFeignFallback implements ScmCollectionRebateDistributionVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateDistributionVehVo>> listPage(PagerQuery<ScmCollectionRebateDistributionVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateDistributionVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateDistributionVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebatedistributionveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehQuery.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehQuery <br/>
+ * Description: 回款返利分配车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配车辆表 查询条件", description = "回款返利分配车辆表 查询条件")
+public class ScmCollectionRebateDistributionVehQuery implements Query {
+
+	@ApiModelProperty("车型sid")
+    private String carModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String carModelName; // 车型名称
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("销售日期")
+    private String salesDate; // 销售日期
+	@ApiModelProperty("回款返利分配sid")
+    private String mainSid; // 回款返利分配sid
+	@ApiModelProperty("分配的回款返利")
+    private String distributionCollectionRebate; // 分配的回款返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistributionveh/ScmCollectionRebateDistributionVehVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利分配) <br/>
+ * File: ScmCollectionRebateDistributionVehVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehVo <br/>
+ * Description: 回款返利分配车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-21 15:14:34 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利分配车辆表 视图数据对象", description = "回款返利分配车辆表 视图数据对象")
+public class ScmCollectionRebateDistributionVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String carModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String carModelName; // 车型名称
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("入库日期")
+    private String priceDate; // 入库日期
+	@ApiModelProperty("销售日期")
+    private String salesDate; // 销售日期
+	@ApiModelProperty("回款返利分配sid")
+    private String mainSid; // 回款返利分配sid
+	@ApiModelProperty("分配的回款返利")
+    private String distributionCollectionRebate; // 分配的回款返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVeh.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVeh.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVeh <br/>
+ * Description: 回款返利车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利车辆表", description = "回款返利车辆表")
+@TableName("scm_collection_rebate_veh")
+public class ScmCollectionRebateVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("回款返利sid")
+    private String mainSid; // 回款返利sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDetailsVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo <br/>
+ * Description: 回款返利车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利车辆表 视图数据详情", description = "回款返利车辆表 视图数据详情")
+public class ScmCollectionRebateVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String mainSid; // 回款返利sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehDto.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto <br/>
+ * Description: 回款返利车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利车辆表 数据传输对象", description = "回款返利车辆表 数据传输对象")
+public class ScmCollectionRebateVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String mainSid; // 回款返利sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeign.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehFeign.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeign <br/>
+ * Description: 回款返利车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利车辆表")
+@FeignClient(
+        contextId = "anrui-scm-ScmCollectionRebateVeh",
+        name = "anrui-scm",
+        path = "v1/scmcollectionrebateveh",
+        fallback = ScmCollectionRebateVehFeignFallback.class)
+public interface ScmCollectionRebateVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<ScmCollectionRebateVehVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody ScmCollectionRebateVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<ScmCollectionRebateVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据车架号查询车辆是否返利过")
+    @GetMapping("/fetchByVehSid/{vinNo}")
+    @ResponseBody
+    ScmCollectionRebateVehDetailsVo fetchByVehSid(@PathVariable("vinNo") String vinNo);
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehFeignFallback.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehFeignFallback <br/>
+ * Description: 回款返利车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class ScmCollectionRebateVehFeignFallback implements ScmCollectionRebateVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<ScmCollectionRebateVehVo>> listPage(PagerQuery<ScmCollectionRebateVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebateveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(ScmCollectionRebateVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebateveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-scm/scmcollectionrebateveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<ScmCollectionRebateVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-scm/scmcollectionrebateveh/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ScmCollectionRebateVehDetailsVo fetchByVehSid(String vinNo) {
+		return null;
+	}
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehQuery.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehQuery <br/>
+ * Description: 回款返利车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利车辆表 查询条件", description = "回款返利车辆表 查询条件")
+public class ScmCollectionRebateVehQuery implements Query {
+
+	@ApiModelProperty("回款返利sid")
+    private String mainSid; // 回款返利sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebateveh/ScmCollectionRebateVehVo.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebateveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利车辆) <br/>
+ * File: ScmCollectionRebateVehVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehVo <br/>
+ * Description: 回款返利车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-19 16:23:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利车辆表 视图数据对象", description = "回款返利车辆表 视图数据对象")
+public class ScmCollectionRebateVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String mainSid; // 回款返利sid
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String costPrice; // 厂家结算价
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java

@@ -61,6 +61,8 @@ public class ScmCollectionRebateWithApplyVo implements Vo {
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")
     private String brandName; // 品牌名称
+    @ApiModelProperty("回款金额")
+    private String withRebateTotal; // 回款金额
     @ApiModelProperty("回款申请标题")
     private String collectionApply; // 回款申请标题
     @ApiModelProperty("创建人姓名")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGression.java

@@ -114,4 +114,7 @@ public class ScmVehicleGression extends BaseEntity {
     private String orgSid;*/
 
 
+    private String orgSidPath;
+
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@@ -37,4 +37,7 @@ public class ScmVehicleReturn extends BaseEntity {
     private String instanceId;
 
     private String procDefId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@@ -42,4 +42,7 @@ public class ScmVehicleReturnDetailsVo implements Vo {
     private String createOrgSid;
     @ApiModelProperty(value = "taskId")
     private String taskId;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@@ -64,4 +64,7 @@ public class ScmVehicleReturnDto implements Dto {
     private String orgName;
     @ApiModelProperty(value = "分公司sid")
     private String createOrgSid;
+
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java

@@ -77,9 +77,7 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody ScmCollectionRebateDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        scmCollectionRebateService.saveOrUpdateDto(dto);
-        return rb.success();
+        return scmCollectionRebateService.saveOrUpdateDto(dto);
     }
 
     @Override
@@ -109,9 +107,7 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid);
-        return rb.success().setData(vo);
+        return scmCollectionRebateService.fetchAllDetailsVoBySid(sid);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@@ -29,6 +29,9 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
+import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -42,6 +45,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -62,6 +66,10 @@ import java.util.List;
  */
 @Service
 public class ScmCollectionRebateService extends MybatisBaseService<ScmCollectionRebateMapper, ScmCollectionRebate> {
+	
+	@Autowired
+	private ScmCollectionRebateVehService scmCollectionRebateVehService;
+	
 	private QueryWrapper<ScmCollectionRebate> createQueryWrapper(ScmCollectionRebateQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -92,23 +100,41 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		return p;
 	}
 	
-	public void saveOrUpdateDto(ScmCollectionRebateDto dto){
+	public ResultBean saveOrUpdateDto(ScmCollectionRebateDto dto){
+		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
+		List<ScmCollectionRebateVehDto> scmCollectionRebateVehs = dto.getScmCollectionRebateVehs();
+		if (StringUtils.isBlank(dtoSid)) {
+			String s = this.insertByDto(dto);
+			if (!scmCollectionRebateVehs.isEmpty()){
+				for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
+					scmCollectionRebateVeh.setMainSid(s);
+					scmCollectionRebateVehService.insertByDto(scmCollectionRebateVeh);
+				}
+			}
+			return rb.success().setMsg("添加成功");
         }
 		ScmCollectionRebate scmCollectionRebate = fetchBySid(dtoSid);
 		if (scmCollectionRebate == null){
-			return;
+			return rb.setMsg("该回款返利不存在");
 		}
 		this.updateByDto(dto);
+		scmCollectionRebateVehService.delByMainSid(dtoSid);
+		if (!scmCollectionRebateVehs.isEmpty()){
+			for (ScmCollectionRebateVehDto scmCollectionRebateVeh : scmCollectionRebateVehs) {
+				scmCollectionRebateVeh.setMainSid(dtoSid);
+				scmCollectionRebateVehService.updateByDto(scmCollectionRebateVeh);
+			}
+		}
+		return rb.success().setMsg("修改成功");
 	}
 	
-	public void insertByDto(ScmCollectionRebateDto dto){
+	public String insertByDto(ScmCollectionRebateDto dto){
 		ScmCollectionRebate entity = new ScmCollectionRebate();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setState(0);
 		baseMapper.insert(entity);
+		return entity.getSid();
 	}
 	
 	public void updateByDto(ScmCollectionRebateDto dto){
@@ -139,6 +165,7 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 	public PagerVo<ScmCollectionRebateVo> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
 		ScmCollectionRebateQuery query = pq.getParams();
 		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		qw.eq("brandSid",query.getBrandSid());
 		if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
 			qw.eq("collectionTypeKey", query.getCollectionTypeKey());
 		}
@@ -230,4 +257,12 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
 		PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
+
+	public ResultBean<ScmCollectionRebateDetailsVo> fetchAllDetailsVoBySid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = fetchDetailsVoBySid(sid);
+		List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(sid);
+		scmCollectionRebateDetailsVo.setScmCollectionRebateVehs(scmCollectionRebateVehDetailsVos);
+		return rb.success().setData(scmCollectionRebateDetailsVo);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCh
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(回款返利) <br/>
@@ -58,4 +59,6 @@ public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper<ScmColle
     List<ScmCollectionrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
 
     List<ScmCollectionrebateCheckapplyVo> selectListVo();
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }