Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,92 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebate.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表", description = "回款返利表")
+@TableName("scm_collection_rebate")
+public class ScmCollectionRebate extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

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

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo <br/>
+ * Description: 回款返利表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 视图数据详情", description = "回款返利表 视图数据详情")
+public class ScmCollectionRebateDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 创建日期
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

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

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto <br/>
+ * Description: 回款返利表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 数据传输对象", description = "回款返利表 数据传输对象")
+public class ScmCollectionRebateDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

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

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

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

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

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

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery <br/>
+ * Description: 回款返利表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 查询条件", description = "回款返利表 查询条件")
+public class ScmCollectionRebateQuery implements Query {
+
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+    @ApiModelProperty(value = "创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty(value = "创建结束日期")
+    private String createEndTime;
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

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

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebate;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo <br/>
+ * Description: 回款返利表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利表 视图数据对象", description = "回款返利表 视图数据对象")
+public class ScmCollectionRebateVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("状态")
+    private String state; // 状态
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款方式key")
+    private String collectionTypeKey; // 回款方式key
+	@ApiModelProperty("回款方式value")
+    private String collectionTypeValue; // 回款方式value
+	@ApiModelProperty("厂家销售通路")
+    private String manufaSaleChannel; // 厂家销售通路
+	@ApiModelProperty("回款金额")
+    private String collectionMoney; // 回款金额
+	@ApiModelProperty("运费")
+    private String freight; // 运费
+	@ApiModelProperty("回款日期")
+    private String collectionDate; // 回款日期
+	@ApiModelProperty("计算标准")
+    private String calculationStandard; // 计算标准
+	@ApiModelProperty("预计返利")
+    private String estimateRebate; // 预计返利
+	@ApiModelProperty("预提日期")
+    private String withholdingDate; // 预提日期
+	@ApiModelProperty("上传日期")
+    private String uploadDate; // 上传日期
+	@ApiModelProperty("上传金额")
+    private String uploadMoney; // 上传金额
+	@ApiModelProperty("调整金额")
+    private String adjustmentMoney; // 调整金额
+	@ApiModelProperty("调整说明")
+    private String adjustmentRemarks; // 调整说明
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+}

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

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表", description = "回款返利核对申请表")
+@TableName("scm_collectionrebate_checkapply")
+public class ScmCollectionrebateCheckapply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo <br/>
+ * Description: 回款返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 视图数据详情", description = "回款返利核对申请表 视图数据详情")
+public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto <br/>
+ * Description: 回款返利核对申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 数据传输对象", description = "回款返利核对申请表 数据传输对象")
+public class ScmCollectionrebateCheckapplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

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

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

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

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

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery <br/>
+ * Description: 回款返利核对申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 查询条件", description = "回款返利核对申请表 查询条件")
+public class ScmCollectionrebateCheckapplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo <br/>
+ * Description: 回款返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表 视图数据对象", description = "回款返利核对申请表 视图数据对象")
+public class ScmCollectionrebateCheckapplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("核对申请标题")
+    private String checkApply; // 核对申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetail.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetail.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表", description = "回款返利核对申请表_返利列表")
+@TableName("scm_collectionrebate_checkapplydetail")
+public class ScmCollectionrebateCheckapplydetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo <br/>
+ * Description: 回款返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 视图数据详情", description = "回款返利核对申请表_返利列表 视图数据详情")
+public class ScmCollectionrebateCheckapplydetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto <br/>
+ * Description: 回款返利核对申请表_返利列表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 数据传输对象", description = "回款返利核对申请表_返利列表 数据传输对象")
+public class ScmCollectionrebateCheckapplydetailDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeign.java

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

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailFeignFallback.java

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

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery <br/>
+ * Description: 回款返利核对申请表_返利列表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 查询条件", description = "回款返利核对申请表_返利列表 查询条件")
+public class ScmCollectionrebateCheckapplydetailQuery implements Query {
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo <br/>
+ * Description: 回款返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利核对申请表_返利列表 视图数据对象", description = "回款返利核对申请表_返利列表 视图数据对象")
+public class ScmCollectionrebateCheckapplydetailVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("核对申请sid")
+    private String mainSid; // 核对申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWith.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWith.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表", description = "回款返利预提表")
+@TableName("scm_collection_rebate_with")
+public class ScmCollectionRebateWith extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo <br/>
+ * Description: 回款返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 视图数据详情", description = "回款返利预提表 视图数据详情")
+public class ScmCollectionRebateWithDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto <br/>
+ * Description: 回款返利预提表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 数据传输对象", description = "回款返利预提表 数据传输对象")
+public class ScmCollectionRebateWithDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java

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

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java

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

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithQuery.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery <br/>
+ * Description: 回款返利预提表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 查询条件", description = "回款返利预提表 查询条件")
+public class ScmCollectionRebateWithQuery implements Query {
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithVo.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewith;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo <br/>
+ * Description: 回款返利预提表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提表 视图数据对象", description = "回款返利预提表 视图数据对象")
+public class ScmCollectionRebateWithVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("回款返利sid")
+    private String collectionRebateSid; // 回款返利sid
+	@ApiModelProperty("回款返利预提申请sid")
+    private String mainSid; // 回款返利预提申请sid
+
+}

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

@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApply.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表", description = "回款返利预提申请表")
+@TableName("scm_collection_rebate_with_apply")
+public class ScmCollectionRebateWithApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo <br/>
+ * Description: 回款返利预提申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 视图数据详情", description = "回款返利预提申请表 视图数据详情")
+public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyDto.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto <br/>
+ * Description: 回款返利预提申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 数据传输对象", description = "回款返利预提申请表 数据传输对象")
+public class ScmCollectionRebateWithApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

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

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

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

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

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyQuery.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery <br/>
+ * Description: 回款返利预提申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 查询条件", description = "回款返利预提申请表 查询条件")
+public class ScmCollectionRebateWithApplyQuery implements Query {
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

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

@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo <br/>
+ * Description: 回款返利预提申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "回款返利预提申请表 视图数据对象", description = "回款返利预提申请表 视图数据对象")
+public class ScmCollectionRebateWithApplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("回款申请标题")
+    private String collectionApply; // 回款申请标题
+	@ApiModelProperty("创建人姓名")
+    private String createByName; // 创建人姓名
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionVo.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui_scm(anrui_scm) <br/>
  * File: ScmVehiclePatrolinspectionVo.java <br/>
@@ -56,8 +58,16 @@ public class ScmVehiclePatrolinspectionVo implements Vo {
     private String vinNo; // 车架号
     @ApiModelProperty("月度巡检sid")
     private String mainSid; // 月度巡检sid
+    @ApiModelProperty("车型")
+    private String model; // 车型
+    @ApiModelProperty("存放地点sid")
+    private String locationSid; // 存放地点sid
     @ApiModelProperty("存放地点")
     private String location; // 存放地点
+    @ApiModelProperty("库管人员sid")
+    private String liableSid; // 库管人员sid
+    @ApiModelProperty("库管人员名称")
+    private String liableName; // 库管人员名称
     @ApiModelProperty("巡检日期")
     private String patrolInspectionDate; // 巡检日期
     @ApiModelProperty("巡检人员")
@@ -68,4 +78,10 @@ public class ScmVehiclePatrolinspectionVo implements Vo {
     private String patrolInspectionStateKey; // 巡检状态（通过/不通过）
     @ApiModelProperty("创建组织")
     private String createOrgSid; // 创建组织
+    @ApiModelProperty("巡检情况说明")
+    private String situationExplain;
+    @ApiModelProperty("存在问题")
+    private String problems;
+    @ApiModelProperty("相关照片")
+    private List<String> images;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -68,6 +68,10 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String problems;
     @ApiModelProperty("处理结果")
     private String results;
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
     @ApiModelProperty("相关责任人")
     private List<AppLiableListDto> liableList;
     @ApiModelProperty("经纬度")

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

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebate;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateMapper <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmCollectionRebateMapper extends BaseMapper<ScmCollectionRebate> {
+
+	//@Update("update scm_collection_rebate set name=#{msg} where id=#{id}")
+	//IPage<ScmCollectionRebateVo> voPage(IPage<ScmCollectionRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebate> qw);
+	
+	IPage<ScmCollectionRebateVo> selectPageVo(IPage<ScmCollectionRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebate> qw);
+	
+	List<ScmCollectionRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebate> qw);
+	
+	@Select("select * from scm_collection_rebate")
+	List<ScmCollectionRebateVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.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.scm.biz.scmcollectionrebate.ScmCollectionRebateMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo">
+		SELECT * FROM scm_collection_rebate <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo">
+		SELECT * FROM scm_collection_rebate <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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

@@ -0,0 +1,116 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebate;
+
+import com.yxt.anrui.scm.api.scmcollectionrebate.*;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply;
+import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
+import com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyService;
+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;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest <br/>
+ * Description: 回款返利表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利表")
+@RestController("com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateRest")
+@RequestMapping("v1/scmcollectionrebate")
+public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
+
+    @Autowired
+    private ScmCollectionRebateService scmCollectionRebateService;
+    @Autowired
+    private ScmCollectionRebateWithService scmCollectionRebateWithService;
+    @Autowired
+    private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<ScmCollectionRebateVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ScmCollectionRebateDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        scmCollectionRebateService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        for (String sid : sids) {
+            List<String> stringList = scmCollectionRebateWithService.fetchByCollectionReBateSid(sid);
+            for (String s : stringList) {
+                ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s);
+                if (!scmCollectionRebateWithApply.getNodeState().equals("待提交")) {
+                    return rb.setMsg("所选数据中包含已提交专项返利信息，无法删除");
+                }
+            }
+            ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid);
+            Integer state = scmCollectionRebate.getState();
+            if (state == 1) {
+                return rb.setMsg("所选数据中包含已预提专项返利信息，无法删除");
+            }
+        }
+        scmCollectionRebateService.delBySids(sids);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+}

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

@@ -0,0 +1,125 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebate;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
+import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService <br/>
+ * Description: 回款返利表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmCollectionRebateService extends MybatisBaseService<ScmCollectionRebateMapper, ScmCollectionRebate> {
+	private QueryWrapper<ScmCollectionRebate> createQueryWrapper(ScmCollectionRebateQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmCollectionRebateVo> listPageVo(PagerQuery<ScmCollectionRebateQuery> pq) {
+		ScmCollectionRebateQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
+		qw.eq("createOrgSid",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
+			qw.eq("collectionTypeKey",query.getCollectionTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getCollectionDate())){
+			qw.eq("collectionDate",query.getCollectionDate());
+		}
+		String createStartTime = query.getCreateStartTime();
+		String createEndTime = query.getCreateEndTime();
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
+		IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmCollectionRebateDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        }
+		if (dto.getState().equals(1)){
+			dto.setState("3");
+		}
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmCollectionRebateDto dto){
+		ScmCollectionRebate entity = new ScmCollectionRebate();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmCollectionRebateDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmCollectionRebate entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmCollectionRebateDetailsVo fetchDetailsVoBySid(String sid){
+		ScmCollectionRebate entity = fetchBySid(sid);
+		ScmCollectionRebateDetailsVo vo = new ScmCollectionRebateDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

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

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyMapper <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmCollectionrebateCheckapplyMapper extends BaseMapper<ScmCollectionrebateCheckapply> {
+
+	//@Update("update scm_collectionrebate_checkapply set name=#{msg} where id=#{id}")
+	//IPage<ScmCollectionrebateCheckapplyVo> voPage(IPage<ScmCollectionrebateCheckapply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionrebateCheckapply> qw);
+	
+	IPage<ScmCollectionrebateCheckapplyVo> selectPageVo(IPage<ScmCollectionrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
+	
+	List<ScmCollectionrebateCheckapplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapply> qw);
+	
+	@Select("select * from scm_collectionrebate_checkapply")
+	List<ScmCollectionrebateCheckapplyVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.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.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
+		SELECT * FROM scm_collectionrebate_checkapply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
+		SELECT * FROM scm_collectionrebate_checkapply <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest <br/>
+ * Description: 回款返利核对申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利核对申请表")
+@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyRest")
+@RequestMapping("v1/scmcollectionrebatecheckapply")
+public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateCheckapplyFeign {
+
+	@Autowired
+	private ScmCollectionrebateCheckapplyService scmCollectionrebateCheckapplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmCollectionrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmCollectionrebateCheckapplyVo> pv = scmCollectionrebateCheckapplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionrebateCheckapplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmCollectionrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmCollectionrebateCheckapplyDetailsVo vo = scmCollectionrebateCheckapplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

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

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplyService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyService <br/>
+ * Description: 回款返利核对申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<ScmCollectionrebateCheckapplyMapper, ScmCollectionrebateCheckapply> {
+	private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmCollectionrebateCheckapplyVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) {
+		ScmCollectionrebateCheckapplyQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionrebateCheckapply> qw = createQueryWrapper(query);
+		IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmCollectionrebateCheckapplyDto dto){
+		ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmCollectionrebateCheckapplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmCollectionrebateCheckapply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmCollectionrebateCheckapplyDetailsVo fetchDetailsVoBySid(String sid){
+		ScmCollectionrebateCheckapply entity = fetchBySid(sid);
+		ScmCollectionrebateCheckapplyDetailsVo vo = new ScmCollectionrebateCheckapplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailMapper <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<ScmCollectionrebateCheckapplydetail> {
+
+	//@Update("update scm_collectionrebate_checkapplydetail set name=#{msg} where id=#{id}")
+	//IPage<ScmCollectionrebateCheckapplydetailVo> voPage(IPage<ScmCollectionrebateCheckapplydetail> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionrebateCheckapplydetail> qw);
+	
+	IPage<ScmCollectionrebateCheckapplydetailVo> selectPageVo(IPage<ScmCollectionrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw);
+	
+	List<ScmCollectionrebateCheckapplydetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionrebateCheckapplydetail> qw);
+	
+	@Select("select * from scm_collectionrebate_checkapplydetail")
+	List<ScmCollectionrebateCheckapplydetailVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.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.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo">
+		SELECT * FROM scm_collectionrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo">
+		SELECT * FROM scm_collectionrebate_checkapplydetail <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest <br/>
+ * Description: 回款返利核对申请表_返利列表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利核对申请表_返利列表")
+@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailRest")
+@RequestMapping("v1/scmcollectionrebatecheckapplydetail")
+public class ScmCollectionrebateCheckapplydetailRest implements ScmCollectionrebateCheckapplydetailFeign {
+
+	@Autowired
+	private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmCollectionrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmCollectionrebateCheckapplydetailVo> pv = scmCollectionrebateCheckapplydetailService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmCollectionrebateCheckapplydetailDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionrebateCheckapplydetailService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionrebateCheckapplydetailService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmCollectionrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmCollectionrebateCheckapplydetailDetailsVo vo = scmCollectionrebateCheckapplydetailService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionrebateCheckapplydetailService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService <br/>
+ * Description: 回款返利核对申请表_返利列表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseService<ScmCollectionrebateCheckapplydetailMapper, ScmCollectionrebateCheckapplydetail> {
+	private QueryWrapper<ScmCollectionrebateCheckapplydetail> createQueryWrapper(ScmCollectionrebateCheckapplydetailQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmCollectionrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplydetailQuery> pq) {
+		ScmCollectionrebateCheckapplydetailQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionrebateCheckapplydetail> qw = createQueryWrapper(query);
+		IPage<ScmCollectionrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmCollectionrebateCheckapplydetailDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmCollectionrebateCheckapplydetailDto dto){
+		ScmCollectionrebateCheckapplydetail entity = new ScmCollectionrebateCheckapplydetail();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmCollectionrebateCheckapplydetailDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmCollectionrebateCheckapplydetail entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmCollectionrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid){
+		ScmCollectionrebateCheckapplydetail entity = fetchBySid(sid);
+		ScmCollectionrebateCheckapplydetailDetailsVo vo = new ScmCollectionrebateCheckapplydetailDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithMapper <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmCollectionRebateWithMapper extends BaseMapper<ScmCollectionRebateWith> {
+
+	//@Update("update scm_collection_rebate_with set name=#{msg} where id=#{id}")
+	//IPage<ScmCollectionRebateWithVo> voPage(IPage<ScmCollectionRebateWith> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebateWith> qw);
+	
+	IPage<ScmCollectionRebateWithVo> selectPageVo(IPage<ScmCollectionRebateWith> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWith> qw);
+	
+	List<ScmCollectionRebateWithVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWith> qw);
+	
+	@Select("select * from scm_collection_rebate_with")
+	List<ScmCollectionRebateWithVo> selectListVo();
+
+	@Select("SELECT mainSid FROM scm_collection_rebate_with WHERE collectionRebateSid = #{sid}")
+    List<String> fetchByCollectionReBateSid(String sid);
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.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.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
+		SELECT * FROM scm_collection_rebate_with <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
+		SELECT * FROM scm_collection_rebate_with <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithRest <br/>
+ * Description: 回款返利预提表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利预提表")
+@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithRest")
+@RequestMapping("v1/scmcollectionrebatewith")
+public class ScmCollectionRebateWithRest implements ScmCollectionRebateWithFeign {
+
+	@Autowired
+	private ScmCollectionRebateWithService scmCollectionRebateWithService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmCollectionRebateWithVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmCollectionRebateWithVo> pv = scmCollectionRebateWithService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmCollectionRebateWithDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionRebateWithService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionRebateWithService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmCollectionRebateWithDetailsVo vo = scmCollectionRebateWithService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java

@@ -0,0 +1,114 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService <br/>
+ * Description: 回款返利预提表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollectionRebateWithMapper, ScmCollectionRebateWith> {
+	private QueryWrapper<ScmCollectionRebateWith> createQueryWrapper(ScmCollectionRebateWithQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmCollectionRebateWith> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmCollectionRebateWithVo> listPageVo(PagerQuery<ScmCollectionRebateWithQuery> pq) {
+		ScmCollectionRebateWithQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebateWith> qw = createQueryWrapper(query);
+		IPage<ScmCollectionRebateWith> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateWithVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionRebateWithVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmCollectionRebateWithDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmCollectionRebateWithDto dto){
+		ScmCollectionRebateWith entity = new ScmCollectionRebateWith();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmCollectionRebateWithDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmCollectionRebateWith entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmCollectionRebateWithDetailsVo fetchDetailsVoBySid(String sid){
+		ScmCollectionRebateWith entity = fetchBySid(sid);
+		ScmCollectionRebateWithDetailsVo vo = new ScmCollectionRebateWithDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public List<String> fetchByCollectionReBateSid(String sid) {
+		return baseMapper.fetchByCollectionReBateSid(sid);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyMapper.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyMapper <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface ScmCollectionRebateWithApplyMapper extends BaseMapper<ScmCollectionRebateWithApply> {
+
+	//@Update("update scm_collection_rebate_with_apply set name=#{msg} where id=#{id}")
+	//IPage<ScmCollectionRebateWithApplyVo> voPage(IPage<ScmCollectionRebateWithApply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmCollectionRebateWithApply> qw);
+	
+	IPage<ScmCollectionRebateWithApplyVo> selectPageVo(IPage<ScmCollectionRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
+	
+	List<ScmCollectionRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmCollectionRebateWithApply> qw);
+	
+	@Select("select * from scm_collection_rebate_with_apply")
+	List<ScmCollectionRebateWithApplyVo> selectListVo();
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.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.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
+		SELECT * FROM scm_collection_rebate_with_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
+		SELECT * FROM scm_collection_rebate_with_apply <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest <br/>
+ * Description: 回款返利预提申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "回款返利预提申请表")
+@RestController("com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyRest")
+@RequestMapping("v1/scmcollectionrebatewithapply")
+public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWithApplyFeign {
+
+	@Autowired
+	private ScmCollectionRebateWithApplyService scmCollectionRebateWithApplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<ScmCollectionRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmCollectionRebateWithApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<ScmCollectionRebateWithApplyVo> pv = scmCollectionRebateWithApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		scmCollectionRebateWithApplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		ScmCollectionRebateWithApplyDetailsVo vo = scmCollectionRebateWithApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApply;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyQuery;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDetailsVo;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
+import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-scm(回款返利) <br/>
+ * File: ScmCollectionRebateWithApplyService.java <br/>
+ * Class: com.yxt.anrui.scm.biz.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyService <br/>
+ * Description: 回款返利预提申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-27 15:14:19 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmCollectionRebateWithApplyMapper, ScmCollectionRebateWithApply> {
+	private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
+		ScmCollectionRebateWithApplyQuery query = pq.getParams();
+		QueryWrapper<ScmCollectionRebateWithApply> qw = createQueryWrapper(query);
+		IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
+		IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(ScmCollectionRebateWithApplyDto dto){
+		ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(ScmCollectionRebateWithApplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		ScmCollectionRebateWithApply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid){
+		ScmCollectionRebateWithApply entity = fetchBySid(sid);
+		ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@@ -99,9 +99,6 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     List<AppVinAndRemarksVo> getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey);
 
-    @Select("update scm_vehicle_patrolinspection set isDelete = 1 where sid = #{sid} ")
-    void updateBySid(@Param("sid") String sid);
-
     @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
     void updatePatrolInspectionState(@Param("sid") String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -28,15 +28,22 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspection;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
+import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
 import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
+import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
+import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -72,6 +79,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
     private ScmFileService scmFileService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private ScmWarehouseService scmWarehouseService;
+    @Autowired
+    private ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
 
     private QueryWrapper<ScmVehiclePatrolinspection> createQueryWrapper(ScmVehiclePatrolinspectionQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -95,7 +108,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         qw.apply(StringUtils.isNotEmpty(patrolInspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolInspectionStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(patrolInspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolInspectionEndDate + "','%Y-%m-%d')"
                 );
-        qw.ne("patrolInspectionStateKey","");
+        qw.eq("patrolInspectionStateKey",002).or().eq("patrolInspectionStateKey",003);
         IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
@@ -112,7 +125,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         if (StringUtils.isNotBlank(query.getLocationSid())) {
             qw.eq("locationSid", query.getLocationSid());
         }
-        qw.eq("patrolInspectionStateKey","");
+        qw.eq("patrolInspectionStateKey",000).or().eq("patrolInspectionStateKey",001);
         IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
         IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
         for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) {
@@ -125,6 +138,28 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
                 record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
                 record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
             }
+            BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(vinNo).getData();
+            record.setModel(vehicleVo.getModelName());
+            String locationSid = record.getLocationSid();
+            ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
+            record.setLiableSid(scmWarehouse.getLibTubeSid());
+            record.setLiableName(scmWarehouse.getLibTubeName());
+            String mainSid = record.getMainSid();
+            ScmVehiclePatrolinspectionsheetDetailsVo scmVehiclePatrolinspectionsheetDetailsVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(mainSid);
+            if (scmVehiclePatrolinspectionsheetDetailsVo != null){
+                record.setSituationExplain(scmVehiclePatrolinspectionsheetDetailsVo.getSituationExplain());
+                record.setProblems(scmVehiclePatrolinspectionsheetDetailsVo.getProblemsAndResults());
+                String sid = scmVehiclePatrolinspectionsheetDetailsVo.getSid();
+                List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
+                List<String> strings = new ArrayList<>();
+                for (ScmFileVo scmFileVo : scmFileVos) {
+                    String filePath = scmFileVo.getFilePath();
+                    String urlPrefix = fileUploadComponent.getUrlPrefix();
+                    filePath = urlPrefix + filePath;
+                    strings.add(filePath);
+                }
+                record.setImages(strings);
+            }
         }
         PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
@@ -272,10 +307,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
      * @param sid
      * @return
      */
-    public void updatePatrolInspectionState(String sid) {
-        baseMapper.updateBySid(sid);
-    }
-
     public void updateState(String sid) {
         baseMapper.updatePatrolInspectionState(sid);
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java

@@ -84,4 +84,7 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
     AppScmVehiclePatrolinspectionsheetVo selectByMainSid(@Param("mainSid") String mainSid);
 
     AppScmVehiclePatroVo getInspectionInfo(String recordSid);
+
+    @Select("select * from scm_vehicle_patrolinspectionsheet where mainSid = #{mainSid}")
+    ScmVehiclePatrolinspectionsheetDetailsVo fetchByMainSid(String mainSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -201,20 +201,12 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(scmVehiclePatrolinspection.getVinNo()).getData();
             patrolinspectionsheetInfoVo.setModel(data.getModelName());
             patrolinspectionsheetInfoVo.setModelSid(data.getModelSid());
+            ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(scmVehiclePatrolinspection.getLocationSid());
+            patrolinspectionsheetInfoVo.setLiableName(scmWarehouse.getLibTubeName());
+            patrolinspectionsheetInfoVo.setLiableSid(scmWarehouse.getLibTubeSid());
             patrolinspectionsheetInfoVo.setRecordSid(recordSid);
             return patrolinspectionsheetInfoVo;
         }
-
-        List<AppLiableListVo> list = new ArrayList<>();
-        List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
-        List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
-        for (int i = 0; i < splitName.size(); i++) {
-            AppLiableListVo v = new AppLiableListVo();
-            v.setLiableName(splitName.get(i));
-            v.setLiableSid(splitSid.get(i));
-            list.add(v);
-        }
-        vo.setLiableList(list);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
         if (scmFiles1.size() > 0) {
             for (ScmFile scmFile : scmFiles1) {
@@ -233,18 +225,18 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
     public AppScmVehiclePatroVo getInspectionInfo(String recordSid) {
         String type1 = "06"; // 巡检相关照片
         AppScmVehiclePatroVo vo = baseMapper.getInspectionInfo(recordSid);
-        if (StringUtils.isNotBlank(vo.getLiableName())) {
-            List<AppLiableListVo> list = new ArrayList<>();
-            List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
-            List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
-            for (int i = 0; i < splitName.size(); i++) {
-                AppLiableListVo v = new AppLiableListVo();
-                v.setLiableName(splitName.get(i));
-                v.setLiableSid(splitSid.get(i));
-                list.add(v);
-            }
-            vo.setLiableList(list);
-        }
+//        if (StringUtils.isNotBlank(vo.getLiableName())) {
+//            List<AppLiableListVo> list = new ArrayList<>();
+//            List<String> splitName = Arrays.asList(vo.getLiableName().split(","));
+//            List<String> splitSid = Arrays.asList(vo.getLiableSid().split(","));
+//            for (int i = 0; i < splitName.size(); i++) {
+//                AppLiableListVo v = new AppLiableListVo();
+//                v.setLiableName(splitName.get(i));
+//                v.setLiableSid(splitSid.get(i));
+//                list.add(v);
+//            }
+//            vo.setLiableList(list);
+//        }
         List<String> images = new ArrayList<>();
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(vo.getSid(), type1);
         if (scmFiles1.size() > 0) {
@@ -299,15 +291,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
             BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
-            List<AppLiableListDto> liableList = dto.getLiableList();
-            String DutyName = "";
-            String DutySid = "";
-            for (AppLiableListDto appLiableListDto : liableList) {
-                DutyName = appLiableListDto.getLiableName() + "," + DutyName;
-                DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
-            }
-            scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
-            scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
+            scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
+            scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
             scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
             scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
             scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
@@ -330,11 +315,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 scmFileService.save(scmFile1);
             }
             List<String> receiveIdList = new ArrayList<>();
-            for (AppLiableListDto appLiableListDto : liableList) {
-                SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData();
-                Integer id = sysUserVos.getId();
-                receiveIdList.add(String.valueOf(id));
-            }
+            List<AppLiableListDto> liableList = dto.getLiableList();
+            AppLiableListDto appLiableListDto = new AppLiableListDto();
+            appLiableListDto.setLiableName(dto.getLiableName());
+            appLiableListDto.setLiableSid(dto.getLiableSid());
+            liableList.add(appLiableListDto);
+            SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData();
+            Integer id = sysUserVos.getId();
+            receiveIdList.add(String.valueOf(id));
             AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto();
             appPatrolinspectionDto.setMsgContent(sysUserVo.getName());
             appPatrolinspectionDto.setList(liableList);
@@ -347,15 +335,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
         scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
         scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
-        List<AppLiableListDto> liableList = dto.getLiableList();
-        String DutyName = "";
-        String DutySid = "";
-        for (AppLiableListDto appLiableListDto : liableList) {
-            DutyName = appLiableListDto.getLiableName() + "," + DutyName;
-            DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
-        }
-        scmVehiclePatrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
-        scmVehiclePatrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
+        scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
+        scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
         scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
         List<String> images = dto.getImages();
         for (String s : images) {
@@ -372,11 +353,14 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         save(scmVehiclePatrolinspectionsheet);
         scmVehiclePatrolinspectionService.updateByMainSid(oneKey, oneValue, newDate, sysUserVo.getName(), dto.getMainSid());
         List<String> receiveIdList = new ArrayList<>();
-        for (AppLiableListDto appLiableListDto : liableList) {
-            SysUserVo sysUserVos = sysUserFeign.fetchBySid(appLiableListDto.getLiableSid()).getData();
-            Integer id = sysUserVos.getId();
-            receiveIdList.add(String.valueOf(id));
-        }
+        List<AppLiableListDto> liableList = dto.getLiableList();
+        AppLiableListDto appLiableListDto = new AppLiableListDto();
+        appLiableListDto.setLiableName(dto.getLiableName());
+        appLiableListDto.setLiableSid(dto.getLiableSid());
+        liableList.add(appLiableListDto);
+        SysUserVo sysUserVos = sysUserFeign.fetchBySid(dto.getLiableSid()).getData();
+        Integer id = sysUserVos.getId();
+        receiveIdList.add(String.valueOf(id));
         AppPatrolinspectionDto appPatrolinspectionDto = new AppPatrolinspectionDto();
         appPatrolinspectionDto.setMsgContent(sysUserVo.getName());
         appPatrolinspectionDto.setList(liableList);
@@ -589,17 +573,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
             patrolinspectionsheet.setModel(vehicleVo.getModelName());
             patrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
-            List<AppLiableListDto> liableList = dto.getLiableList();
-            if (liableList.size() > 0) {
-                String DutyName = "";
-                String DutySid = "";
-                for (AppLiableListDto appLiableListDto : liableList) {
-                    DutyName = appLiableListDto.getLiableName() + "," + DutyName;
-                    DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
-                }
-                patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
-                patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
-            }
+            patrolinspectionsheet.setDutyName(dto.getLiableName());
+            patrolinspectionsheet.setDutySid(dto.getLiableSid());
             scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
             for (String s : images) {
@@ -624,15 +599,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
             patrolinspectionsheet.setModel(vehicleVo.getModelName());
             patrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
-            List<AppLiableListDto> liableList = dto.getLiableList();
-            String DutyName = "";
-            String DutySid = "";
-            for (AppLiableListDto appLiableListDto : liableList) {
-                DutyName = appLiableListDto.getLiableName() + "," + DutyName;
-                DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
-            }
-            patrolinspectionsheet.setDutyName(DutyName.substring(0, DutyName.length() - 1));
-            patrolinspectionsheet.setDutySid(DutySid.substring(0, DutySid.length() - 1));
+            patrolinspectionsheet.setDutyName(dto.getLiableName());
+            patrolinspectionsheet.setDutySid(dto.getLiableSid());
             scmFileService.deleteByLinkSidAndType(patrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
             for (String s : images) {
@@ -696,4 +664,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String billNo = bill + num;
         return billNo;
     }
+
+    public ScmVehiclePatrolinspectionsheetDetailsVo fetchByMainSid(String mainSid) {
+        return baseMapper.fetchByMainSid(mainSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -119,7 +119,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
             record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
             record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
-            if ("0".equals(record.getState())) {
+            if (record.getState().equals(0)) {
                 if (vo.getSurplusNumber() == 0) {
                     record.setShowBtn(true);
                 } else {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthMapper.java

@@ -35,6 +35,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
@@ -72,4 +73,7 @@ public interface ScmVehPatrolinspectionmonthMapper extends BaseMapper<ScmVehPatr
     IPage<AppScmVehPatrolinspectionmonthVo> getCarInspectionReportList(IPage<AppScmVehPatrolinspectionmonthQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmVehPatrolinspectionmonthVo> qw, @Param("names") String names);
 
     AppScmVehPatrolinspectionmonthInfoVo selByMainSid(String sid);
+
+    @Update(" update scm_veh_patrolinspectionmonth set `state` = '1' where sid=#{mainSid} ")
+    void updateBySidState(@Param("mainSid") String mainSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.AppScmInventoryRecordsVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -187,7 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     vinNoList.add(vinNo);
                 }
                 if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
-                    scmVehiclePatrolinspectionService.updatePatrolInspectionState(patrolinspectionVo.getSid());
+                    scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
                 }
             }
             list = baseVehicleFeign.selectPatrolinspections(userSid, vinNoList).getData();
@@ -337,4 +338,8 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
     public List<ScmVehPatrolinspectionmonthVo> selectListAll() {
         return baseMapper.selectListAll();
     }
+
+    public void updateBySidState(String mainSid) {
+        baseMapper.updateBySidState(mainSid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java

@@ -39,6 +39,7 @@ import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
+import com.yxt.anrui.scm.biz.scmvehpatrolinspectionmonth.ScmVehPatrolinspectionmonthService;
 import com.yxt.common.base.utils.JPushServer;
 import com.yxt.messagecenter.api.message.AppMessageDto;
 import com.yxt.messagecenter.api.message.MessageFeign;
@@ -87,21 +88,10 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
 
     @Autowired
     ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
-
-    @Autowired
-    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
-    /**
-     * 消息类型:0002手机端
-     */
-    public static final String IDENTIFIER = "0002";
     @Autowired
-    ScmVehInventorymonthService scmVehInventorymonthService;
+    ScmVehPatrolinspectionmonthService scmVehPatrolinspectionmonthService;
     @Autowired
-    private MessageFeign messageFeign;
-    @Autowired
-    private MessageTypeFeign messageTypeFeign;
-    @Autowired
-    private MessageListFeign messageListFeign;
+    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
     @Autowired
     private SysUserFeign sysUserFeign;
 
@@ -157,7 +147,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
         ResultBean rb = ResultBean.fireFail();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         ScmVehPatrolinspectionreport scmVehPatrolinspectionreport = new ScmVehPatrolinspectionreport();
-        BeanUtil.copyProperties(dto, scmVehPatrolinspectionreport);
+        BeanUtil.copyProperties(dto, scmVehPatrolinspectionreport, "sid");
         String StateKey1 = "001";
         String StateKey2 = "002";
         List<AppVinAndRemarksVo> questions1 = scmVehiclePatrolinspectionService.getMonthRemarksByMainSid(dto.getMainSid(), StateKey1);
@@ -183,6 +173,7 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
         }
         save(scmVehPatrolinspectionreport);
         scmVehiclePatrolinspectionService.updateState(dto.getMainSid());
+        scmVehPatrolinspectionmonthService.updateBySidState(dto.getMainSid());
         List<String> receiveIdList = new ArrayList<>();
         List<AppLiableListDto> list = dto.getList();
         for (AppLiableListDto appLiableListDto : list) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/AppScmVehiclePatrolinVo.java

@@ -52,6 +52,12 @@ public class AppScmVehiclePatrolinVo implements Vo {
     @ApiModelProperty("相关附件")
     private List<String> images = new ArrayList<>();
 
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+
     @ApiModelProperty("相关责任人")
     private List<LiableListVo> liableList = new ArrayList<>();
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/PatrolinspectionInfoVo.java

@@ -33,6 +33,12 @@ public class PatrolinspectionInfoVo implements Vo {
     @JsonProperty("result")
     private String results;
 
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+
     @ApiModelProperty("相关责任人")
     private List<LiableListVo> liableList;