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
index 979b83e28b..153899d3be 100644
--- 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
@@ -30,22 +30,22 @@ public interface AppPurchaseBackBillFeign {
/**********************************************流程********************************************/
@ApiOperation("办理")
- @PutMapping("/agreeCreditInfo")
+ @PutMapping("/agreePurchaseBackInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody PurchaseBackBillDto dto);
@ApiOperation("驳回")
- @PutMapping("/rejectCreditInfo")
+ @PutMapping("/rejectPurchaseBackInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody PurchaseBackBillTaskQuery query);
@ApiOperation("撤回")
- @PutMapping("/recallCreditInfo")
+ @PutMapping("/recallPurchaseBackInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody PurchaseBackBillTaskQuery query);
@ApiOperation("终止")
- @PutMapping("/stopCreditInfo")
+ @PutMapping("/stopPurchaseBackInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody PurchaseBackBillTaskQuery query);
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
index 9a92e3be3e..c513d18e6b 100644
--- 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
@@ -30,22 +30,22 @@ public interface AppPurchaseBillFeign {
/**********************************************流程********************************************/
@ApiOperation("办理")
- @PutMapping("/agreeCreditInfo")
+ @PutMapping("/agreePurchaseInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody PurchaseBillDto dto);
@ApiOperation("驳回")
- @PutMapping("/rejectCreditInfo")
+ @PutMapping("/rejectPurchaseInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody PurchaseBillTaskQuery query);
@ApiOperation("撤回")
- @PutMapping("/recallCreditInfo")
+ @PutMapping("/recallPurchaseInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody PurchaseBillTaskQuery query);
@ApiOperation("终止")
- @PutMapping("/stopCreditInfo")
+ @PutMapping("/stopPurchaseInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody PurchaseBillTaskQuery query);
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 0977db3d83..8d23911a45 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
@@ -26,7 +26,6 @@
package com.yxt.pms.apiadmin.pms;
import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@@ -39,127 +38,110 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.List;
-/**
- * Project: yxt-pms(采购)
- * File: PmsPurchaseBillFeignFallback.java
- * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillRest
- * 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
- */
@Api(tags = "采购单")
@RestController
@RequestMapping("v1/pmspurchasebill")
public class PmsPurchaseBillRest {
- @Autowired
- private PmsPurchaseBillService pmsPurchaseBillService;
-
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = pmsPurchaseBillService.listPageVo(pq);
- return rb.success().setData(pv);
- }
-
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody PmsPurchaseBillDto dto){
- ResultBean rb = ResultBean.fireFail();
- String sid = pmsPurchaseBillService.saveOrUpdateDto(dto);
- return rb.success().setData(sid);
- }
-
- @ApiOperation("维护厂家订单号")
- @PostMapping("/updateManuOrderNum")
- public ResultBean updateManuOrderNum(@RequestParam("sid") String sid,@RequestParam("manufacturersOrderNumber") String manufacturersOrderNumber){
- ResultBean rb = ResultBean.fireFail();
- pmsPurchaseBillService.updateManuOrderNum(sid,manufacturersOrderNumber);
- return rb.success().setData(sid);
- }
-
- @ApiOperation("根据sid批量删除")
+ @Autowired
+ private PmsPurchaseBillService pmsPurchaseBillService;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = pmsPurchaseBillService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody PmsPurchaseBillDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = pmsPurchaseBillService.saveOrUpdateDto(dto);
+ return rb.success().setData(sid);
+ }
+
+ @ApiOperation("维护厂家订单号")
+ @PostMapping("/updateManuOrderNum")
+ public ResultBean updateManuOrderNum(@RequestParam("sid") String sid, @RequestParam("manufacturersOrderNumber") String manufacturersOrderNumber) {
+ ResultBean rb = ResultBean.fireFail();
+ pmsPurchaseBillService.updateManuOrderNum(sid, manufacturersOrderNumber);
+ return rb.success().setData(sid);
+ }
+
+ @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- return pmsPurchaseBillService.delAll(sids);
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ return pmsPurchaseBillService.delAll(sids);
+ }
- @ApiOperation("根据SID获取一条记录")
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- PmsPurchaseBillDetailsVo vo = pmsPurchaseBillService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
-
- @ApiOperation("提交审批流程")
- @PostMapping("/submit")
- public ResultBean submit(@RequestBody @Valid SubmitPmsPurchaseBillDto dto) {
- return pmsPurchaseBillService.submit(dto);
- }
-
- @ApiOperation(value = "办理(同意)")
- @PostMapping("/complete")
- public ResultBean complete(@Valid @RequestBody PmsPurchaseBillCompleteDto query) {
- BusinessVariables bv = new BusinessVariables();
- BeanUtil.copyProperties(query, bv);
- bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId());
- return pmsPurchaseBillService.complete(bv);
- }
-
- @ApiOperation(value = "获取上一个环节")
- @GetMapping(value = "/getPreviousNodesForReject")
- public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query) {
- return pmsPurchaseBillService.getPreviousNodesForReject(query);
- }
-
- @ApiOperation(value = "获取下一个环节")
- @GetMapping(value = "/getNextNodesForSubmit")
- public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query) {
- return pmsPurchaseBillService.getNextNodesForSubmit(query);
- }
-
- @ApiOperation(value = "驳回任务")
- @PostMapping(value = "/reject")
- public ResultBean reject(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
- return pmsPurchaseBillService.reject(query);
- }
-
- @ApiOperation(value = "撤回流程")
- @PostMapping(value = "/revokeProcess")
- public ResultBean revokeProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
- return pmsPurchaseBillService.revokeProcess(query);
- }
-
- @ApiOperation(value = "终止任务")
- @PostMapping(value = "/breakProcess")
- public ResultBean breakProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
- return pmsPurchaseBillService.breakProcess(query);
- }
-
- @ApiOperation(value = "加签")
- @PostMapping(value = "/delegate")
- 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);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ PmsPurchaseBillDetailsVo vo = pmsPurchaseBillService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("提交审批流程")
+ @PostMapping("/submit")
+ public ResultBean submit(@RequestBody @Valid SubmitPmsPurchaseBillDto dto) {
+ return pmsPurchaseBillService.submit(dto);
+ }
+
+ @ApiOperation(value = "办理(同意)")
+ @PostMapping("/complete")
+ public ResultBean complete(@Valid @RequestBody PmsPurchaseBillCompleteDto query) {
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId());
+ return pmsPurchaseBillService.complete(bv);
+ }
+
+ @ApiOperation(value = "获取上一个环节")
+ @GetMapping(value = "/getPreviousNodesForReject")
+ public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query) {
+ return pmsPurchaseBillService.getPreviousNodesForReject(query);
+ }
+
+ @ApiOperation(value = "获取下一个环节")
+ @GetMapping(value = "/getNextNodesForSubmit")
+ public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchaseBillNodeQuery query) {
+ return pmsPurchaseBillService.getNextNodesForSubmit(query);
+ }
+
+ @ApiOperation(value = "驳回任务")
+ @PostMapping(value = "/reject")
+ public ResultBean reject(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
+ return pmsPurchaseBillService.reject(query);
+ }
+
+ @ApiOperation(value = "撤回流程")
+ @PostMapping(value = "/revokeProcess")
+ public ResultBean revokeProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
+ return pmsPurchaseBillService.revokeProcess(query);
+ }
+
+ @ApiOperation(value = "终止任务")
+ @PostMapping(value = "/breakProcess")
+ public ResultBean breakProcess(@Valid @RequestBody PmsPurchaseBillTaskQuery query) {
+ return pmsPurchaseBillService.breakProcess(query);
+ }
+
+ @ApiOperation(value = "加签")
+ @PostMapping(value = "/delegate")
+ 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/apiadmin/pms/PmsPurchasebackBillRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java
index 08f3c2c6bf..a98aae5374 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
@@ -26,13 +26,11 @@
package com.yxt.pms.apiadmin.pms;
import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.pms.biz.pms.pmspurchasebackbill.*;
import com.yxt.pms.biz.pms.pmspurchasebackbill.flowable.*;
-import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*;
import com.yxt.pms.feign.flowable.flow.BusinessVariables;
import com.yxt.pms.feign.flowable.flow.ProcDefEnum;
import io.swagger.annotations.Api;
@@ -40,119 +38,103 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
-
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
import java.util.List;
-/**
- * Project: yxt-pms(采购)
- * File: PmsPurchasebackBillFeignFallback.java
- * Class: com.yxt.pms.biz.pmspurchasebackbill.PmsPurchasebackBillRest
- * Description: 采购退货单据.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-19 13:51:47
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "采购退货单据")
@RestController
@RequestMapping("v1/pmspurchasebackbill")
public class PmsPurchasebackBillRest {
- @Autowired
- private PmsPurchasebackBillService pmsPurchasebackBillService;
- @Autowired
- HttpServletResponse response;
-
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = pmsPurchasebackBillService.listPageVo(pq);
- return rb.success().setData(pv);
- }
-
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody PmsPurchasebackBillDto dto){
- return pmsPurchasebackBillService.saveOrUpdateDto(dto);
- }
-
- @ApiOperation("根据sid批量删除")
+ @Autowired
+ private PmsPurchasebackBillService pmsPurchasebackBillService;
+ @Autowired
+ HttpServletResponse response;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = pmsPurchasebackBillService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody PmsPurchasebackBillDto dto) {
+ return pmsPurchasebackBillService.saveOrUpdateDto(dto);
+ }
+
+ @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- return pmsPurchasebackBillService.delAll(sids);
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ return pmsPurchasebackBillService.delAll(sids);
+ }
- @ApiOperation("根据SID获取一条记录")
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
-
- @ApiOperation("提交审批流程")
- @PostMapping("/submit")
- public ResultBean submit(@RequestBody @Valid SubmitPmsPurchasebackBillDto dto) {
- return pmsPurchasebackBillService.submit(dto);
- }
-
- @ApiOperation(value = "办理(同意)")
- @PostMapping("/complete")
- public ResultBean complete(@Valid @RequestBody PmsPurchasebackBillCompleteDto query) {
- BusinessVariables bv = new BusinessVariables();
- BeanUtil.copyProperties(query, bv);
- bv.setModelId(ProcDefEnum.PMSPURCHASEBACKBILL.getProDefId());
- return pmsPurchasebackBillService.complete(bv);
- }
-
- @ApiOperation(value = "获取上一个环节")
- @GetMapping(value = "/getPreviousNodesForReject")
- public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query) {
- return pmsPurchasebackBillService.getPreviousNodesForReject(query);
- }
-
- @ApiOperation(value = "获取下一个环节")
- @GetMapping(value = "/getNextNodesForSubmit")
- public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query) {
- return pmsPurchasebackBillService.getNextNodesForSubmit(query);
- }
-
- @ApiOperation(value = "驳回任务")
- @PostMapping(value = "/reject")
- public ResultBean reject(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
- return pmsPurchasebackBillService.reject(query);
- }
-
- @ApiOperation(value = "撤回流程")
- @PostMapping(value = "/revokeProcess")
- public ResultBean revokeProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
- return pmsPurchasebackBillService.revokeProcess(query);
- }
-
- @ApiOperation(value = "终止任务")
- @PostMapping(value = "/breakProcess")
- public ResultBean breakProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
- return pmsPurchasebackBillService.breakProcess(query);
- }
-
- @ApiOperation(value = "加签")
- @PostMapping(value = "/delegate")
- 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);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("提交审批流程")
+ @PostMapping("/submit")
+ public ResultBean submit(@RequestBody @Valid SubmitPmsPurchasebackBillDto dto) {
+ return pmsPurchasebackBillService.submit(dto);
+ }
+
+ @ApiOperation(value = "办理(同意)")
+ @PostMapping("/complete")
+ public ResultBean complete(@Valid @RequestBody PmsPurchasebackBillCompleteDto query) {
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId(ProcDefEnum.PMSPURCHASEBACKBILL.getProDefId());
+ return pmsPurchasebackBillService.complete(bv);
+ }
+
+ @ApiOperation(value = "获取上一个环节")
+ @GetMapping(value = "/getPreviousNodesForReject")
+ public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query) {
+ return pmsPurchasebackBillService.getPreviousNodesForReject(query);
+ }
+
+ @ApiOperation(value = "获取下一个环节")
+ @GetMapping(value = "/getNextNodesForSubmit")
+ public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap PmsPurchasebackBillNodeQuery query) {
+ return pmsPurchasebackBillService.getNextNodesForSubmit(query);
+ }
+
+ @ApiOperation(value = "驳回任务")
+ @PostMapping(value = "/reject")
+ public ResultBean reject(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
+ return pmsPurchasebackBillService.reject(query);
+ }
+
+ @ApiOperation(value = "撤回流程")
+ @PostMapping(value = "/revokeProcess")
+ public ResultBean revokeProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
+ return pmsPurchasebackBillService.revokeProcess(query);
+ }
+
+ @ApiOperation(value = "终止任务")
+ @PostMapping(value = "/breakProcess")
+ public ResultBean breakProcess(@Valid @RequestBody PmsPurchasebackBillTaskQuery query) {
+ return pmsPurchasebackBillService.breakProcess(query);
+ }
+
+ @ApiOperation(value = "加签")
+ @PostMapping(value = "/delegate")
+ 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/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
index e79ccdae18..f36d79f026 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
@@ -31,36 +31,22 @@ import com.yxt.common.core.domain.BaseEntity;
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: PmsPurchaseBill.java
- * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill
- * Description: 采购单.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-19 13:51:45
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "采购单", description = "采购单")
@TableName("pms_purchase_bill")
public class PmsPurchaseBill extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("制单人姓名")
+ @ApiModelProperty("制单人姓名")
private String createByName;
- @ApiModelProperty("来源单sid(工单sid)")
+ @ApiModelProperty("来源单sid(工单sid)")
private String sourceBillSid;
- @ApiModelProperty("来源单编号/外部编号")
+ @ApiModelProperty("来源单编号/外部编号")
private String sourceBillNo;
- @ApiModelProperty("单据编号")
+ @ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("经营品牌Key")
@@ -72,9 +58,9 @@ public class PmsPurchaseBill extends BaseEntity {
@ApiModelProperty("仓库类型Value")
private String warehouseTypeValue;
- @ApiModelProperty("采购类型Key")
+ @ApiModelProperty("采购类型Key")
private String purchaseTypeKey;
- @ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
+ @ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因key")
@@ -96,15 +82,15 @@ public class PmsPurchaseBill extends BaseEntity {
@ApiModelProperty("误差调整金额")
private BigDecimal errorAmount;
- @ApiModelProperty("供应商sid")
+ @ApiModelProperty("供应商sid")
private String supplierSid;
- @ApiModelProperty("供应商名称")
+ @ApiModelProperty("供应商名称")
private String supplierName;
- @ApiModelProperty("供应商联系电话")
+ @ApiModelProperty("供应商联系电话")
private String supplierPhone;
- @ApiModelProperty("采购员sid(单选)")
+ @ApiModelProperty("采购员sid(单选)")
private String purchaserSid;
- @ApiModelProperty("采购员姓名")
+ @ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("预计到货日期")
@JsonFormat(
@@ -112,11 +98,11 @@ public class PmsPurchaseBill extends BaseEntity {
timezone = "GMT+8"
)
private Date deliveryDate;
- @ApiModelProperty("运费")
+ @ApiModelProperty("运费")
private BigDecimal freight;
- @ApiModelProperty("优惠金额")
+ @ApiModelProperty("优惠金额")
private BigDecimal discountAmount;
- @ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
+ @ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("当前预付款项金额")
@@ -138,15 +124,15 @@ public class PmsPurchaseBill extends BaseEntity {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
- @ApiModelProperty("使用组织sid")
+ @ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("使用组织名称")
private String useOrgName;
- @ApiModelProperty("创建组织sid")
+ @ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("创建组织名称")
private String createOrgName;
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 95130a676d..79c38335fe 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
@@ -349,7 +349,7 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//是否储备配件
- variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
+ variables.put("iscb","001".equals(pmsPurchaseBill.getPurchaseReasonKey()));
//流程定义id
bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId());
bv.setFormVariables(variables);
@@ -436,7 +436,7 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//是否储备配件
- variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
+ variables.put("iscb","001".equals(pmsPurchaseBill.getPurchaseReasonKey()));
Map appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
@@ -565,7 +565,7 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//是否储备配件
- variables.put("iscb","001".equals(purchaseBill.getManufacturersOrderTypeKey()));
+ variables.put("iscb","001".equals(purchaseBill.getPurchaseReasonKey()));
bv.setModelId(purchaseBill.getProcDefId());
bv.setFormVariables(variables);
//=======================================
@@ -588,7 +588,7 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//是否储备配件
- variables.put("iscb","001".equals(purchaseBill.getManufacturersOrderTypeKey()));
+ variables.put("iscb","001".equals(purchaseBill.getPurchaseReasonKey()));
bv.setModelId(purchaseBill.getProcDefId());
bv.setFormVariables(variables);
//=======================================
@@ -625,7 +625,7 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData();
variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777"));
//是否储备配件
- variables.put("iscb","001".equals(pmsPurchaseBill.getManufacturersOrderTypeKey()));
+ variables.put("iscb","001".equals(pmsPurchaseBill.getPurchaseReasonKey()));
flowTaskVo.setValues(variables);
ResultBean resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {