From 3520f5508523dcfc71924ab94a6024fa259f4f00 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 30 Aug 2024 14:42:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyService.java | 2 + .../ScmCollectionRebateDto.java | 2 + .../AppPurchaseBillDetailDetailsVo.java | 97 ++++++++++ .../AppPurchaseBillDetailsVo.java | 161 ++++++++++++++++ .../purchasebill/AppPurchaseBillFeign.java | 66 +++++++ .../AppPurchaseBillInvoiceDetailsVo.java | 67 +++++++ .../purchasebill/AppPurchasePayDetailsVo.java | 68 +++++++ .../flowable/AppDelegateQuery.java | 25 +++ .../flowable/PurchaseBillDto.java | 37 ++++ .../flowable/PurchaseBillQuery.java | 28 +++ .../flowable/PurchaseBillTaskQuery.java | 47 +++++ .../pms/purchasebill/AppPurchaseBillRest.java | 86 +++++++++ .../purchasebill/AppPurchaseBillService.java | 178 ++++++++++++++++++ .../PmsPurchaseBillDetailDetailsVo.java | 97 ++++++++++ .../PmsPurchaseBillDetailsVo.java | 175 +++++++++++++++++ .../pmspurchasebill/PmsPurchaseBillFeign.java | 66 +++++++ .../PmsPurchaseBillInvoiceDetailsVo.java | 81 ++++++++ .../PmsPurchasePayDetailsVo.java | 81 ++++++++ .../pmspurchasebill/PmsPurchasePayFile.java | 35 ++++ .../flowable/PmsPurchaseBillCompleteDto.java | 37 ++++ .../PmsPurchaseBillDelegateQuery.java | 26 +++ .../flowable/PmsPurchaseBillNodeQuery.java | 25 +++ .../flowable/PmsPurchaseBillNodeVo.java | 26 +++ .../flowable/PmsPurchaseBillTaskQuery.java | 48 +++++ .../pmspurchasebill/PmsPurchaseBillDto.java | 2 +- .../pmspurchasebill/PmsPurchaseBillFeign.java | 2 +- .../pms/apiadmin/pms/PmsPurchaseBillRest.java | 9 +- .../pms/pmspurchasebill/PmsPurchaseBill.java | 2 +- .../PmsPurchaseBillDetailsVo.java | 2 +- .../pmspurchasebill/PmsPurchaseBillDto.java | 2 +- .../PmsPurchaseBillExportVo.java | 2 +- .../PmsPurchaseBillMapper.java | 2 +- .../pmspurchasebill/PmsPurchaseBillQuery.java | 2 +- .../PmsPurchaseBillService.java | 10 +- .../pmspurchasebill/PmsPurchaseBillVo.java | 2 +- .../PmsPurchaseChoiceBillDetailsVo.java | 2 +- .../PmsPurchaseChoiceBillQuery.java | 2 +- .../PmsPurchaseChoiceBillVo.java | 2 +- 38 files changed, 1590 insertions(+), 14 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/AppDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillTaskQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillFeign.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayDetailsVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayFile.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillCompleteDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillTaskQuery.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index a10d189ade..5bd306d55e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -533,6 +533,8 @@ public class FinPaymentapplyService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.purchasebill; + + +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: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.pmspurchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情") +public class AppPurchaseBillDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; // 商品基础信息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("单位成本(进货价)") + private BigDecimal cost; // 单位成本(进货价) + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java new file mode 100644 index 0000000000..4a9211d3fa --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillDetailsVo.java @@ -0,0 +1,161 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.purchasebill; + +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; + +@Data +@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情") +public class AppPurchaseBillDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("来源单sid(工单sid)") + private String sourceBillSid; + @ApiModelProperty("来源单编号/外部编号") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + + @ApiModelProperty("经营品牌Key") + private String operateBrandKey; + @ApiModelProperty("经营品牌Value") + private String operateBrandValue; + @ApiModelProperty("仓库类型Key") + private String warehouseTypeKey; + @ApiModelProperty("仓库类型Value") + private String warehouseTypeValue; + + @ApiModelProperty("采购类型Key") + private String purchaseTypeKey; + @ApiModelProperty("采购类型Value(厂家采购、外采、其他)") + private String purchaseTypeValue; + + @ApiModelProperty("采购原因key") + private String purchaseReasonKey; + @ApiModelProperty("采购原因(储备/客户订单/在修车辆)") + private String purchaseReasonValue; + @ApiModelProperty("付款方式key") + private String payTypeKey; + @ApiModelProperty("付款方式value(预付款/月结/单笔付款)") + private String payTypeValue; + + @ApiModelProperty("厂家订单类型key") + private String manufacturersOrderTypeKey; + @ApiModelProperty("厂家订单类型value") + private String manufacturersOrderTypeValue; + @ApiModelProperty("厂家订单号") + private String manufacturersOrderNumber; + + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("供应商联系电话") + private String supplierPhone; + @ApiModelProperty("采购员sid(单选)") + private String purchaserSid; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date deliveryDate; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("应付金额(=采购金额+运费-优惠金额)") + private BigDecimal payableAmount; + + @ApiModelProperty("当前预付款项金额") + private BigDecimal prepaymentAmount; + @ApiModelProperty("累计欠款金额") + private BigDecimal owedAmount; + + @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 String orgPath; + + @ApiModelProperty("采购人") + private String purchasingAgent; + @ApiModelProperty("采购人sid") + private String purchasingAgentSid; + + @ApiModelProperty("付款信息") + private AppPurchasePayDetailsVo purchasePay; + @ApiModelProperty("发票信息") + private AppPurchaseBillInvoiceDetailsVo purchaseBillInvoice; + @ApiModelProperty("采购单商品明细") + private List purchaseBillDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillFeign.java new file mode 100644 index 0000000000..9a92e3be3e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillFeign.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.api.pms.purchasebill; + +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillDto; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillTaskQuery; +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-AppPurchaseBill", + name = "anrui-terminal", + path = "v1/purchasebill") +public interface AppPurchaseBillFeign { + + @ApiOperation("采购单详情回显") + @GetMapping("/fetchDetailsBySid2/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + /**********************************************流程********************************************/ + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody PurchaseBillDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody PurchaseBillTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody PurchaseBillTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody PurchaseBillTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap PurchaseBillQuery 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/purchasebill/AppPurchaseBillInvoiceDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java new file mode 100644 index 0000000000..cd5a66a7b3 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchaseBillInvoiceDetailsVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.purchasebill; + +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; + +@Data +@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情") +public class AppPurchaseBillInvoiceDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票(是1,否0)") + private String isInvoicing; // 是否需要开发票(是1,否0) + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java new file mode 100644 index 0000000000..66a52c3789 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/AppPurchasePayDetailsVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.pms.purchasebill; + +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.ArrayList; +import java.util.List; + +@Data +@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情") +public class AppPurchasePayDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否先付货款 0否,1是") + private String isFirstPay; // 是否先付货款 0否,1是 + @ApiModelProperty("订金") + private BigDecimal deposit; // 订金 + @ApiModelProperty("货款") + private BigDecimal goodsMoney; // 货款 + @ApiModelProperty("收款账户") + private String accountName; // 收款账户 + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("收款账号") + private String bankAccount; // 收款账号 + @ApiModelProperty("其他费用名称") + private String otherAmountName; // 其他费用名称 + @ApiModelProperty("其他费用金额") + private BigDecimal otherAmount; // 其他费用金额 + @ApiModelProperty("付款备注") + private String payRemark; // 付款备注 + @ApiModelProperty("附件") + private List appFilePaths = new ArrayList<>(); // 附件 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..7f886e61a7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/AppDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.pms.purchasebill.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/purchasebill/flowable/PurchaseBillDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillDto.java new file mode 100644 index 0000000000..2845ceac3f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.pms.purchasebill.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 PurchaseBillDto 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/purchasebill/flowable/PurchaseBillQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillQuery.java new file mode 100644 index 0000000000..0abed8d871 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.pms.purchasebill.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 PurchaseBillQuery 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/purchasebill/flowable/PurchaseBillTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillTaskQuery.java new file mode 100644 index 0000000000..909ee5a1b5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/pms/purchasebill/flowable/PurchaseBillTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.pms.purchasebill.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 PurchaseBillTaskQuery 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/purchasebill/AppPurchaseBillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillRest.java new file mode 100644 index 0000000000..2ed3b0f4f9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillRest.java @@ -0,0 +1,86 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.pms.purchasebill; + +import com.yxt.anrui.terminal.api.pms.purchasebill.AppPurchaseBillDetailsVo; +import com.yxt.anrui.terminal.api.pms.purchasebill.AppPurchaseBillFeign; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillDto; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillTaskQuery; +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.*; + +@Api(tags = "采购单") +@RestController +@RequestMapping("v1/purchasebill") +public class AppPurchaseBillRest implements AppPurchaseBillFeign { + + @Autowired + private AppPurchaseBillService appPurchaseBillService; + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return appPurchaseBillService.fetchDetailsVoBySid(sid); + } + + @Override + public ResultBean agreeCreditInfo(PurchaseBillDto dto) { + return appPurchaseBillService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(PurchaseBillTaskQuery query) { + return appPurchaseBillService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(PurchaseBillTaskQuery query) { + return appPurchaseBillService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(PurchaseBillTaskQuery query) { + return appPurchaseBillService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(PurchaseBillQuery query) { + return appPurchaseBillService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppDelegateQuery delegateQuery) { + return appPurchaseBillService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + return appPurchaseBillService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java new file mode 100644 index 0000000000..06f504a370 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/pms/purchasebill/AppPurchaseBillService.java @@ -0,0 +1,178 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.pms.purchasebill; + +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.purchasebill.AppPurchaseBillDetailsVo; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillDto; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillQuery; +import com.yxt.anrui.terminal.api.pms.purchasebill.flowable.PurchaseBillTaskQuery; +import com.yxt.anrui.terminal.fegin.pmspurchasebill.PmsPurchaseBillDetailsVo; +import com.yxt.anrui.terminal.fegin.pmspurchasebill.PmsPurchaseBillFeign; +import com.yxt.anrui.terminal.fegin.pmspurchasebill.PmsPurchasePayFile; +import com.yxt.anrui.terminal.fegin.pmspurchasebill.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.ArrayList; +import java.util.Collections; +import java.util.List; + +@Service +public class AppPurchaseBillService { + + @Resource + private PmsPurchaseBillFeign pmsPurchaseBillFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean fetchDetailsVoBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillDetailsVo data = pmsPurchaseBillFeign.fetchDetailsBySid(sid).getData(); + AppPurchaseBillDetailsVo appPurchaseBillDetailsVo = new AppPurchaseBillDetailsVo(); + BeanUtil.copyProperties(data,appPurchaseBillDetailsVo); + List filePaths = data.getPurchasePay().getFilePaths(); + List appfiles = new ArrayList<>(); + for (PmsPurchasePayFile filePath : filePaths) { + appfiles.add(filePath.getUrl()); + } + appPurchaseBillDetailsVo.getPurchasePay().setAppFilePaths(appfiles); + return rb.success().setData(appPurchaseBillDetailsVo); + } + + public ResultBean agreeCreditInfo(PurchaseBillDto 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(); + PmsPurchaseBillCompleteDto purchaseBillCompleteDto = new PmsPurchaseBillCompleteDto(); + BeanUtil.copyProperties(dto, purchaseBillCompleteDto); + purchaseBillCompleteDto.setOrgPath(orgSidPath); + ResultBean resultBean = pmsPurchaseBillFeign.complete(purchaseBillCompleteDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(PurchaseBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillTaskQuery purchaseBillTaskQuery = new PmsPurchaseBillTaskQuery(); + BeanUtil.copyProperties(query, purchaseBillTaskQuery); + ResultBean resultBean = pmsPurchaseBillFeign.reject(purchaseBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(PurchaseBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillTaskQuery pmsPurchaseBillTaskQuery = new PmsPurchaseBillTaskQuery(); + BeanUtil.copyProperties(query, pmsPurchaseBillTaskQuery); + ResultBean resultBean = pmsPurchaseBillFeign.revokeProcess(pmsPurchaseBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(PurchaseBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillTaskQuery pmsPurchaseBillTaskQuery = new PmsPurchaseBillTaskQuery(); + BeanUtil.copyProperties(query, pmsPurchaseBillTaskQuery); + ResultBean resultBean = pmsPurchaseBillFeign.breakProcess(pmsPurchaseBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(PurchaseBillQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + PmsPurchaseBillNodeQuery getNodeQuery = new PmsPurchaseBillNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = pmsPurchaseBillFeign.getPreviousNodesForReject(getNodeQuery); + if (getPreviousNodesForReject.getSuccess()) { + getPreviousNodesForReject.getData().removeAll(Collections.singleton(null)); + data = getPreviousNodesForReject.getData().get(0).getName(); + } else { + return rb.setMsg(getPreviousNodesForReject.getMsg()); + } + } else if (next == 1) { + ResultBean> getNextNodesForSubmit = pmsPurchaseBillFeign.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(); + PmsPurchaseBillDelegateQuery delegateQuery1 = new + PmsPurchaseBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + pmsPurchaseBillFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + PmsPurchaseBillDelegateQuery delegateQuery1 = new + PmsPurchaseBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + pmsPurchaseBillFeign.assignTask(delegateQuery1); + return rb.success(); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java new file mode 100644 index 0000000000..87847a7177 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailDetailsVo.java @@ -0,0 +1,97 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + + +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: PmsPurchaseBillDetailVo.java
+ * Class: com.yxt.pms.api.pmspurchasebilldetail.PmsPurchaseBillDetailVo
+ * Description: 采购单据明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情") +public class PmsPurchaseBillDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; // 商品基础信息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("单位成本(进货价)") + private BigDecimal cost; // 单位成本(进货价) + @ApiModelProperty("采购数量") + private BigDecimal count; // 采购数量 + @ApiModelProperty("税额") + private BigDecimal taxAmount; // 税额 + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + @ApiModelProperty("采购金额") + private BigDecimal amount; // 采购金额 + + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + + @ApiModelProperty("已退数量") + private BigDecimal returnedCount; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailsVo.java new file mode 100644 index 0000000000..e02a7f3f2d --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillDetailsVo.java @@ -0,0 +1,175 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + + +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: PmsPurchaseBillVo.java
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
+ * Description: 采购单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-19 13:51:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情") +public class PmsPurchaseBillDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("来源单sid(工单sid)") + private String sourceBillSid; + @ApiModelProperty("来源单编号/外部编号") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + + @ApiModelProperty("经营品牌Key") + private String operateBrandKey; + @ApiModelProperty("经营品牌Value") + private String operateBrandValue; + @ApiModelProperty("仓库类型Key") + private String warehouseTypeKey; + @ApiModelProperty("仓库类型Value") + private String warehouseTypeValue; + + @ApiModelProperty("采购类型Key") + private String purchaseTypeKey; + @ApiModelProperty("采购类型Value(厂家采购、外采、其他)") + private String purchaseTypeValue; + + @ApiModelProperty("采购原因key") + private String purchaseReasonKey; + @ApiModelProperty("采购原因(储备/客户订单/在修车辆)") + private String purchaseReasonValue; + @ApiModelProperty("付款方式key") + private String payTypeKey; + @ApiModelProperty("付款方式value(预付款/月结/单笔付款)") + private String payTypeValue; + + @ApiModelProperty("厂家订单类型key") + private String manufacturersOrderTypeKey; + @ApiModelProperty("厂家订单类型value") + private String manufacturersOrderTypeValue; + @ApiModelProperty("厂家订单号") + private String manufacturersOrderNumber; + + @ApiModelProperty("误差调整金额") + private BigDecimal errorAmount; + + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商名称") + private String supplierName; + @ApiModelProperty("供应商联系电话") + private String supplierPhone; + @ApiModelProperty("采购员sid(单选)") + private String purchaserSid; + @ApiModelProperty("采购员姓名") + private String purchaserName; + @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date deliveryDate; + @ApiModelProperty("运费") + private BigDecimal freight; + @ApiModelProperty("优惠金额") + private BigDecimal discountAmount; + @ApiModelProperty("应付金额(=采购金额+运费-优惠金额)") + private BigDecimal payableAmount; + + @ApiModelProperty("当前预付款项金额") + private BigDecimal prepaymentAmount; + @ApiModelProperty("累计欠款金额") + private BigDecimal owedAmount; + + @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 String orgPath; + + @ApiModelProperty("采购人") + private String purchasingAgent; + @ApiModelProperty("采购人sid") + private String purchasingAgentSid; + + @ApiModelProperty("付款信息") + private PmsPurchasePayDetailsVo purchasePay; + @ApiModelProperty("发票信息") + private PmsPurchaseBillInvoiceDetailsVo purchaseBillInvoice; + @ApiModelProperty("采购单商品明细") + private List pmsPurchaseBillDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillFeign.java new file mode 100644 index 0000000000..22cc2ac2fa --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillFeign.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery; +import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo; +import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo; +import com.yxt.anrui.terminal.fegin.pmspurchasebill.flowable.*; +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.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-PmsPurchaseBill", + name = "yxt-pms", + path = "v1/pmspurchasebill" +) +public interface PmsPurchaseBillFeign { + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody PmsPurchaseBillCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody PmsPurchaseBillTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody PmsPurchaseBillDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody PmsPurchaseBillDelegateQuery query); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java new file mode 100644 index 0000000000..462eaab7b4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchaseBillInvoiceDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + + +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; + +/** + * Project: yxt-pms(采购发票)
+ * File: PmsPurchaseBillInvoiceVo.java
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo
+ * Description: 采购单-发票 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-08 09:51:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情") +public class PmsPurchaseBillInvoiceDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否需要开发票(是1,否0)") + private String isInvoicing; // 是否需要开发票(是1,否0) + @ApiModelProperty("票据类型key") + private String billTypeKey; // 票据类型key + @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)") + private String billType; // 票据类型(不含税、增值税、普通税、已含增值税) + @ApiModelProperty("开票名称") + private String invoicingName; // 开票名称 + @ApiModelProperty("税号") + private String taxpayerNo; // 税号 + @ApiModelProperty("发票代码") + private String invoiceCode; // 发票代码 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("开票日期") + private Date invoiceDate; // 开票日期 + @ApiModelProperty("发票金额") + private BigDecimal invoiceAmount; // 发票金额 + @ApiModelProperty("税率") + private BigDecimal taxRate; // 税率 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayDetailsVo.java new file mode 100644 index 0000000000..6acbdc584a --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayDetailsVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + + +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.List; + +/** + * Project: yxt-pms(采购)
+ * File: PmsPurchasePayVo.java
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo
+ * Description: 付款说明 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-06 15:43:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情") +public class PmsPurchasePayDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("是否先付货款 0否,1是") + private String isFirstPay; // 是否先付货款 0否,1是 + @ApiModelProperty("订金") + private BigDecimal deposit; // 订金 + @ApiModelProperty("货款") + private BigDecimal goodsMoney; // 货款 + @ApiModelProperty("收款账户") + private String accountName; // 收款账户 + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("收款账号") + private String bankAccount; // 收款账号 + @ApiModelProperty("其他费用名称") + private String otherAmountName; // 其他费用名称 + @ApiModelProperty("其他费用金额") + private BigDecimal otherAmount; // 其他费用金额 + @ApiModelProperty("付款备注") + private String payRemark; // 付款备注 + @ApiModelProperty("附件") + private List filePaths; // 附件 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayFile.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayFile.java new file mode 100644 index 0000000000..aad188172b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/PmsPurchasePayFile.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.pmspurchasebill; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class PmsPurchasePayFile implements Vo { + + private String url; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillCompleteDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillCompleteDto.java new file mode 100644 index 0000000000..2a65108542 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillCompleteDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill.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 PmsPurchaseBillCompleteDto 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/pmspurchasebill/flowable/PmsPurchaseBillDelegateQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillDelegateQuery.java new file mode 100644 index 0000000000..37fa750d22 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class PmsPurchaseBillDelegateQuery { + @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/pmspurchasebill/flowable/PmsPurchaseBillNodeQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeQuery.java new file mode 100644 index 0000000000..177792a1ca --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill.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 PmsPurchaseBillNodeQuery 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/pmspurchasebill/flowable/PmsPurchaseBillNodeVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeVo.java new file mode 100644 index 0000000000..2d425eb87b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillNodeVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill.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 PmsPurchaseBillNodeVo 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/pmspurchasebill/flowable/PmsPurchaseBillTaskQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillTaskQuery.java new file mode 100644 index 0000000000..21c307253a --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/pmspurchasebill/flowable/PmsPurchaseBillTaskQuery.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.terminal.fegin.pmspurchasebill.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 PmsPurchaseBillTaskQuery 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-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java index 8ee34d0a24..23c06ee77f 100644 --- a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java +++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillDto.java @@ -37,7 +37,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillDto.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillDto
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillDto
* Description: 采购单 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java index 2a4cb5d5e6..07f161a8ef 100644 --- a/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java +++ b/yxt-fms-biz/src/main/java/com/yxt/fms/feign/pms/pmspurchasebill/PmsPurchaseBillFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; @FeignClient( contextId = "yxt-pms-PmsPurchaseBill", name = "yxt-pms", - path = "/apiadmin/pms/pmspurchasebill", + path = "/apiadmin/pms/purchasebill", fallback = PmsPurchaseBillFeignFallback.class) public interface PmsPurchaseBillFeign { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java index 8f290aeb65..0977db3d83 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillRest.java @@ -49,7 +49,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillFeignFallback.java
- * Class: com.yxt.pms.biz.pmspurchasebill.PmsPurchaseBillRest
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillRest
* Description: 采购单.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -155,4 +155,11 @@ public class PmsPurchaseBillRest { public ResultBean delegate(@RequestBody PmsPurchaseBillDelegateQuery query) { return pmsPurchaseBillService.delegate(query); } + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody PmsPurchaseBillDelegateQuery query){ + return pmsPurchaseBillService.assignTask(query); + } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java index 280f4cce2f..e79ccdae18 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java @@ -38,7 +38,7 @@ import java.util.Date; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBill.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBill
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill
* Description: 采购单.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java index c91ebd541c..343268c285 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java @@ -48,7 +48,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
* Description: 采购单 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java index 0dceab15ab..5102669003 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java @@ -44,7 +44,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillDto.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillDto
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillDto
* Description: 采购单 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillExportVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillExportVo.java index f33216c2f5..6ac126fdc3 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillExportVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillExportVo.java @@ -38,7 +38,7 @@ import java.util.Date; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
* Description: 采购单 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java index c41f8cb91d..0d3562a830 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.java @@ -41,7 +41,7 @@ import java.util.Map; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillMapper.java
- * Class: com.yxt.pms.biz.pmspurchasebill.PmsPurchaseBillMapper
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper
* Description: 采购单.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java index 9b5ab7e6dc..76b3f01a43 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java @@ -39,7 +39,7 @@ import java.util.Date; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillQuery.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillQuery
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
* Description: 采购单 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index 3743836d8d..b2aa829fde 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -83,7 +83,7 @@ import java.util.stream.Collectors; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillService.java
- * Class: com.yxt.pms.biz.pmspurchasebill.PmsPurchaseBillService
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillService
* Description: 采购单 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -712,6 +712,14 @@ public class PmsPurchaseBillService extends MybatisBaseService * File: PmsPurchaseBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
* Description: 采购单 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java index a89a65907d..7cce2847e1 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillDetailsVo.java @@ -40,7 +40,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
* Description: 采购单 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java index 41940a2ddf..2ad232c791 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillQuery.java @@ -34,7 +34,7 @@ import lombok.Data; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillQuery.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillQuery
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery
* Description: 采购单 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java index 5d09f0a20a..ce1358b0cd 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseChoiceBillVo.java @@ -40,7 +40,7 @@ import java.util.List; /** * Project: yxt-pms(采购)
* File: PmsPurchaseBillVo.java
- * Class: com.yxt.pms.api.pmspurchasebill.PmsPurchaseBillVo
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo
* Description: 采购单 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315