diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchaseBackBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchaseBackBillFeign.java new file mode 100644 index 0000000000..979b83e28b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchaseBackBillFeign.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill; + +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillDto; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "采购单申请") +@FeignClient( + contextId = "terminal-AppPurchaseBackBill", + name = "anrui-terminal", + path = "v1/pmspurchasebackbill") +public interface AppPurchaseBackBillFeign { + + @ApiOperation("采购退库单详情回显") + @GetMapping("/fetchDetailsBySid2/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + /**********************************************流程********************************************/ + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody PurchaseBackBillDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody PurchaseBackBillTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody PurchaseBackBillTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody PurchaseBackBillTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap PurchaseBackBillQuery query); + + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java new file mode 100644 index 0000000000..63460e868d --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackBillDetailsVo.java @@ -0,0 +1,123 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackbill.PmsPurchasebackBillVo
+ * Description: 采购退货单据 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购退货单据 视图数据详情", description = "采购退货单据 视图数据详情") +public class AppPurchasebackBillDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("退误差调整金额") + private BigDecimal backErrorAmount; // 退误差调整金额 + + @ApiModelProperty("退运费") + private BigDecimal backFreight; + + @ApiModelProperty("退优惠金额") + private BigDecimal backDiscountAmount; // 退优惠金额 + @ApiModelProperty("抵扣欠款") + private BigDecimal deductDebts; // 抵扣欠款 + @ApiModelProperty("抵扣单号") + private String deductBillNo; // 抵扣单号 + @ApiModelProperty("转入预付款") + private BigDecimal toPrepayment; // 转入预付款 + + @ApiModelProperty("已付金额") + private BigDecimal paidAmount; + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; + + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + + @ApiModelProperty("采购退货单明细") + private List pmsPurchasebackDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java new file mode 100644 index 0000000000..2e77896699 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/AppPurchasebackDetailDetailsVo.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackdetail.PmsPurchasebackDetailVo
+ * Description: 采购退货单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情") +public class AppPurchasebackDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码(图号)") + private String goodsSkuCode; // 商品编码(图号) + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("采购订单sid") + private String manufactorBillSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; // 已退数量 + @ApiModelProperty("退货数量") + private BigDecimal backCount; // 退货数量 + + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + + @ApiModelProperty("退货金额") + private BigDecimal backAmount; // 退货金额 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..51aeb928dc --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/AppDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 10:16 + */ +@Data +public class AppDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillDto.java new file mode 100644 index 0000000000..5967ab610b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:09 + * @Description + */ +@Data +public class PurchaseBackBillDto implements Dto { + private static final long serialVersionUID = 3626473483180150495L; + + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误:procInsId") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误:userSid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillQuery.java new file mode 100644 index 0000000000..362b7ba884 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:15 + * @Description + */ +@Data +public class PurchaseBackBillQuery implements Query { + private static final long serialVersionUID = 5514095179438249641L; + + @ApiModelProperty(value = "节点key") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + @NotNull(message = "参数错误:next") + private Integer next; + + @ApiModelProperty("组织机构全路径") + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillTaskQuery.java new file mode 100644 index 0000000000..0922449c32 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/pmspurchasebackbill/flowable/PurchaseBackBillTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/8/9 14:11 + * @Description + */ +@Data +public class PurchaseBackBillTaskQuery implements Query { + private static final long serialVersionUID = -7082170710942810289L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") + private String instanceId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillRest.java new file mode 100644 index 0000000000..c3b331aea2 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillRest.java @@ -0,0 +1,87 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.pms.pmspurchasebackbill; + +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.AppPurchaseBackBillFeign; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.AppPurchasebackBillDetailsVo; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillDto; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api(tags = "采购退货单") +@RestController +@RequestMapping("v1/pmspurchasebackbill") +public class AppPurchaseBackBillRest implements AppPurchaseBackBillFeign { + + @Autowired + private AppPurchaseBackBillService appPurchaseBackBillService; + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return appPurchaseBackBillService.fetchDetailsBySid(sid); + } + + @Override + public ResultBean agreeCreditInfo(PurchaseBackBillDto dto) { + return appPurchaseBackBillService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(PurchaseBackBillTaskQuery query) { + return appPurchaseBackBillService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(PurchaseBackBillTaskQuery query) { + return appPurchaseBackBillService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(PurchaseBackBillTaskQuery query) { + return appPurchaseBackBillService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(PurchaseBackBillQuery query) { + return appPurchaseBackBillService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppDelegateQuery delegateQuery) { + return appPurchaseBackBillService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + return appPurchaseBackBillService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java new file mode 100644 index 0000000000..39fe5cc006 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/pmspurchasebackbill/AppPurchaseBackBillService.java @@ -0,0 +1,170 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.pms.pmspurchasebackbill; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.AppPurchasebackBillDetailsVo; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillDto; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.PurchaseBackBillTaskQuery; +import com.yxt.anrui.terminal.api.pms.pmspurchasebackbill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.PmsPurchaseBackBillFeign; +import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.PmsPurchasebackBillDetailsVo; +import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class AppPurchaseBackBillService { + + @Resource + private PmsPurchaseBackBillFeign pmsPurchaseBackBillFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillDetailsVo data = pmsPurchaseBackBillFeign.fetchDetailsBySid(sid).getData(); + AppPurchasebackBillDetailsVo appPurchasebackBillDetailsVo = new AppPurchasebackBillDetailsVo(); + BeanUtil.copyProperties(data,appPurchasebackBillDetailsVo); + return rb.success().setData(appPurchasebackBillDetailsVo); + } + + public ResultBean agreeCreditInfo(PurchaseBackBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + PmsPurchasebackBillCompleteDto purchasebackBillCompleteDto = new PmsPurchasebackBillCompleteDto(); + BeanUtil.copyProperties(dto, purchasebackBillCompleteDto); + purchasebackBillCompleteDto.setOrgPath(orgSidPath); + ResultBean resultBean = pmsPurchaseBackBillFeign.complete(purchasebackBillCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(PurchaseBackBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillTaskQuery purchasebackBillTaskQuery = new PmsPurchasebackBillTaskQuery(); + BeanUtil.copyProperties(query, purchasebackBillTaskQuery); + ResultBean resultBean = pmsPurchaseBackBillFeign.reject(purchasebackBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(PurchaseBackBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillTaskQuery purchasebackBillTaskQuery = new PmsPurchasebackBillTaskQuery(); + BeanUtil.copyProperties(query, purchasebackBillTaskQuery); + ResultBean resultBean = pmsPurchaseBackBillFeign.revokeProcess(purchasebackBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(PurchaseBackBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillTaskQuery purchasebackBillTaskQuery = new PmsPurchasebackBillTaskQuery(); + BeanUtil.copyProperties(query, purchasebackBillTaskQuery); + ResultBean resultBean = pmsPurchaseBackBillFeign.breakProcess(purchasebackBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(PurchaseBackBillQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + PmsPurchasebackBillNodeQuery getNodeQuery = new PmsPurchasebackBillNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> previousNodesForReject = pmsPurchaseBackBillFeign.getPreviousNodesForReject(getNodeQuery); + if (previousNodesForReject.getSuccess()) { + previousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = previousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(previousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = pmsPurchaseBackBillFeign.getNextNodesForSubmit(getNodeQuery); + if (getNextNodesForSubmit.getSuccess()) { + getNextNodesForSubmit.getData().removeAll(Collections.singleton(null)); + data = getNextNodesForSubmit.getData().get(0).getName(); + } else { + return rb.setMsg(getNextNodesForSubmit.getMsg()); + } + } else { + return rb.setMsg("参数错误:next"); + } + return rb.success().setData(data); + } + + public ResultBean delegate(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillDelegateQuery delegateQuery1 = new + PmsPurchasebackBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + pmsPurchaseBackBillFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchasebackBillDelegateQuery delegateQuery1 = new + PmsPurchasebackBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + pmsPurchaseBackBillFeign.assignTask(delegateQuery1); + return rb.success(); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchaseBackBillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchaseBackBillFeign.java new file mode 100644 index 0000000000..b8efd140a4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchaseBackBillFeign.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill; + +import com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable.*; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @description: 商品基础信息 + * @author: fzz + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-pms-PmsPurchaseBackBill", + name = "yxt-pms", + path = "v1/pmspurchasebackbill" +) +public interface PmsPurchaseBackBillFeign { + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody PmsPurchasebackBillCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody PmsPurchasebackBillTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody PmsPurchasebackBillDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody PmsPurchasebackBillDelegateQuery query); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java new file mode 100644 index 0000000000..5b76c34616 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java @@ -0,0 +1,123 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackBillVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackbill.PmsPurchasebackBillVo
+ * Description: 采购退货单据 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购退货单据 视图数据详情", description = "采购退货单据 视图数据详情") +public class PmsPurchasebackBillDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("退误差调整金额") + private BigDecimal backErrorAmount; // 退误差调整金额 + + @ApiModelProperty("退运费") + private BigDecimal backFreight; + + @ApiModelProperty("退优惠金额") + private BigDecimal backDiscountAmount; // 退优惠金额 + @ApiModelProperty("抵扣欠款") + private BigDecimal deductDebts; // 抵扣欠款 + @ApiModelProperty("抵扣单号") + private String deductBillNo; // 抵扣单号 + @ApiModelProperty("转入预付款") + private BigDecimal toPrepayment; // 转入预付款 + + @ApiModelProperty("已付金额") + private BigDecimal paidAmount; + @ApiModelProperty("应付金额") + private BigDecimal payableAmount; + @ApiModelProperty("应收金额") + private BigDecimal receivableAmount; + + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("流程定义的id") + private String procDefId; // 流程定义的id + @ApiModelProperty("环节定义的sid") + private String nodeId; // 环节定义的sid + @ApiModelProperty("流程实例的sid") + private String procInstId; // 流程实例的sid + @ApiModelProperty("流程状态") + private String nodeState; // 流程状态 + @ApiModelProperty("任务id") + private String taskId; // 任务id + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("创建组织名称") + private String createOrgName; + + @ApiModelProperty("采购退货单明细") + private List pmsPurchasebackDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java new file mode 100644 index 0000000000..dda10b2039 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/PmsPurchasebackDetailDetailsVo.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasebackDetailVo.java
+ * Class: com.yxt.pms.api.pmspurchasebackdetail.PmsPurchasebackDetailVo
+ * Description: 采购退货单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 16:16:12
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购退货单据明细 视图数据详情", description = "采购退货单据明细 视图数据详情") +public class PmsPurchasebackDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品基础信息Sid") + private String goodsSpuSid; // 商品基础信息Sid + @ApiModelProperty("商品名称") + private String goodsSpuName; // 商品名称 + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; // 商品Skusid + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; // 商品Sku名称 + @ApiModelProperty("商品编码(图号)") + private String goodsSkuCode; // 商品编码(图号) + @ApiModelProperty("规格") + private String goodsSkuOwnSpec; // 规格 + @ApiModelProperty("计量单位") + private String unit; // 计量单位 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库名称") + private String warehouseName; // 仓库名称 + + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("采购订单sid") + private String manufactorBillSid; + @ApiModelProperty("厂家订单号") + private String manufactorBillNo; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; // 已退数量 + @ApiModelProperty("退货数量") + private BigDecimal backCount; // 退货数量 + + @ApiModelProperty("采购数量") + private BigDecimal count; + @ApiModelProperty("采购金额") + private BigDecimal amount; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + + @ApiModelProperty("退货金额") + private BigDecimal backAmount; // 退货金额 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillCompleteDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillCompleteDto.java new file mode 100644 index 0000000000..375d40ff1c --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillCompleteDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 14:57 + * @Description + */ +@Data +public class PmsPurchasebackBillCompleteDto implements Dto { + private static final long serialVersionUID = 6378752532534735663L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + @ApiModelProperty(value = "流程id(PC)") + private String instanceId; + @ApiModelProperty(value = "流程id(移动)") + private String procInsId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillDelegateQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillDelegateQuery.java new file mode 100644 index 0000000000..5a0ea0f474 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class PmsPurchasebackBillDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; + + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeQuery.java new file mode 100644 index 0000000000..c166f11222 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:04 + * @Description + */ +@Data +public class PmsPurchasebackBillNodeQuery implements Query { + private static final long serialVersionUID = 9117613683840483366L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误:taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeVo.java new file mode 100644 index 0000000000..4673664276 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillNodeVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:03 + * @Description + */ +@Data +public class PmsPurchasebackBillNodeVo implements Vo { + private static final long serialVersionUID = -833419512294877848L; + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillTaskQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillTaskQuery.java new file mode 100644 index 0000000000..ae904f2a13 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebackbill/flowable/PmsPurchasebackBillTaskQuery.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebackbill.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:06 + * @Description + */ +@Data +public class PmsPurchasebackBillTaskQuery implements Query { + private static final long serialVersionUID = 1288615499873178778L; + + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误:taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误:businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回、驳回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id(PC)") + private String instanceId; + + @ApiModelProperty("流程实例Id(移动)") + private String procInsId; +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java index 2fcc5e44fc..08f3c2c6bf 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java @@ -148,4 +148,11 @@ public class PmsPurchasebackBillRest { public ResultBean delegate(@RequestBody PmsPurchasebackBillDelegateQuery query) { return pmsPurchasebackBillService.delegate(query); } + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody PmsPurchasebackBillDelegateQuery query){ + return pmsPurchasebackBillService.assignTask(query); + } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index 56713c0c0c..4be3f9dacc 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -551,4 +551,12 @@ public class PmsPurchasebackBillService extends MybatisBaseService