yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 4 months ago
parent
20c4b52c69
commit
8bb71028a2
48 changed files with 481 additions and 706 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/dictcommon/DictCommonMapper.xml
  2. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApply.java
  3. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
  4. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
  5. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
  6. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
  7. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java
  8. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java
  9. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java
  10. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java
  11. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java
  12. 22
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyQuery.java
  13. 38
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java
  14. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java
  15. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java
  16. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java
  17. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java
  18. 22
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java
  19. 57
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailQuery.java
  20. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java
  21. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/ScmSpecialRebateWithFeign.java
  22. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApply.java
  23. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDetailsVo.java
  24. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyDto.java
  25. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java
  26. 19
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyQuery.java
  27. 24
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyVo.java
  28. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
  29. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  30. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.java
  31. 11
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyMapper.xml
  32. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  33. 28
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  34. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java
  35. 19
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
  36. 44
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java
  37. 51
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java
  38. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java
  39. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml
  40. 46
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java
  41. 56
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java
  42. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.java
  43. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyMapper.xml
  44. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java
  45. 23
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  46. 5
      工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc

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

@ -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>

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

@ -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("部门")

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

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

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

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

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

@ -55,14 +55,16 @@ public class ScmCollectionRebateWithApplyQuery implements Query {
private String deptName;
@ApiModelProperty("创建人姓名")
private String createByName;
@ApiModelProperty("回款申请标题")
private String collectionApply;
@ApiModelProperty("单据编号")
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;

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

@ -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")

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

@ -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;
}

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

@ -50,6 +50,8 @@ import lombok.Data;
public class ScmSpecialrebateCheckapply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

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

@ -58,11 +58,13 @@ 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("申请部门名称")

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

@ -58,6 +58,8 @@ public class ScmSpecialrebateCheckapplyDto implements Dto {
private String createBySid; // 创建人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

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

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

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

@ -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; // 核对申请标题
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
private String checkApply;
private String userSid;
private String orgPath;

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

@ -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; // 创建日期
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@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; // 调整金额
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
private String adjustmentMoney;
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
private String procInstId;
}

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

@ -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("一次核对状态")

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

@ -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("预提日期(页面展示)")

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

@ -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("一次核对状态")

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

@ -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

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

@ -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;

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

@ -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
}

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

@ -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("一次核对状态")

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

@ -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

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

@ -50,6 +50,8 @@ import lombok.Data;
public class ScmSpecialRebateWithApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

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

@ -59,6 +59,8 @@ public class ScmSpecialRebateWithApplyDetailsVo implements Vo {
private String createBySid; // 申请人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

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

@ -57,6 +57,8 @@ public class ScmSpecialRebateWithApplyDto implements Dto {
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请部门sid")
private String deptSid;
@ApiModelProperty("申请部门名称")

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

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

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

@ -51,17 +51,20 @@ public class ScmSpecialRebateWithApplyQuery implements Query {
@ApiModelProperty("分公司名称")
private String createOrgName;
@ApiModelProperty("预提申请")
private String withApply; // 预提申请
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@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 nodeState;
@ApiModelProperty("预提申请")
private String withApply;
private String userSid;
private String orgPath;

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

@ -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")

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

@ -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>

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

@ -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());
}

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

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

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

@ -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>

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

@ -52,14 +52,14 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
@Override
public ResultBean rePushVoucher(String sid) {
ResultBean rb = ResultBean.fireFail();
scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid,"1");
scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1");
return rb.success();
}
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq){
public ResultBean<PagerVo<ScmSpecialrebateCheckapplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialrebateCheckapplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialrebateCheckapplyVo> pv = scmSpecialrebateCheckapplyService.listPageVo(pq);
return rb.success().setData(pv);
@ -68,21 +68,21 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto){
public ResultBean save(@RequestBody ScmSpecialrebateCheckapplyDto dto) {
return scmSpecialrebateCheckapplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
public ResultBean delBySids(@RequestBody String[] sids) {
return scmSpecialrebateCheckapplyService.delAll(sids);
}
@Override
@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);
}

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

@ -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);

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

@ -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,8 +39,6 @@ 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}")
void delByMainSid(String sid);

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

@ -3,17 +3,12 @@
<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,
COUNT(*) num,
@ -29,12 +24,14 @@
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,
ssc.brandName,
ssc.withholdingDate,
SUM(ssc.estimateRebate) withRebate,
COUNT(*) num,
GROUP_CONCAT(ssc.specialRebateSid) specialRebateSid,
@ -49,7 +46,7 @@
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">

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

@ -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);

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

@ -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);
}

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

@ -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);

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

@ -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,

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

@ -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);

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

@ -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);
}

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

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

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

@ -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>

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

@ -55,7 +55,7 @@ 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 {
@ -72,7 +72,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq){
public ResultBean<PagerVo<ScmSpecialRebateWithApplyVo>> listPage(@RequestBody PagerQuery<ScmSpecialRebateWithApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmSpecialRebateWithApplyVo> pv = scmSpecialRebateWithApplyService.listPageVo(pq);
return rb.success().setData(pv);
@ -81,21 +81,21 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto){
public ResultBean save(@RequestBody ScmSpecialRebateWithApplyDto dto) {
return scmSpecialRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
public ResultBean delBySids(@RequestBody String[] sids) {
return scmSpecialRebateWithApplyService.delAll(sids);
}
@Override
@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);
}

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

@ -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();

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

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

Write Preview
Loading…
Cancel
Save