更改

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml

@@ -22,7 +22,7 @@
     </select>
     <!--获取下拉框-->
     <select id="getValue" resultType="com.yxt.anrui.portal.api.dictcommon.DictCommonVo">
-        SELECT dc.sid, dc.dictType, dc.dictKey, dc.dictValue, dc.parentSid
+        SELECT dc.sid, dc.dictType, dc.dictKey, dc.dictValue, dc.parentSid, dc.groupName
         FROM dict_common dc ${ew.customSqlSegment}
     </select>
 

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

@@ -53,6 +53,8 @@ import java.util.Date;
 public class ScmCollectionRebateWithApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("部门sid")
     private String deptSid;
     @ApiModelProperty("部门")

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

@@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
 
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("部门sid")
     private String deptSid;
     @ApiModelProperty("部门")

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

@@ -58,6 +58,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("部门sid")
     private String deptSid;
     @ApiModelProperty("部门")

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

@@ -55,14 +55,16 @@ public class ScmCollectionRebateWithApplyQuery implements Query {
     private String deptName;
     @ApiModelProperty("创建人姓名")
     private String createByName;
-    @ApiModelProperty("回款申请标题")
+    @ApiModelProperty("单据编号")
-    private String collectionApply;
+    private String billNo;
     @ApiModelProperty("创建日期")
     private String createStartTime;
     private String createEndTime;
     @ApiModelProperty("办结日期")
     private String finishTimeStart;
     private String finishTimeEnd;
+    @ApiModelProperty("回款申请标题")
+    private String collectionApply;
 
     private String userSid;
     private String orgPath;

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

@@ -56,24 +56,24 @@ public class ScmCollectionRebateWithApplyVo implements Vo {
 
     @ApiModelProperty("流程状态")
     private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("分公司")
     private String useOrgName;
-    @ApiModelProperty("回款申请标题")
-    private String collectionApply;
-    @ApiModelProperty("预提返利")
-    private String estimateRebate;
-    @ApiModelProperty("备注")
-    private String remarks;
-    @ApiModelProperty("创建人姓名")
-    private String createByName;
     @ApiModelProperty("部门")
     private String deptName;
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime;
+    @ApiModelProperty("回款申请标题")
+    private String collectionApply;
+    @ApiModelProperty("预提返利")
+    private String estimateRebate;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java

@@ -98,7 +98,7 @@ public interface ScmSpecialRebateFeign {
     @ApiOperation(value = "一次导入")
     @PostMapping("/getExcelOneInfo")
     @ResponseBody
-    public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException;
+    public ResultBean getExcelOneInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException;
 
     @ApiOperation("二次导出")
     @PostMapping("/excelListTwo")
@@ -107,6 +107,6 @@ public interface ScmSpecialRebateFeign {
     @ApiOperation(value = "二次导入")
     @PostMapping("/getExcelTwoInfo")
     @ResponseBody
-    public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request,@RequestParam("userSid") String userSid,@RequestParam("orgPath") String orgPath) throws IOException, ParseException;
+    public ResultBean getExcelTwoInfo(@RequestParam(value = "file") MultipartFile file, HttpServletRequest request, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) throws IOException, ParseException;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -68,27 +68,27 @@ public class ScmSpecialRebateVo implements Vo {
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
-	@ApiModelProperty("返利类型value")
+    @ApiModelProperty("返利类型value")
     private String rebateTypeValue;
-	@ApiModelProperty("返利名称")
+    @ApiModelProperty("返利名称")
     private String rebateName;
-	@ApiModelProperty("预计返利")
+    @ApiModelProperty("预计返利")
     private String estimateRebate;
-	@ApiModelProperty("预提日期")
+    @ApiModelProperty("预提日期")
     private String withholdingDate;
-	@ApiModelProperty("上传日期")
+    @ApiModelProperty("上传日期")
     private String uploadDate;
-	@ApiModelProperty("上传金额")
+    @ApiModelProperty("上传金额")
     private String uploadMoney;
-	@ApiModelProperty("二次上传日期")
+    @ApiModelProperty("二次上传日期")
     private String secondaryUploadDate;
-	@ApiModelProperty("二次上传金额")
+    @ApiModelProperty("二次上传金额")
     private String secondaryUploadMoney;
-	@ApiModelProperty("是否调整")
+    @ApiModelProperty("是否调整")
     private String isAdjustment;
-	@ApiModelProperty("调整金额")
+    @ApiModelProperty("调整金额")
     private String adjustmentMoney;
-	@ApiModelProperty("调整说明")
+    @ApiModelProperty("调整说明")
     private String adjustmentRemarks;
 
     @ApiModelProperty("待确定金额(动态)")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java

@@ -50,31 +50,33 @@ import lombok.Data;
 public class ScmSpecialrebateCheckapply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("核对申请标题")
+    @ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java

@@ -58,38 +58,40 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo {
 
     private String sid; // sid
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("创建日期")
     private Date createTime;
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("核对申请标题")
+    @ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java

@@ -58,31 +58,33 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
     private String createBySid; // 创建人sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("核对申请标题")
+    @ApiModelProperty("核对申请标题")
     private String checkApply; // 核对申请标题
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java

@@ -65,7 +65,6 @@ public interface ScmSpecialrebateCheckapplyFeign {
     @PostMapping("/rePushVoucher")
     public ResultBean rePushVoucher(@RequestParam("sid") String sid);
 
-
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java

@@ -51,16 +51,20 @@ public class ScmSpecialrebateCheckapplyQuery implements Query {
 
     @ApiModelProperty("分公司")
     private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建日期")
+    private String createStartTime;
+    private String createEndTime;
+    @ApiModelProperty("办结日期")
+    private String finishTimeStart;
+    private String finishTimeEnd;
     @ApiModelProperty("核对申请标题")
-    private String checkApply; // 核对申请标题
+    private String checkApply;
-    @ApiModelProperty("创建开始日期")
-    private String createStartTime; // 创建开始日期
-    @ApiModelProperty("创建结束日期")
-    private String createEndTime; // 创建结束日期
-    @ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
-    @ApiModelProperty("流程实例的sid")
-    private String procInstId; // 流程实例的sid
 
     private String userSid;
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java

@@ -52,35 +52,41 @@ import java.util.Date;
 @ApiModel(value = "专项返利核对申请表 视图数据对象", description = "专项返利核对申请表 视图数据对象")
 public class ScmSpecialrebateCheckapplyVo implements Vo {
 
-    private String sid; // sid
+    private String sid;
 
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-    @ApiModelProperty("核对申请标题")
-    private String checkApply; // 核对申请标题
     @ApiModelProperty("创建人姓名")
-    private String createByName; // 创建人姓名
+    private String createByName;
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime; // 创建日期
+    private Date createTime;
-    @ApiModelProperty("创建组织名称")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private String createOrgName; // 创建组织名称
+    @ApiModelProperty("办结日期")
+    private Date finishTime;
+    @ApiModelProperty("核对申请标题")
+    private String checkApply;
     @ApiModelProperty("预计返利")
-    private String estimateRebate; // 预计返利
+    private String estimateRebate;
     @ApiModelProperty("其中预提费用")
     private String withholdCost;
     @ApiModelProperty("上传金额")
-    private String uploadMoney; // 上传金额
+    private String uploadMoney;
     @ApiModelProperty("待确定金额")
-    private String stayDetermineMoney; // 待确定金额
+    private String stayDetermineMoney;
     @ApiModelProperty("费用")
-    private String money; // 费用
+    private String money;
     @ApiModelProperty("调整金额")
-    private String adjustmentMoney; // 调整金额
+    private String adjustmentMoney;
-    @ApiModelProperty("流程状态")
+
-    private String nodeState; // 流程状态
     @ApiModelProperty("流程定义的id")
-    private String procDefId; // 流程定义的id
+    private String procDefId;
     @ApiModelProperty("流程实例的sid")
-    private String procInstId; // 流程实例的sid
+    private String procInstId;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java

@@ -57,6 +57,10 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity {
 	@ApiModelProperty("核对申请sid")
     private String mainSid; // 核对申请sid
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")
@@ -88,10 +92,6 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity {
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
 
-    @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid;
-    @ApiModelProperty("采购系统名称")
-    private String purchaseSystemName;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
     @ApiModelProperty("一次核对状态")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java

@@ -53,6 +53,10 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("预提日期(页面展示)")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java

@@ -59,6 +59,10 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
 	@ApiModelProperty("核对申请sid")
     private String mainSid; // 核对申请sid
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统")
+    private String purchaseSystemName;
     @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")
@@ -90,10 +94,6 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto {
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
 
-    @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid;
-    @ApiModelProperty("采购系统名称")
-    private String purchaseSystemName;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
     @ApiModelProperty("一次核对状态")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java

@@ -57,26 +57,6 @@ import java.util.List;
         fallback = ScmSpecialrebateCheckapplydetailFeignFallback.class)
 public interface ScmSpecialrebateCheckapplydetailFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
     @ApiOperation("专项返利核对查看详情")
     @GetMapping("/specialRebateCheckDetails/{sid}")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java

@@ -36,28 +36,6 @@ import java.util.List;
 @Component
 public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecialrebateCheckapplydetailFeign {
 
-	@Override
-	public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(ScmSpecialrebateCheckapplydetailDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapplydetail/fetchDetailsBySid无法访问");
-	}
-
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
 		return null;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java

@@ -1,57 +0,0 @@
-/*********************************************************
- *********************************************************
- ********************                  *******************
- *************                                ************
- *******                  _oo0oo_                  *******
- ***                     o8888888o                     ***
- *                       88" . "88                       *
- *                       (| -_- |)                       *
- *                       0\  =  /0                       *
- *                     ___/`---'\___                     *
- *                   .' \\|     |// '.                   *
- *                  / \\|||  :  |||// \                  *
- *                 / _||||| -:- |||||- \                 *
- *                |   | \\\  -  /// |   |                *
- *                | \_|  ''\---/''  |_/ |                *
- *                \  .-\__  '-'  ___/-. /                *
- *              ___'. .'  /--.--\  `. .'___              *
- *           ."" '<  `.___\_<|>_/___.' >' "".            *
- *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
- *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
- *      =====`-.____`.___ \_____/___.-`___.-'=====       *
- *                        `=---='                        *
- *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
-
-
-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: ScmSpecialrebateCheckapplydetailQuery.java <br/>
- * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery <br/>
- * Description: 专项返利核对申请表_返利列表 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-09-09 09:14:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
-@Data
-@ApiModel(value = "专项返利核对申请表_返利列表 查询条件", description = "专项返利核对申请表_返利列表 查询条件")
-public class ScmSpecialrebateCheckapplydetailQuery implements Query {
-
-	@ApiModelProperty("专项返利sid")
-    private String specialRebateSid; // 专项返利sid
-	@ApiModelProperty("核对申请sid")
-    private String mainSid; // 核对申请sid
-
-}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java

@@ -58,6 +58,10 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
 	@ApiModelProperty("核对申请sid")
     private String mainSid; // 核对申请sid
 
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
+    @ApiModelProperty("采购系统名称")
+    private String purchaseSystemName;
     @ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
     @ApiModelProperty("品牌名称")
@@ -89,10 +93,6 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
     @ApiModelProperty("调整状态")
     private Integer adjustmentState;
 
-    @ApiModelProperty("采购系统sid")
-    private String purchaseSystemSid;
-    @ApiModelProperty("采购系统名称")
-    private String purchaseSystemName;
     @ApiModelProperty("所属年月")
     private String palceGenDate;
     @ApiModelProperty("一次核对状态")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithDetailsVo.java

@@ -60,13 +60,13 @@ public class ScmSpecialRebateWithDetailsVo implements Vo {
     private String withRebate; // 预提返利
     @ApiModelProperty("专项返利sid")
     private List<String> specialRebateSids; // 专项返利sid
-	@ApiModelProperty("专项返利sid")
+    @ApiModelProperty("专项返利sid")
     private String specialRebateSid; // 专项返利sid
     @ApiModelProperty("返利类型key")
     private String rebateTypeKey; // 返利类型key
     @ApiModelProperty("返利类型value")
     private String rebateTypeValue; // 返利类型value
-	@ApiModelProperty("专项返利预提申请sid")
+    @ApiModelProperty("专项返利预提申请sid")
     private String mainSid; // 专项返利预提申请sid
 
     @ApiModelProperty("采购系统sid")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java

@@ -57,26 +57,6 @@ import java.util.List;
         fallback = ScmSpecialRebateWithFeignFallback.class)
 public interface ScmSpecialRebateWithFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<ScmSpecialRebateWithVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
     @ApiOperation("专项返利预提查看详情")
     @GetMapping("/specialRebateWithDetails/{sid}")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java

@@ -50,31 +50,33 @@ import lombok.Data;
 public class ScmSpecialRebateWithApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("预提申请")
+    @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java

@@ -59,31 +59,33 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo {
     private String createBySid; // 申请人sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("预提申请")
+    @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java

@@ -57,33 +57,35 @@ public class ScmSpecialRebateWithApplyDto implements Dto {
 
     @ApiModelProperty("备注")
     private String remarks; // 备注
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("申请部门sid")
     private String deptSid;
     @ApiModelProperty("申请部门名称")
     private String deptName;
-	@ApiModelProperty("预提申请")
+    @ApiModelProperty("预提申请")
     private String withApply; // 预提申请
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
-	@ApiModelProperty("创建人姓名")
+    @ApiModelProperty("创建人姓名")
     private String createByName; // 创建人姓名
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
     @ApiModelProperty("组织全路径")
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java

@@ -65,7 +65,6 @@ public interface ScmSpecialRebateWithApplyFeign {
     @PostMapping("/rePushVoucher")
     public ResultBean rePushVoucher(@RequestParam("sid") String sid);
 
-
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     @ResponseBody

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java

@@ -51,17 +51,20 @@ public class ScmSpecialRebateWithApplyQuery implements Query {
 
     @ApiModelProperty("分公司名称")
     private String createOrgName;
-    @ApiModelProperty("预提申请")
+    @ApiModelProperty("申请部门名称")
-    private String withApply; // 预提申请
+    private String deptName;
-    @ApiModelProperty("创建开始日期")
+    @ApiModelProperty("创建人姓名")
-    private String createStartTime; // 创建开始日期
+    private String createByName;
-    @ApiModelProperty("创建结束日期")
+    @ApiModelProperty("单据编号")
-    private String createEndTime; // 创建结束日期
+    private String billNo;
+    @ApiModelProperty("创建开始")
+    private String createStartTime;
+    private String createEndTime;
     @ApiModelProperty("办结日期")
     private String finishTimeStart;
     private String finishTimeEnd;
-    @ApiModelProperty("流程状态")
+    @ApiModelProperty("预提申请")
-    private String nodeState;
+    private String withApply;
 
     private String userSid;
     private String orgPath;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java

@@ -54,26 +54,28 @@ public class ScmSpecialRebateWithApplyVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("创建人姓名")
+    private String createByName;
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date createTime; // 创建日期
+    private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
     private Date finishTime;
-    @ApiModelProperty("申请部门名称")
-    private String deptName;
     @ApiModelProperty("预提申请")
-    private String withApply; // 预提申请
+    private String withApply;
     @ApiModelProperty("预提返利合计")
-    private Integer withRebateTotal; // 预提返利合计
+    private Integer withRebateTotal;
     @ApiModelProperty("其中预提费用")
     private String withholdCost;
-    @ApiModelProperty("创建人姓名")
-    private String createByName; // 创建人姓名
-    @ApiModelProperty("创建组织名称")
-    private String createOrgName; // 创建组织名称
-    @ApiModelProperty("流程状态")
-    private String nodeState;
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("流程实例的sid")

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

@@ -7,13 +7,13 @@
             resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
         SELECT
         scrwa.*,
-        SUM(scr.`estimateRebate`) estimateRebate
+        SUM(scr.estimateRebate) estimateRebate
         FROM
         scm_collection_rebate_with_apply scrwa
         LEFT JOIN scm_collection_rebate_with scrw
-        ON scrwa.`sid` = scrw.`mainSid`
+        ON scrwa.sid = scrw.mainSid
         LEFT JOIN scm_collection_rebate scr
-        ON scr.`sid` = scrw.`collectionRebateSid`
+        ON scr.sid = scrw.collectionRebateSid
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -162,6 +162,9 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("scrwa.createByName", query.getCreateByName());
         }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("scrwa.billNo", query.getBillNo());
+        }
         if (StringUtils.isNotBlank(query.getCollectionApply())) {
             qw.like("scrwa.collectionApply", query.getCollectionApply());
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java

@@ -54,9 +54,11 @@ import java.util.Map;
 @Mapper
 public interface ScmSpecialrebateCheckapplyMapper extends BaseMapper<ScmSpecialrebateCheckapply> {
 
-	IPage<ScmSpecialrebateCheckapplyVo> selectPageVo(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
+    IPage<ScmSpecialrebateCheckapplyVo> selectPageVo(IPage<ScmSpecialrebateCheckapply> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapply> qw);
 
     int selectBySid(String join);
 
     int updateFlowFiled(Map<String, Object> beanToMap);
+
+    String selectNum(String billNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml

@@ -31,6 +31,9 @@
 	<update id="updateFlowFiled">
 		UPDATE scm_specialrebate_checkapply
 		SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>
@@ -42,4 +45,12 @@
 		</if>
 		WHERE sid=#{sid}
     </update>
+
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from scm_specialrebate_checkapply
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+			limit 1
+	</select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java

@@ -46,96 +46,96 @@ import java.util.List;
 @RequestMapping("v1/scmspecialrebatecheckapply")
 public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckapplyFeign {
 
-	@Autowired
+    @Autowired
-	private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService;
+    private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService;
-
+
-	@Override
+    @Override
-	public ResultBean rePushVoucher(String sid) {
+    public ResultBean rePushVoucher(String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid,"1");
+        scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1");
-		return rb.success();
+        return rb.success();
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq){
+    public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmSpecialrebateCheckapplyVo> pv = scmSpecialrebateCheckapplyService.listPageVo(pq);
+        PagerVo<ScmSpecialrebateCheckapplyVo> pv = scmSpecialrebateCheckapplyService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){
+    public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto) {
-		return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
+        return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		return scmSpecialrebateCheckapplyService.delAll(sids);
+        return scmSpecialrebateCheckapplyService.delAll(sids);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid);
+        return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
+    public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
-		return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto);
+        return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) {
+    public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) {
-		BusinessVariables bv = new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(dto, bv);
+        BeanUtil.copyProperties(dto, bv);
-		bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId());
-		return scmSpecialrebateCheckapplyService.complete(bv);
+        return scmSpecialrebateCheckapplyService.complete(bv);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
-		return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo);
+        return scmSpecialrebateCheckapplyService.revokeProcess(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
-		return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo);
+        return scmSpecialrebateCheckapplyService.taskReject(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
-		return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo);
+        return scmSpecialrebateCheckapplyService.breakProcess(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean flowRecord(String procInsId) {
+    public ResultBean flowRecord(String procInsId) {
-		return scmSpecialrebateCheckapplyService.flowRecord(procInsId);
+        return scmSpecialrebateCheckapplyService.flowRecord(procInsId);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
-		return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query);
+        return scmSpecialrebateCheckapplyService.getNextNodesForSubmit(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
-		return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query);
+        return scmSpecialrebateCheckapplyService.getPreviousNodesForReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) {
+    public ResultBean delegate(ScmSpecialRebateCheckApplyDelegateQuery query) {
-		return scmSpecialrebateCheckapplyService.delegate(query);
+        return scmSpecialrebateCheckapplyService.delegate(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) {
+    public ResultBean assignTask(ScmSpecialRebateCheckApplyDelegateQuery query) {
-		return scmSpecialrebateCheckapplyService.assignTask(query);
+        return scmSpecialrebateCheckapplyService.assignTask(query);
-	}
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -149,6 +151,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         if (StringUtils.isNotBlank(query.getCreateOrgName())) {
             qw.like("ssc.createOrgName", query.getCreateOrgName());
         }
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("ssc.deptName", query.getDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("ssc.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("ssc.billNo", query.getBillNo());
+        }
         if (StringUtils.isNotBlank(query.getCheckApply())) {
             qw.like("ssc.checkApply", query.getCheckApply());
         }
@@ -157,6 +168,11 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
         qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        String finishTimeStart = query.getFinishTimeStart();
+        String finishTimeEnd = query.getFinishTimeEnd();
+        qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ssc.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ssc.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
+                );
         qw.groupBy("ssc.sid");
         qw.orderByDesc("ssc.createTime");
         IPage<ScmSpecialrebateCheckapply> page = PagerUtil.queryToPage(pq);
@@ -173,6 +189,18 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
             return rb.setMsg("请选择已核对专项返利信息");
         }
         if (StringUtils.isBlank(dtoSid)) {
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+            billNo = "ZXFLHD" + sysOrganizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             String sid = this.insertByDto(dto).getData();
             for (ScmSpecialrebateCheckapplydetailDto scmSpecialrebateCheckapplydetailDto : scmSpecialrebateCheckapplydetailDetails) {
                 scmSpecialrebateCheckapplydetailDto.setMainSid(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java

@@ -25,16 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
-import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
@@ -44,17 +39,15 @@ import java.util.List;
 @Mapper
 public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper<ScmSpecialrebateCheckapplydetail> {
 
-	IPage<ScmSpecialrebateCheckapplydetailVo> selectPageVo(IPage<ScmSpecialrebateCheckapplydetail> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialrebateCheckapplydetail> qw);
+    @Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
-	
-	@Delete("delete from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
     void delByMainSid(String sid);
 
-	List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
+    List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchWhenDetailsVoBySid(String sid);
 
-	List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
+    List<ScmSpecialrebateCheckapplydetailDetailsVo> fetchLastDetailsVoBySid(String sid);
 
-	@Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
+    @Select("select * from scm_specialrebate_checkapplydetail where mainSid = #{sid}")
     List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid);
 
-	List<ScmSpecialRebateDetailsVo> fetchBySpecialRebateSid(String mainSid);
+    List<ScmSpecialRebateDetailsVo> fetchBySpecialRebateSid(String mainSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -3,24 +3,19 @@
 <mapper namespace="com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo"
-            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
-        SELECT * FROM scm_specialrebate_checkapplydetail
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="fetchWhenDetailsVoBySid"
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
-        SELECT ssc.rebateTypeKey,
+        SELECT ssc.purchaseSystemName,
+               ssc.brandName,
+               ssc.rebateTypeKey,
                ssc.rebateTypeValue,
-               SUM(ssc.estimateRebate)                                              withRebate,
+               SUM(ssc.estimateRebate)                                                withRebate,
                COUNT(*)                                                               num,
-               GROUP_CONCAT(ssc.specialRebateSid)                                   specialRebateSid,
+               GROUP_CONCAT(ssc.specialRebateSid)                                     specialRebateSid,
-               SUM(ssc.uploadMoney)                                                 uploadMoney,
+               SUM(ssc.uploadMoney)                                                   uploadMoney,
-               SUM(ssc.stayDetermineMoney)                                          stayDetermineMoney,
+               SUM(ssc.stayDetermineMoney)                                            stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                             adjustmentMoney,
+               SUM(ssc.adjustmentMoney)                                               adjustmentMoney,
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
                SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                    ssc.secondTreatCost + ssc.secondSuppCost)                       AS money,
@@ -29,18 +24,20 @@
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
-        GROUP BY ssc.rebateTypeKey,ssc.brandSid,ssc.purchaseSystemSid
+        GROUP BY ssc.rebateTypeKey, ssc.brandSid, ssc.purchaseSystemSid
     </select>
 
     <select id="fetchLastDetailsVoBySid"
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo">
-        SELECT ssc.withholdingDate,
+        SELECT ssc.purchaseSystemName,
-               SUM(ssc.estimateRebate)                                              withRebate,
+               ssc.brandName,
+               ssc.withholdingDate,
+               SUM(ssc.estimateRebate)                                                withRebate,
                COUNT(*)                                                               num,
-               GROUP_CONCAT(ssc.specialRebateSid)                                   specialRebateSid,
+               GROUP_CONCAT(ssc.specialRebateSid)                                     specialRebateSid,
-               SUM(ssc.uploadMoney)                                                 uploadMoney,
+               SUM(ssc.uploadMoney)                                                   uploadMoney,
-               SUM(ssc.stayDetermineMoney)                                          stayDetermineMoney,
+               SUM(ssc.stayDetermineMoney)                                            stayDetermineMoney,
-               SUM(ssc.adjustmentMoney)                                             adjustmentMoney,
+               SUM(ssc.adjustmentMoney)                                               adjustmentMoney,
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
                SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
                    ssc.secondTreatCost + ssc.secondSuppCost)                       AS money,
@@ -49,14 +46,14 @@
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.mainSid = #{sid}
-        GROUP BY ssc.withholdingDate,ssc.brandSid,ssc.purchaseSystemSid
+        GROUP BY ssc.withholdingDate, ssc.brandSid, ssc.purchaseSystemSid
     </select>
 
     <select id="fetchBySpecialRebateSid" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo">
         SELECT sc.createOrgName, sd.*
         FROM scm_specialrebate_checkapplydetail sd
-                     LEFT JOIN scm_specialrebate_checkapply sc
+                 LEFT JOIN scm_specialrebate_checkapply sc
-                ON sd.mainSid = sc.sid
+                           ON sd.mainSid = sc.sid
         WHERE sd.mainSid = #{mainSid}
     </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java

@@ -26,20 +26,12 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
 
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
-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.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
 
 /**
@@ -63,42 +55,6 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe
 	@Autowired
 	private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmSpecialrebateCheckapplydetailVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmSpecialrebateCheckapplydetailVo> pv = scmSpecialrebateCheckapplydetailService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody ScmSpecialrebateCheckapplydetailDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		scmSpecialrebateCheckapplydetailService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		scmSpecialrebateCheckapplydetailService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmSpecialrebateCheckapplydetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmSpecialrebateCheckapplydetailDetailsVo vo = scmSpecialrebateCheckapplydetailService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
 		return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java

@@ -26,26 +26,16 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail;
 
 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.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
-import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
-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.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailFeign;
 
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -63,30 +53,6 @@ import java.util.List;
  */
 @Service
 public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<ScmSpecialrebateCheckapplydetailMapper, ScmSpecialrebateCheckapplydetail> {
-    private QueryWrapper<ScmSpecialrebateCheckapplydetail> createQueryWrapper(ScmSpecialrebateCheckapplydetailQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<ScmSpecialrebateCheckapplydetail> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<ScmSpecialrebateCheckapplydetailVo> listPageVo(PagerQuery<ScmSpecialrebateCheckapplydetailQuery> pq) {
-        ScmSpecialrebateCheckapplydetailQuery query = pq.getParams();
-        QueryWrapper<ScmSpecialrebateCheckapplydetail> qw = createQueryWrapper(query);
-        IPage<ScmSpecialrebateCheckapplydetail> page = PagerUtil.queryToPage(pq);
-        IPage<ScmSpecialrebateCheckapplydetailVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<ScmSpecialrebateCheckapplydetailVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void saveOrUpdateDto(ScmSpecialrebateCheckapplydetailDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
-        }
-        this.updateByDto(dto);
-    }
 
     public void insertByDto(ScmSpecialrebateCheckapplydetailDto dto) {
         ScmSpecialrebateCheckapplydetail entity = new ScmSpecialrebateCheckapplydetail();
@@ -94,23 +60,6 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService<
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(ScmSpecialrebateCheckapplydetailDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        ScmSpecialrebateCheckapplydetail entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
-    public ScmSpecialrebateCheckapplydetailDetailsVo fetchDetailsVoBySid(String sid) {
-        ScmSpecialrebateCheckapplydetail entity = fetchBySid(sid);
-        ScmSpecialrebateCheckapplydetailDetailsVo vo = new ScmSpecialrebateCheckapplydetailDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
-
     public void delByMainSid(String sid) {
         baseMapper.delByMainSid(sid);
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java

@@ -25,21 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.scm.biz.scmspecialrebatewith;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWith;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -57,8 +50,6 @@ import java.util.Map;
 @Mapper
 public interface ScmSpecialRebateWithMapper extends BaseMapper<ScmSpecialRebateWith> {
 
-    IPage<ScmSpecialRebateWithVo> selectPageVo(IPage<ScmSpecialRebateWith> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebateWith> qw);
-
     @Delete("delete from scm_special_rebate_with where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml

@@ -3,12 +3,6 @@
 <mapper namespace="com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo">
-        SELECT * FROM scm_special_rebate_with
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo">
         SELECT ssr.rebateTypeKey,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java

@@ -26,20 +26,12 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatewith;
 
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
-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.scmspecialrebatewith.ScmSpecialRebateWith;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
 
 /**
@@ -56,49 +48,13 @@ import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
  * @since 1.0
  */
 @Api(tags = "专项返利预提表")
-@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithRest")
+@RestController
 @RequestMapping("v1/scmspecialrebatewith")
 public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
 
 	@Autowired
 	private ScmSpecialRebateWithService scmSpecialRebateWithService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmSpecialRebateWithVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmSpecialRebateWithVo> pv = scmSpecialRebateWithService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody ScmSpecialRebateWithDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		scmSpecialRebateWithService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		scmSpecialRebateWithService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmSpecialRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		ScmSpecialRebateWithDetailsVo vo = scmSpecialRebateWithService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
 	@Override
 	public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
 		return scmSpecialRebateWithService.specialRebateWithDetails(sid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java

@@ -26,23 +26,12 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatewith;
 
 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.scm.api.scmspecialrebate.ScmSpecialRebate;
 import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
-import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
-import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
-import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
-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.scmspecialrebatewith.ScmSpecialRebateWith;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithQuery;
-import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
 
@@ -51,7 +40,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -71,33 +59,6 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
 
     @Autowired
     private ScmSpecialRebateService scmSpecialRebateService;
-    @Autowired
-    private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
-
-    private QueryWrapper<ScmSpecialRebateWith> createQueryWrapper(ScmSpecialRebateWithQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<ScmSpecialRebateWith> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<ScmSpecialRebateWithVo> listPageVo(PagerQuery<ScmSpecialRebateWithQuery> pq) {
-        ScmSpecialRebateWithQuery query = pq.getParams();
-        QueryWrapper<ScmSpecialRebateWith> qw = createQueryWrapper(query);
-        IPage<ScmSpecialRebateWith> page = PagerUtil.queryToPage(pq);
-        IPage<ScmSpecialRebateWithVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<ScmSpecialRebateWithVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void saveOrUpdateDto(ScmSpecialRebateWithDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return;
-        }
-        this.updateByDto(dto);
-    }
 
     public void insertByDto(ScmSpecialRebateWithDto dto) {
         ScmSpecialRebateWith entity = new ScmSpecialRebateWith();
@@ -105,23 +66,6 @@ public class ScmSpecialRebateWithService extends MybatisBaseService<ScmSpecialRe
         baseMapper.insert(entity);
     }
 
-    public void updateByDto(ScmSpecialRebateWithDto dto) {
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        }
-        ScmSpecialRebateWith entity = fetchBySid(dtoSid);
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.updateById(entity);
-    }
-
-    public ScmSpecialRebateWithDetailsVo fetchDetailsVoBySid(String sid) {
-        ScmSpecialRebateWith entity = fetchBySid(sid);
-        ScmSpecialRebateWithDetailsVo vo = new ScmSpecialRebateWithDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
-
     public void delByMainSid(String dtoSid) {
         baseMapper.delByMainSid(dtoSid);
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.java

@@ -59,4 +59,6 @@ public interface ScmSpecialRebateWithApplyMapper extends BaseMapper<ScmSpecialRe
 	int selectBySid(String join);
 
 	int updateFlowFiled(Map<String, Object> beanToMap);
+
+	String selectNum(String billNo);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml

@@ -43,4 +43,12 @@
         </if>
         WHERE sid=#{sid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from scm_special_rebate_with_apply
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+            limit 1
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java

@@ -55,100 +55,100 @@ import java.util.List;
  * @since 1.0
  */
 @Api(tags = "专项返利预提申请表")
-@RestController("com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyRest")
+@RestController
 @RequestMapping("v1/scmspecialrebatewithapply")
 public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyFeign {
 
-	@Autowired
+    @Autowired
-	private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService;
+    private ScmSpecialRebateWithApplyService scmSpecialRebateWithApplyService;
-
+
-	@Override
+    @Override
-	public ResultBean rePushVoucher(String sid) {
+    public ResultBean rePushVoucher(String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid);
+        scmSpecialRebateWithApplyService.pushSpecialRebateWithVoucher(sid);
-		return rb.success();
+        return rb.success();
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
+    @PostMapping("/listPage")
-	public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq){
+    public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		PagerVo<ScmSpecialRebateWithApplyVo> pv = scmSpecialRebateWithApplyService.listPageVo(pq);
+        PagerVo<ScmSpecialRebateWithApplyVo> pv = scmSpecialRebateWithApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
+        return rb.success().setData(pv);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("新增或修改")
+    @ApiOperation("新增或修改")
-	@PostMapping("/save")
+    @PostMapping("/save")
-	public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto){
+    public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto) {
-		return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto);
+        return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
-		return scmSpecialRebateWithApplyService.delAll(sids);
+        return scmSpecialRebateWithApplyService.delAll(sids);
-	}
+    }
 
-	@Override
+    @Override
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<ScmSpecialRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-		return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid);
+        return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
+    public ResultBean submitSpecialRebateWithApply(SubmitScmSpecialRebateWithApplyDto dto) {
-		return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto);
+        return scmSpecialRebateWithApplyService.submitSpecialRebateWithApply(dto);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) {
+    public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) {
-		BusinessVariables bv = new BusinessVariables();
+        BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(dto, bv);
+        BeanUtil.copyProperties(dto, bv);
-		bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
+        bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId());
-		return scmSpecialRebateWithApplyService.complete(bv);
+        return scmSpecialRebateWithApplyService.complete(bv);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
-		return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo);
+        return scmSpecialRebateWithApplyService.revokeProcess(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
-		return scmSpecialRebateWithApplyService.taskReject(flowTaskVo);
+        return scmSpecialRebateWithApplyService.taskReject(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
-		return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo);
+        return scmSpecialRebateWithApplyService.breakProcess(flowTaskVo);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean flowRecord(String procInsId) {
+    public ResultBean flowRecord(String procInsId) {
-		return scmSpecialRebateWithApplyService.flowRecord(procInsId);
+        return scmSpecialRebateWithApplyService.flowRecord(procInsId);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
-		return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query);
+        return scmSpecialRebateWithApplyService.getNextNodesForSubmit(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
-		return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query);
+        return scmSpecialRebateWithApplyService.getPreviousNodesForReject(query);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) {
+    public ResultBean delegate(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) {
-		return scmSpecialRebateWithApplyService.delegate(delegateQuery);
+        return scmSpecialRebateWithApplyService.delegate(delegateQuery);
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) {
+    public ResultBean assignTask(ScmSpecialRebateWithApplyDelegateQuery delegateQuery) {
-		return scmSpecialRebateWithApplyService.assignTask(delegateQuery);
+        return scmSpecialRebateWithApplyService.assignTask(delegateQuery);
-	}
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.biz.scmspecialrebatewithapply;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -33,6 +34,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@@ -167,6 +169,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         if (StringUtils.isNotBlank(query.getCreateOrgName())) {
             qw.like("ssrwa.createOrgName", query.getCreateOrgName());
         }
+        if (StringUtils.isNotBlank(query.getDeptName())) {
+            qw.like("ssrwa.deptName", query.getDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("ssrwa.createByName", query.getCreateByName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("ssrwa.billNo", query.getBillNo());
+        }
         if (StringUtils.isNotBlank(query.getWithApply())) {
             qw.like("ssrwa.withApply", query.getWithApply());
         }
@@ -196,6 +207,18 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
             return rb.setMsg("请选择专项返利信息");
         }
         if (StringUtils.isBlank(dtoSid)) {
+            //生成单据编号
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+            billNo = "ZXFLYT" + sysOrganizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            dto.setBillNo(billNo);
             String sid = this.insertByDto(dto).getData();
             for (ScmSpecialRebateWithDto scmSpecialRebateWithDto : scmSpecialRebateWiths) {
                 List<String> specialRebateSids = scmSpecialRebateWithDto.getSpecialRebateSids();

工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc

@@ -2,9 +2,8 @@
 
                                  预付款申请
 
-河北安瑞汽车租赁集团有限公司
+${createOrgName!}                         创建时间：${createTime!}
-创建时间：${createTime!}
+|审批编号     |${applyCode!}   |付款编号        |${payCode!}     |
-|审批编号     |${applyCode!}                                    |
 |创建人       |${createByName!}                                 |
 |创建人部门   |${createByDeptName!}                             |
 |费用所属公司 |${createOrgName!}                                |