Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -92,6 +92,16 @@ public interface BaseVehicleCertificateFeign {
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BaseVehicleCertificateDetailsVo> details(@PathVariable("sid") String sid);
 
+    /**
+     * 根据车辆sid查看
+     *
+     * @return
+     */
+    @ApiOperation("根据车辆sid查看")
+    @GetMapping("/selStateByVehicleSid/{vehSid}")
+    public ResultBean<BaseVehicleCertificateVo> selStateByVehicleSid(@PathVariable("vehSid") String vehSid);
+
+
     /**
      * @param query
      * @description: 合格证台账列表导出

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -57,6 +57,11 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehicleCertificateVo> selStateByVehicleSid(String vehSid) {
+        return null;
+    }
+
     @Override
     public void exportExcel(BaseVehicleCertificateExportQuery query) {
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateVo.java

@@ -43,6 +43,9 @@ public class BaseVehicleCertificateVo implements Vo {
     @ApiModelProperty("合格证情况Value值（陕汽必须字段）")
     private String certificateSituationValue;
 
+    @ApiModelProperty("合格证状态key")
+    private String certificateState;
+
     @ApiModelProperty("合格证状态value")
     private String certificateStateValue;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -233,6 +233,13 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         return rb.success().setData(baseVehicleCertificateVo);
     }
 
+    @Override
+    public ResultBean<BaseVehicleCertificateVo> selStateByVehicleSid(String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateService.selStateByVehicleSid(vehSid);
+        return rb.success().setData(baseVehicleCertificateVo);
+    }
+
     @Override
     public void exportExcel(BaseVehicleCertificateExportQuery query) {
         //得到所有要导出的数据

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVeh.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVeh.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh <br/>
+ * Description: 销售订单退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单退库车辆表", description = "销售订单退库车辆表")
+@TableName("bus_sales_order_return_veh")
+public class BusSalesOrderReturnVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车身颜色key")
+    private String carColorKey; // 车身颜色key
+	@ApiModelProperty("车身颜色value")
+    private String carColorValue; // 车身颜色value
+	@ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+	@ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+	@ApiModelProperty("开票状态key")
+    private String invoicingStateKey; // 开票状态key
+	@ApiModelProperty("开票状态value")
+    private String invoicingStateValue; // 开票状态value
+	@ApiModelProperty("投保状态key")
+    private String insureStateKey; // 投保状态key
+	@ApiModelProperty("投保状态value")
+    private String insureStateValue; // 投保状态value
+	@ApiModelProperty("库存状态key")
+    private String stockStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String stockStateValue; // 库存状态value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo <br/>
+ * Description: 销售订单退库车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单退库车辆表 视图数据详情", description = "销售订单退库车辆表 视图数据详情")
+public class BusSalesOrderReturnVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车身颜色key")
+    private String carColorKey; // 车身颜色key
+	@ApiModelProperty("车身颜色value")
+    private String carColorValue; // 车身颜色value
+	@ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+	@ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+	@ApiModelProperty("开票状态key")
+    private String invoicingStateKey; // 开票状态key
+	@ApiModelProperty("开票状态value")
+    private String invoicingStateValue; // 开票状态value
+	@ApiModelProperty("投保状态key")
+    private String insureStateKey; // 投保状态key
+	@ApiModelProperty("投保状态value")
+    private String insureStateValue; // 投保状态value
+    @ApiModelProperty("库存状态key")
+    private String stockStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String stockStateValue; // 库存状态value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehDto.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto <br/>
+ * Description: 销售订单退库车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单退库车辆表 数据传输对象", description = "销售订单退库车辆表 数据传输对象")
+public class BusSalesOrderReturnVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车身颜色key")
+    private String carColorKey; // 车身颜色key
+	@ApiModelProperty("车身颜色value")
+    private String carColorValue; // 车身颜色value
+	@ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+	@ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+	@ApiModelProperty("开票状态key")
+    private String invoicingStateKey; // 开票状态key
+	@ApiModelProperty("开票状态value")
+    private String invoicingStateValue; // 开票状态value
+	@ApiModelProperty("投保状态key")
+    private String insureStateKey; // 投保状态key
+	@ApiModelProperty("投保状态value")
+    private String insureStateValue; // 投保状态value
+    @ApiModelProperty("库存状态key")
+    private String stockStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String stockStateValue; // 库存状态value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+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_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehFeign <br/>
+ * Description: 销售订单退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单退库车辆表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSalesOrderReturnVeh",
+        name = "anrui-buscenter",
+        path = "v1/bussalesorderreturnveh",
+        fallback = BusSalesOrderReturnVehFeignFallback.class)
+public interface BusSalesOrderReturnVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusSalesOrderReturnVehVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BusSalesOrderReturnVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderReturnVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+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_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehFeignFallback <br/>
+ * Description: 销售订单退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusSalesOrderReturnVehFeignFallback implements BusSalesOrderReturnVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusSalesOrderReturnVehVo>> listPage(PagerQuery<BusSalesOrderReturnVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_buscenter/bussalesorderreturnveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusSalesOrderReturnVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui_buscenter/bussalesorderreturnveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui_buscenter/bussalesorderreturnveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusSalesOrderReturnVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_buscenter/bussalesorderreturnveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehQuery.java

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehQuery <br/>
+ * Description: 销售订单退库车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单退库车辆表 查询条件", description = "销售订单退库车辆表 查询条件")
+public class BusSalesOrderReturnVehQuery implements Query {
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车身颜色key")
+    private String carColorKey; // 车身颜色key
+	@ApiModelProperty("车身颜色value")
+    private String carColorValue; // 车身颜色value
+	@ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+	@ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+	@ApiModelProperty("开票状态key")
+    private String invoicingStateKey; // 开票状态key
+	@ApiModelProperty("开票状态value")
+    private String invoicingStateValue; // 开票状态value
+	@ApiModelProperty("投保状态key")
+    private String insureStateKey; // 投保状态key
+	@ApiModelProperty("投保状态value")
+    private String insureStateValue; // 投保状态value
+    @ApiModelProperty("库存状态key")
+    private String stockStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String stockStateValue; // 库存状态value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnveh/BusSalesOrderReturnVehVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo <br/>
+ * Description: 销售订单退库车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单退库车辆表 视图数据对象", description = "销售订单退库车辆表 视图数据对象")
+public class BusSalesOrderReturnVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("主表sid")
+    private String mainSid; // 主表sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车身颜色key")
+    private String carColorKey; // 车身颜色key
+	@ApiModelProperty("车身颜色value")
+    private String carColorValue; // 车身颜色value
+	@ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+	@ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+	@ApiModelProperty("开票状态key")
+    private String invoicingStateKey; // 开票状态key
+	@ApiModelProperty("开票状态value")
+    private String invoicingStateValue; // 开票状态value
+	@ApiModelProperty("投保状态key")
+    private String insureStateKey; // 投保状态key
+	@ApiModelProperty("投保状态value")
+    private String insureStateValue; // 投保状态value
+    @ApiModelProperty("库存状态key")
+    private String stockStateKey; // 库存状态key
+	@ApiModelProperty("库存状态value")
+    private String stockStateValue; // 库存状态value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApply.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApply.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApply <br/>
+ * Description: 销售订单车辆退库申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单车辆退库申请", description = "销售订单车辆退库申请")
+@TableName("bus_sales_order_return_veh_apply")
+public class BusSalesOrderReturnVehApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("申请人姓名")
+    private String createByName; // 申请人姓名
+	@ApiModelProperty("销售类型key")
+    private String saleTypeKey; // 销售类型key
+	@ApiModelProperty("销售类型value")
+    private String saleTypeValue; // 销售类型value
+	@ApiModelProperty("成交价")
+    private String salePrice; // 成交价
+	@ApiModelProperty("收款情况")
+    private String collection; // 收款情况
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户编码")
+    private String customerNo; // 客户编码
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+	@ApiModelProperty("订单台数")
+    private String orderNum; // 订单台数
+	@ApiModelProperty("终止台数")
+    private String stopNum; // 终止台数
+	@ApiModelProperty("终止原因")
+    private String stopRemarks; // 终止原因
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("环节定义id")
+    private String nodeSid; // 环节定义id
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务编号id")
+    private String taskId; // 任务编号id
+	@ApiModelProperty("组织机构全路径sid")
+    private String orgSidPath; // 组织机构全路径sid
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDetailsVo.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo <br/>
+ * Description: 销售订单车辆退库申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单车辆退库申请 视图数据详情", description = "销售订单车辆退库申请 视图数据详情")
+public class BusSalesOrderReturnVehApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+	@ApiModelProperty("申请人姓名")
+    private String createByName; // 申请人姓名
+	@ApiModelProperty("销售类型key")
+    private String saleTypeKey; // 销售类型key
+	@ApiModelProperty("销售类型value")
+    private String saleTypeValue; // 销售类型value
+	@ApiModelProperty("成交价")
+    private String salePrice; // 成交价
+	@ApiModelProperty("收款情况")
+    private String collection; // 收款情况
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户编码")
+    private String customerNo; // 客户编码
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+	@ApiModelProperty("订单台数")
+    private String orderNum; // 订单台数
+	@ApiModelProperty("终止原因")
+    private String stopRemarks; // 终止原因
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务编号id")
+    private String taskId; // 任务编号id
+	@ApiModelProperty("组织机构全路径sid")
+    private String orgSidPath; // 组织机构全路径sid
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+    @ApiModelProperty("退库车辆列表")
+    private List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehs;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyDto.java

@@ -0,0 +1,114 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto;
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto <br/>
+ * Description: 销售订单车辆退库申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单车辆退库申请 数据传输对象", description = "销售订单车辆退库申请 数据传输对象")
+public class BusSalesOrderReturnVehApplyDto implements Dto {
+
+    private String sid; // sid
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
+	@ApiModelProperty("申请人姓名")
+    private String createByName; // 申请人姓名
+	@ApiModelProperty("销售类型key")
+    private String saleTypeKey; // 销售类型key
+	@ApiModelProperty("销售类型value")
+    private String saleTypeValue; // 销售类型value
+	@ApiModelProperty("成交价")
+    private String salePrice; // 成交价
+	@ApiModelProperty("收款情况")
+    private String collection; // 收款情况
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户编码")
+    private String customerNo; // 客户编码
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+	@ApiModelProperty("订单台数")
+    private String orderNum; // 订单台数
+	@ApiModelProperty("终止台数")
+    private String stopNum; // 终止台数
+	@ApiModelProperty("终止原因")
+    private String stopRemarks; // 终止原因
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("环节定义id")
+    private String nodeSid; // 环节定义id
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务编号id")
+    private String taskId; // 任务编号id
+    @ApiModelProperty("组织机构全路径sid")
+    private String orgPath; // 组织机构全路径sid
+	@ApiModelProperty("组织机构全路径sid")
+    private String orgSidPath; // 组织机构全路径sid
+	@ApiModelProperty("申请编号")
+    private String applyNo; // 申请编号
+    @ApiModelProperty("退车车辆列表")
+    private List<BusSalesOrderReturnVehDto> busSalesOrderReturnVehs;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
+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.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign <br/>
+ * Description: 销售订单车辆退库申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单车辆退库申请")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSalesOrderReturnVehApply",
+        name = "anrui-buscenter",
+        path = "v1/bussalesorderreturnvehapply",
+        fallback = BusSalesOrderReturnVehApplyFeignFallback.class)
+public interface BusSalesOrderReturnVehApplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusSalesOrderReturnVehApplyVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("销售订单退车回显")
+    @GetMapping("/fetchDetailsByOrderSid/{orderSid}")
+    @ResponseBody
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
+
+    /***********************************************流程************************************************/
+
+    @ApiOperation("提交排产申请审批流程")
+    @PostMapping("/submitVehicleApply")
+    public ResultBean submitVehicleApply(@Valid @RequestBody SubmitBusSalesOrderReturnVehApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody BusSalesOrderReturnVehApplyCompleteDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BusSalesOrderReturnVehApplyTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BusSalesOrderReturnVehApplyTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BusSalesOrderReturnVehApplyTaskQuery query);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
+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_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeignFallback <br/>
+ * Description: 销售订单车辆退库申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusSalesOrderReturnVehApplyFeignFallback implements BusSalesOrderReturnVehApplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusSalesOrderReturnVehApplyVo>> listPage(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_buscenter/bussalesorderreturnvehapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusSalesOrderReturnVehApplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui_buscenter/bussalesorderreturnvehapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui_buscenter/bussalesorderreturnvehapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui_buscenter/bussalesorderreturnvehapply/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return null;
+	}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyQuery.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery <br/>
+ * Description: 销售订单车辆退库申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单车辆退库申请 查询条件", description = "销售订单车辆退库申请 查询条件")
+public class BusSalesOrderReturnVehApplyQuery implements Query {
+
+    @ApiModelProperty("申请开始日期")
+    private String createStartTime; // 申请开始日期
+    @ApiModelProperty("申请结束日期")
+    private String createEndTime; // 申请结束日期
+    @ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+    @ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+	@ApiModelProperty("流程定义id")
+    private String procDefId; // 流程定义id
+	@ApiModelProperty("环节定义id")
+    private String nodeSid; // 环节定义id
+	@ApiModelProperty("流程实例id")
+    private String procInstId; // 流程实例id
+	@ApiModelProperty("任务编号id")
+    private String taskId; // 任务编号id
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo <br/>
+ * Description: 销售订单车辆退库申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单车辆退库申请 视图数据对象", description = "销售订单车辆退库申请 视图数据对象")
+public class BusSalesOrderReturnVehApplyVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 申请日期
+	@ApiModelProperty("申请人姓名")
+    private String createByName; // 申请人姓名
+	@ApiModelProperty("合同编号")
+    private String contractNo; // 合同编号
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("车型小名")
+    private String modelName; // 车型小名
+	@ApiModelProperty("订单台数")
+    private String orderNum; // 订单台数
+	@ApiModelProperty("终止台数")
+    private String stopNum; // 终止台数
+	@ApiModelProperty("终止原因")
+    private String stopRemarks; // 终止原因
+	@ApiModelProperty("节点状态")
+    private String nodeState; // 节点状态
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/flow/BusSalesOrderReturnVehApplyCompleteDto.java

@@ -0,0 +1,40 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class BusSalesOrderReturnVehApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
+    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;
+
+    private String orgPath;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/flow/BusSalesOrderReturnVehApplyTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.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 BusSalesOrderReturnVehApplyTaskQuery 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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/flow/GetNodeQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+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")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/flow/GetNodeVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/flow/SubmitBusSalesOrderReturnVehApplyDto.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow;
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitBusSalesOrderReturnVehApplyDto extends BusSalesOrderReturnVehApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    /*@ApiModelProperty("意见")
+    private String comment;*/
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+   /* @ApiModelProperty("业务sid")
+    private String businessSid;
+    @ApiModelProperty("流程定义id")
+    private String modelId;
+    @ApiModelProperty("下一环节的代办人sid")
+    private String nextNodeUserSids;*/
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -92,18 +92,18 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
 
-//    @Transactional(rollbackFor = Exception.class)
+    //    @Transactional(rollbackFor = Exception.class)
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
         ResultBean<List<BusHandoverListVo>> rb = ResultBean.fireFail();
         //ToDo:验证是否包含已存在的车辆
         String contractNo = dto.getContractNo();
         List<BusHanItemDto> vinList = dto.getVinList();
-        if(vinList.size() == 0){
+        if (vinList.size() == 0) {
             return rb.setMsg("请选择车辆");
         }
         List<String> vinSidList = vinList.stream().map(v -> v.getVinSid()).collect(Collectors.toList());
-        int count = baseMapper.selectByCount(contractNo,vinSidList);
-        if(count>0){
+        int count = baseMapper.selectByCount(contractNo, vinSidList);
+        if (count > 0) {
             return rb.setMsg("选择的车辆包含已存在交车确认记录的数据");
         }
         BusHandover busHandover = new BusHandover();
@@ -441,7 +441,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         if (staffinfoDetailsVo != null) {
             map.put("apply", staffinfoDetailsVo.getName());
         }
-        map.put("contract",busHandover.getContractNo());
+        map.put("contract", busHandover.getContractNo());
         map.put("orgName", commonContract.getPartyA());
         map.put("name", busHandover.getCustomerName());
         List<BusItemVo> list = busHandoverItemsService.getList(sid);
@@ -498,7 +498,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 List<DownloadVo> stringList = new ArrayList<>();
                 DownloadVo vo = new DownloadVo();
                 BuscenterFile buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.RECEIVE_CAR.getAttachType());
-                if(buscenterFile != null){
+                if (buscenterFile != null) {
                     vo.setName(buscenterFile.getFileName());
                     vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                     stringList.add(vo);
@@ -506,7 +506,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 
                 vo = new DownloadVo();
                 buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST_CONFIRM.getAttachType());
-                if(buscenterFile != null){
+                if (buscenterFile != null) {
                     vo.setName(buscenterFile.getFileName());
                     vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                     stringList.add(vo);
@@ -515,7 +515,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 if (!record.getCustomerName().equals(record.getRecipient())) {
                     vo = new DownloadVo();
                     buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST.getAttachType());
-                    if(buscenterFile != null){
+                    if (buscenterFile != null) {
                         vo.setName(buscenterFile.getFileName());
                         vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                         stringList.add(vo);
@@ -524,7 +524,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 
                 vo = new DownloadVo();
                 buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.EXIT_TICKET.getAttachType());
-                if(buscenterFile != null){
+                if (buscenterFile != null) {
                     vo.setName(buscenterFile.getFileName());
                     vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                     stringList.add(vo);
@@ -717,6 +717,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         }
         return rb.success().setData(vo);
     }
+
+    public int selectByCount(String contractId, List<String> vinSids) {
+        return baseMapper.selectByCount(contractId, vinSids);
+    }
 	/*@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -55,6 +55,7 @@
                    when 0 then '否'
                    when 1 then '是' end                as insuranceInfo,
 <!--               if(bo.nodeState = '已办结', true, false)  as showContractBtn,-->
+               if(bo.nodeState = '已办结', true, false)  as showStopBtn,
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
                0                                      as showFinancialBtn,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -102,6 +102,7 @@ import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
+import com.yxt.anrui.buscenter.biz.bushandover.BusHandoverService;
 import com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
@@ -252,7 +253,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedDetailedFeign;
-
+    @Autowired
+    private BusHandoverService busHandoverService;
 
     /**
      * 构造查询条件
@@ -1476,7 +1478,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if(commonContractVoResultBean.getData() != null){
                 record.setContractId(commonContractVoResultBean.getData().getContractNo());
             }
-            record.setShowStopBtn(false);
+            AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData();
+            List<VinListsVo> vinListsVos = appOrderDetailsVo.getModelInfo().getVinListsVos();
+            List<String> vinSids = new ArrayList<>();
+            for (VinListsVo vinListsVo : vinListsVos){
+                vinSids.add(vinListsVo.getVinSid());
+            }
+            int i = busHandoverService.selectByCount(record.getContractId(), vinSids);
+            if (record.isShowStopBtn() && i < vinSids.size()){
+                record.setShowStopBtn(true);
+            }else {
+                record.setShowStopBtn(false);
+            }
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
                 record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnveh/BusSalesOrderReturnVehMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnveh;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehMapper <br/>
+ * Description: 销售订单退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusSalesOrderReturnVehMapper extends BaseMapper<BusSalesOrderReturnVeh> {
+
+	//@Update("update bus_sales_order_return_veh set name=#{msg} where id=#{id}")
+	//IPage<BusSalesOrderReturnVehVo> voPage(IPage<BusSalesOrderReturnVeh> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderReturnVeh> qw);
+
+	IPage<BusSalesOrderReturnVehVo> selectPageVo(IPage<BusSalesOrderReturnVeh> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderReturnVeh> qw);
+
+	List<BusSalesOrderReturnVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderReturnVeh> qw);
+
+	@Select("select * from bus_sales_order_return_veh")
+	List<BusSalesOrderReturnVehVo> selectListVo();
+
+	@Delete("delete from bus_sales_order_return_veh where mainSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select * from bus_sales_order_return_veh where mainSid = #{sid}")
+	List<BusSalesOrderReturnVehDetailsVo> fetchByMainSid(String sid);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnveh/BusSalesOrderReturnVehMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo">
+		SELECT * FROM bus_sales_order_return_veh <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo">
+		SELECT * FROM bus_sales_order_return_veh <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnveh/BusSalesOrderReturnVehRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehFeign;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehRest <br/>
+ * Description: 销售订单退库车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单退库车辆表")
+@RestController("com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehRest")
+@RequestMapping("v1/bussalesorderreturnveh")
+public class BusSalesOrderReturnVehRest implements BusSalesOrderReturnVehFeign {
+
+	@Autowired
+	private BusSalesOrderReturnVehService busSalesOrderReturnVehService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusSalesOrderReturnVehVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusSalesOrderReturnVehVo> pv = busSalesOrderReturnVehService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusSalesOrderReturnVehDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busSalesOrderReturnVehService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busSalesOrderReturnVehService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BusSalesOrderReturnVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusSalesOrderReturnVehDetailsVo vo = busSalesOrderReturnVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnveh/BusSalesOrderReturnVehService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnveh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService <br/>
+ * Description: 销售订单退库车辆表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusSalesOrderReturnVehService extends MybatisBaseService<BusSalesOrderReturnVehMapper, BusSalesOrderReturnVeh> {
+	private QueryWrapper<BusSalesOrderReturnVeh> createQueryWrapper(BusSalesOrderReturnVehQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusSalesOrderReturnVeh> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BusSalesOrderReturnVehVo> listPageVo(PagerQuery<BusSalesOrderReturnVehQuery> pq) {
+		BusSalesOrderReturnVehQuery query = pq.getParams();
+		QueryWrapper<BusSalesOrderReturnVeh> qw = createQueryWrapper(query);
+		IPage<BusSalesOrderReturnVeh> page = PagerUtil.queryToPage(pq);
+		IPage<BusSalesOrderReturnVehVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusSalesOrderReturnVehVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BusSalesOrderReturnVehDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BusSalesOrderReturnVehDto dto){
+		BusSalesOrderReturnVeh entity = new BusSalesOrderReturnVeh();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BusSalesOrderReturnVehDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BusSalesOrderReturnVeh entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BusSalesOrderReturnVehDetailsVo fetchDetailsVoBySid(String sid){
+		BusSalesOrderReturnVeh entity = fetchBySid(sid);
+		BusSalesOrderReturnVehDetailsVo vo = new BusSalesOrderReturnVehDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public List<BusSalesOrderReturnVehDetailsVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApply;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyMapper <br/>
+ * Description: 销售订单车辆退库申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusSalesOrderReturnVehApplyMapper extends BaseMapper<BusSalesOrderReturnVehApply> {
+
+	//@Update("update bus_sales_order_return_veh_apply set name=#{msg} where id=#{id}")
+	//IPage<BusSalesOrderReturnVehApplyVo> voPage(IPage<BusSalesOrderReturnVehApply> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderReturnVehApply> qw);
+	
+	IPage<BusSalesOrderReturnVehApplyVo> selectPageVo(IPage<BusSalesOrderReturnVehApply> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderReturnVehApply> qw);
+	
+	List<BusSalesOrderReturnVehApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderReturnVehApply> qw);
+	
+	@Select("select * from bus_sales_order_return_veh_apply")
+	List<BusSalesOrderReturnVehApplyVo> selectListVo();
+
+    int selectBySid(String join);
+
+	@Select("select count(*) from bus_sales_order_return_veh_apply where contractNo = #{contractNo}")
+	int selectByContractNo(String contractNo);
+
+	int updateFlowFiled(Map<String, Object> map);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
+		SELECT * FROM bus_sales_order_return_veh_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo">
+		SELECT * FROM bus_sales_order_return_veh_apply <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM bus_sales_order_return_veh_apply
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
+
+	<update id="updateFlowFiled">
+		UPDATE bus_sales_order_return_veh_apply
+		SET nodeState=#{nodeState}
+		, nodeSid=#{taskDefKey}
+		<if test="procDefId != null and procDefId != ''">
+			, procDefId=#{procDefId}
+		</if>
+		<if test="procInsId != null and procInsId != ''">
+			, procInstId=#{procInsId}
+		</if>
+		<if test="taskId != null and taskId != ''">
+			, taskId=#{taskId}
+		</if>
+		WHERE sid = #{sid}
+	</update>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java

@@ -0,0 +1,141 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.*;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyRest <br/>
+ * Description: 销售订单车辆退库申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单车辆退库申请")
+@RestController("com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyRest")
+@RequestMapping("v1/bussalesorderreturnvehapply")
+public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehApplyFeign {
+
+	@Autowired
+	private BusSalesOrderReturnVehApplyService busSalesOrderReturnVehApplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusSalesOrderReturnVehApplyVo>> listPage(@RequestBody PagerQuery<BusSalesOrderReturnVehApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusSalesOrderReturnVehApplyVo> pv = busSalesOrderReturnVehApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusSalesOrderReturnVehApplyDto dto){
+		return busSalesOrderReturnVehApplyService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return busSalesOrderReturnVehApplyService.delAll(sids);
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return busSalesOrderReturnVehApplyService.fetchDetailsVoBySid(sid);
+	}
+
+	@Override
+	public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+		return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid);
+	}
+
+	@Override
+	public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
+		return busSalesOrderReturnVehApplyService.submitVehicleApply(dto);
+	}
+
+	@Override
+	public ResultBean complete(BusSalesOrderReturnVehApplyCompleteDto query) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
+		return busSalesOrderReturnVehApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+		return busSalesOrderReturnVehApplyService.getPreviousNodesForReject(query);
+	}
+
+	@Override
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		return busSalesOrderReturnVehApplyService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return busSalesOrderReturnVehApplyService.taskReject(query);
+	}
+
+	@Override
+	public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return busSalesOrderReturnVehApplyService.revokeProcess(query);
+	}
+
+	@Override
+	public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+		return busSalesOrderReturnVehApplyService.breakProcess(query);
+	}
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -0,0 +1,625 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.BusSalesOrderReturnVehApplyTaskQuery;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVeh;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDto;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApply;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyQuery;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDto;
+import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyFeign;
+
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui_buscenter(销售订单退车) <br/>
+ * File: BusSalesOrderReturnVehApplyService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyService <br/>
+ * Description: 销售订单车辆退库申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-03-09 14:26:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSalesOrderReturnVehApplyMapper, BusSalesOrderReturnVehApply> {
+
+    @Autowired
+    private BusSalesOrderReturnVehService busSalesOrderReturnVehService;
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BaseModelConfigFeign baseModelConfigFeign;
+    @Autowired
+    private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Resource
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Resource
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private MessageFeign messageFeign;
+
+    public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
+        BusSalesOrderReturnVehApplyQuery query = pq.getParams();
+        QueryWrapper<BusSalesOrderReturnVehApply> qw = new QueryWrapper<>();
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
+        if (StringUtils.isNotBlank(query.getContractNo())) {
+            qw.like("contractNo", query.getContractNo());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName", query.getCustomerName());
+        }
+        IPage<BusSalesOrderReturnVehApply> page = PagerUtil.queryToPage(pq);
+        IPage<BusSalesOrderReturnVehApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (BusSalesOrderReturnVehApplyVo record : pagging.getRecords()) {
+            List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(record.getSid());
+            record.setStopNum(String.valueOf(busSalesOrderReturnVehDetailsVos.size()));
+        }
+        PagerVo<BusSalesOrderReturnVehApplyVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(BusSalesOrderReturnVehApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<BusSalesOrderReturnVehDto> busSalesOrderReturnVehs = dto.getBusSalesOrderReturnVehs();
+        if (StringUtils.isBlank(dtoSid)) {
+            String contractNo = dto.getContractNo();
+            int i = baseMapper.selectByContractNo(contractNo);
+            if (i > 0) {
+                return rb.setMsg("已存在当前订单的退车申请");
+            }
+            String mainSid = this.insertByDto(dto);
+            for (BusSalesOrderReturnVehDto busSalesOrderReturnVeh : busSalesOrderReturnVehs) {
+                busSalesOrderReturnVeh.setMainSid(mainSid);
+                busSalesOrderReturnVehService.saveOrUpdateDto(busSalesOrderReturnVeh);
+            }
+            return rb.success();
+        }
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dtoSid);
+        if (busSalesOrderReturnVehApply == null) {
+            return rb.setMsg("该申请单不存在");
+        }
+        this.updateByDto(dto);
+        busSalesOrderReturnVehService.delByMainSid(dtoSid);
+        for (BusSalesOrderReturnVehDto busSalesOrderReturnVeh : busSalesOrderReturnVehs) {
+            busSalesOrderReturnVeh.setMainSid(dtoSid);
+            BusSalesOrderReturnVeh e = new BusSalesOrderReturnVeh();
+            BeanUtil.copyProperties(busSalesOrderReturnVeh, e);
+            busSalesOrderReturnVehService.save(e);
+        }
+        return rb.success();
+    }
+
+    public String insertByDto(BusSalesOrderReturnVehApplyDto dto) {
+        BusSalesOrderReturnVehApply entity = new BusSalesOrderReturnVehApply();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        entity.setNodeState("待提交");
+        baseMapper.insert(entity);
+        return entity.getSid();
+    }
+
+    public void updateByDto(BusSalesOrderReturnVehApplyDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BusSalesOrderReturnVehApply entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsVoBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderReturnVehApply entity = fetchBySid(sid);
+        BusSalesOrderReturnVehApplyDetailsVo vo = new BusSalesOrderReturnVehApplyDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(sid);
+        vo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVos);
+        return rb.success().setData(vo);
+    }
+
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(String orderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderReturnVehApplyDetailsVo busSalesOrderReturnVehApplyDetailsVo = new BusSalesOrderReturnVehApplyDetailsVo();
+        AppOrderDetailsVo appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(orderSid).getData();
+        busSalesOrderReturnVehApplyDetailsVo.setContractNo(appOrderDetailsVo.getContractId());
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerName(appOrderDetailsVo.getName());
+        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()).getData();
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerNo(crmCustomerTempVo.getCustomerNo());
+        busSalesOrderReturnVehApplyDetailsVo.setSaleTypeKey(appOrderDetailsVo.getPayTypeKey());
+        busSalesOrderReturnVehApplyDetailsVo.setSaleTypeValue(appOrderDetailsVo.getPayType());
+        AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
+        busSalesOrderReturnVehApplyDetailsVo.setModelSid(modelInfo.getModelSid());
+        busSalesOrderReturnVehApplyDetailsVo.setModelName(modelInfo.getModelName());
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        busSalesOrderReturnVehApplyDetailsVo.setOrderNum(priceInfo.getNumber());
+        busSalesOrderReturnVehApplyDetailsVo.setSalePrice(priceInfo.getSingleFinalPrice());
+        List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByContractNo(appOrderDetailsVo.getContractId()).getData();
+        List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetaileds = finUncollectedReceivablesDetailedFeign.fetchByContractNo(appOrderDetailsVo.getContractId()).getData();
+        BigDecimal djys = new BigDecimal(0);
+        BigDecimal djss = new BigDecimal(0);
+        BigDecimal ckys = new BigDecimal(0);
+        BigDecimal ckss = new BigDecimal(0);
+        for (FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed : finUncollectedReceivablesDetaileds) {
+            if ("订金".equals(finUncollectedReceivablesDetailed.getReceivablesName())) {
+                djys = djys.add(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+            } else if ("车款".equals(finUncollectedReceivablesDetailed.getReceivablesName())) {
+                ckys = ckys.add(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+            }
+        }
+        for (FinSelectedReceivablesDetailed finSelectedReceivablesDetailed : finSelectedReceivablesDetaileds) {
+            if ("订金".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                djss = djss.add(finSelectedReceivablesDetailed.getSubscriptionMoney());
+            } else if ("车款".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                ckss = ckss.add(finSelectedReceivablesDetailed.getSubscriptionMoney());
+            }
+        }
+        StringBuilder collection = new StringBuilder();
+        collection.append("订金").append(":").append("应收").append(djys).append("实收").append(djss).append(" ").append("车款").append(":").append("应收").append(ckys).append("实收").append(ckss);
+        busSalesOrderReturnVehApplyDetailsVo.setCollection(collection.toString());
+        List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVoArrayList = new ArrayList<BusSalesOrderReturnVehDetailsVo>();
+        List<VinListsVo> vinListsVos = modelInfo.getVinListsVos();
+        BaseModelConfigSelectVo baseModelConfigSelectVo = baseModelConfigFeign.details(modelInfo.getConfigSid()).getData();
+        for (VinListsVo vinListsVo : vinListsVos) {
+            BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
+            String vinSid = vinListsVo.getVinSid();
+            BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+            busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+            busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+            busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+            busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+            busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+            busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+            busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
+            busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
+            busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
+            busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
+            busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+            busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
+            busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
+        }
+        busSalesOrderReturnVehApplyDetailsVo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
+        return rb.success().setData(busSalesOrderReturnVehApplyDetailsVo);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
+        delBySids(sids);
+        for (String sid : sids) {
+            busSalesOrderReturnVehService.delByMainSid(sid);
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //用户的组织全路径
+        String orgSidPath = "";
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
+            orgSidPath = dto.getOrgPath();
+        } else {
+            //根据用户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();
+        }
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, busSalesOrderReturnVehApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        dto.setOrgSidPath(orgSidPath);
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(busSalesOrderReturnVehApply.getTaskId());
+            bv.setTaskDefKey(busSalesOrderReturnVehApply.getNodeSid());
+            bv.setComment("重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitBusSalesOrderReturnVehApplyDto dto, BusSalesOrderReturnVehApply busSalesOrderReturnVehApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (busSalesOrderReturnVehApply != null) {
+                String businessTaskId = busSalesOrderReturnVehApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    /**
+     * 更新流程相关的状态
+     *
+     * @param map
+     * @return
+     */
+    private int updateFlowFiled(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
+
+    /**
+     * 办理
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = bv.getBusinessSid();
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(businessSid);
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        bv.setFormVariables(variables);
+        bv.setOrgSidPath(busSalesOrderReturnVehApply.getOrgSidPath());
+        if (bv.getTaskId().equals(busSalesOrderReturnVehApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = resultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+
+    }
+
+    /**
+     * 获取上一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        bv.setFormVariables(variables);
+        bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    /**
+     * 获取下一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        bv.setFormVariables(variables);
+        bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    /**
+     * 驳回任务
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean taskReject(BusSalesOrderReturnVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        String businessSid = query.getBusinessSid();
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(businessSid);
+        if (busSalesOrderReturnVehApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = busSalesOrderReturnVehApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                if (StringUtils.isBlank(query.getComment())) {
+                    return rb.setMsg("请填写意见");
+                }
+                if (StringUtils.isBlank(query.getUserSid())) {
+                    return rb.setMsg("参数错误：userSid");
+                }
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String, Object> variables = new HashMap<>();
+                Map<String, Object> appMap = new HashMap<>();
+                appMap.put("sid", businessSid);
+                variables.put("app", appMap);
+                flowTaskVo.setValues(variables);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                Map<String, Object> map = BeanUtil.beanToMap(ufVo);
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                //极光推送
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                String procId = busSalesOrderReturnVehApply.getProcInstId();
+                messageFlowVo.setProcInsId(procId);
+                messageFlowVo.setProcDefId(busSalesOrderReturnVehApply.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap(appMap);
+                messageFlowableQuery.setBusinessSid(businessSid);
+                messageFlowableQuery.setModuleName("销售订单退车申请");
+                ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
+                String nextName = listResultBean.getData().get(0).getName_();
+                String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
+                List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
+//                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
+                if ("发起申请".equals(nextName)) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(busSalesOrderReturnVehApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+                messageFlowableQuery.setMsgTitle("销售订单退车申请");
+                messageFeign.pushMessage(messageFlowableQuery);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+
+    }
+
+    /**
+     * 撤回
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean revokeProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询排产申请
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = busSalesOrderReturnVehApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    /**
+     * 终止流程
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean breakProcess(BusSalesOrderReturnVehApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        if (StringUtils.isBlank(query.getComment())) {
+            return rb.setMsg("请填写意见");
+        }
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = busSalesOrderReturnVehApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+}

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

@@ -32,6 +32,9 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * Project: anrui-fin(销售相关) <br/>
@@ -61,4 +64,8 @@ public interface FinSelectedReceivablesDetailedFeign {
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
     public ResultBean update(@RequestBody FinSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid);
+
+    @ApiOperation("根据合同编号查询")
+    @PostMapping("/fetchByContractNo")
+    public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(@RequestParam("contractNo") String contractNo);
 }

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

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinSelectedReceivablesDetailedFeignFallback.java <br/>
@@ -54,4 +56,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
 		return ResultBean.fireFail().setMsg("接口anrui-fin/finselectedreceivablesdetailed/update无法访问");
 	}
 
+	@Override
+	public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(String contractNo) {
+		return null;
+	}
+
 }

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

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -96,4 +97,7 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @GetMapping("/selectByContractNo")
     ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(@RequestParam("contractNo") String contractNo);
 
+    @ApiOperation("根据合同编号查询")
+    @PostMapping("/fetchByContractNo")
+    public ResultBean<List<FinUncollectedReceivablesDetailed>> fetchByContractNo(@RequestParam("contractId") String contractId);
 }

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

@@ -100,4 +100,10 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 	public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<FinUncollectedReceivablesDetailed>> fetchByContractNo(String contractId) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -118,4 +118,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     List<FinSelectedReceivablesDetailedVo> selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
 
     FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
+
+    @Select("select * from fin_selected_receivables_detailed where contractNo = #{contractNo}")
+    List<FinSelectedReceivablesDetailed> fetchByContractNo(String contractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -219,4 +219,5 @@
           and customerPhone = #{customerPhone}
           and length(VIN) = 0
     </select>
+
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.common.core.result.ResultBean;
@@ -33,6 +34,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(销售相关) <br/>
  * File: FinSelectedReceivablesDetailedFeignFallback.java <br/>
@@ -71,4 +74,9 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
 		finSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid);
 		return rb.success();
 	}
+
+	@Override
+	public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(String contractNo) {
+		return finSelectedReceivablesDetailedService.fetchByContractNo(contractNo);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollected
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -249,4 +250,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) {
         return baseMapper.fetchByAuditStateV(sid, i, type,customerName,customerPhone);
     }
+
+    public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(String contractNo) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = baseMapper.fetchByContractNo(contractNo);
+        return rb.success().setData(finSelectedReceivablesDetaileds);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -83,4 +83,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     AppCustomerBillDetailVo selectBySid(@Param("paymentSid") String paymentSid);
 
     List<FinUncollectedReceivablesDetailed> selectByContractNo(String contractNo);
+
+    @Select("select * from fin_uncollected_receivables_detailed where contractNo = #{contractId}")
+    List<FinUncollectedReceivablesDetailed> fetchByContractNo(String contractId);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -122,6 +122,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.saveUnCollection(dto);
     }
 
+    @Override
+    public ResultBean<List<FinUncollectedReceivablesDetailed>> fetchByContractNo(String contractId) {
+        return finUncollectedReceivablesDetailedService.fetchByContractNo(contractId);
+    }
+
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {
         return finUncollectedReceivablesDetailedService.selectByContractNo(contractNo);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -543,4 +543,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<FinUncollectedReceivablesDetailed>> fetchByContractNo(String contractId) {
+        ResultBean rb = ResultBean.fireFail();
+        List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetaileds = baseMapper.fetchByContractNo(contractId);
+        return rb.success().setData(finUncollectedReceivablesDetaileds);
+    }
 }

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

@@ -40,6 +40,7 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"),
     BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
+    BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
 
 
     /******************************测试流程id*********************************************/