更改

2 months ago · e4e0abeaf1
6 changed files with 212 additions and 262 deletions
--- 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);

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

--- 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,26 +38,9 @@ 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(采购) <br/>
- * File: PmsPurchaseBillFeignFallback.java <br/>
- * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillRest <br/>
- * Description: 采购单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "采购单")
@RestController
@RequestMapping("v1/pmspurchasebill")
@ -69,7 +51,7 @@ public class PmsPurchaseBillRest {

    @ApiOperation("根据条件分页查询数据的列表")
    @PostMapping("/listPage")
-	public ResultBean<PagerVo<PmsPurchaseBillVo>> listPage(@RequestBody PagerQuery<PmsPurchaseBillQuery> pq){
+    public ResultBean<PagerVo<PmsPurchaseBillVo>> listPage(@RequestBody PagerQuery<PmsPurchaseBillQuery> pq) {
        ResultBean rb = ResultBean.fireFail();
        PagerVo<PmsPurchaseBillVo> pv = pmsPurchaseBillService.listPageVo(pq);
        return rb.success().setData(pv);
@ -77,7 +59,7 @@ public class PmsPurchaseBillRest {

    @ApiOperation("新增或修改")
    @PostMapping("/save")
-	public ResultBean<String> save(@RequestBody PmsPurchaseBillDto dto){
+    public ResultBean<String> save(@RequestBody PmsPurchaseBillDto dto) {
        ResultBean rb = ResultBean.fireFail();
        String sid = pmsPurchaseBillService.saveOrUpdateDto(dto);
        return rb.success().setData(sid);
@ -85,21 +67,21 @@ public class PmsPurchaseBillRest {

    @ApiOperation("维护厂家订单号")
    @PostMapping("/updateManuOrderNum")
-	public ResultBean updateManuOrderNum(@RequestParam("sid") String sid,@RequestParam("manufacturersOrderNumber") String manufacturersOrderNumber){
+    public ResultBean updateManuOrderNum(@RequestParam("sid") String sid, @RequestParam("manufacturersOrderNumber") String manufacturersOrderNumber) {
        ResultBean rb = ResultBean.fireFail();
-		pmsPurchaseBillService.updateManuOrderNum(sid,manufacturersOrderNumber);
+        pmsPurchaseBillService.updateManuOrderNum(sid, manufacturersOrderNumber);
        return rb.success().setData(sid);
    }

    @ApiOperation("根据sid批量删除")
    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
        return pmsPurchaseBillService.delAll(sids);
    }

    @ApiOperation("根据SID获取一条记录")
    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<PmsPurchaseBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<PmsPurchaseBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
        ResultBean rb = ResultBean.fireFail();
        PmsPurchaseBillDetailsVo vo = pmsPurchaseBillService.fetchDetailsVoBySid(sid);
        return rb.success().setData(vo);
@ -159,7 +141,7 @@ public class PmsPurchaseBillRest {
    @ApiOperation(value = "转办")
    @PutMapping(value = "/assignTask")
    @ResponseBody
-	public ResultBean assignTask(@RequestBody PmsPurchaseBillDelegateQuery query){
+    public ResultBean assignTask(@RequestBody PmsPurchaseBillDelegateQuery query) {
        return pmsPurchaseBillService.assignTask(query);
    }
 }
--- 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,26 +38,10 @@ 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(采购) <br/>
- * File: PmsPurchasebackBillFeignFallback.java <br/>
- * Class: com.yxt.pms.biz.pmspurchasebackbill.PmsPurchasebackBillRest <br/>
- * Description: 采购退货单据. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:47 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "采购退货单据")
@RestController
@RequestMapping("v1/pmspurchasebackbill")
@ -72,7 +54,7 @@ public class PmsPurchasebackBillRest {

    @ApiOperation("根据条件分页查询数据的列表")
    @PostMapping("/listPage")
-	public ResultBean<PagerVo<PmsPurchasebackBillVo>> listPage(@RequestBody PagerQuery<PmsPurchasebackBillQuery> pq){
+    public ResultBean<PagerVo<PmsPurchasebackBillVo>> listPage(@RequestBody PagerQuery<PmsPurchasebackBillQuery> pq) {
        ResultBean rb = ResultBean.fireFail();
        PagerVo<PmsPurchasebackBillVo> pv = pmsPurchasebackBillService.listPageVo(pq);
        return rb.success().setData(pv);
@ -80,19 +62,19 @@ public class PmsPurchasebackBillRest {

    @ApiOperation("新增或修改")
    @PostMapping("/save")
-	public ResultBean<String> save(@RequestBody PmsPurchasebackBillDto dto){
+    public ResultBean<String> save(@RequestBody PmsPurchasebackBillDto dto) {
        return pmsPurchasebackBillService.saveOrUpdateDto(dto);
    }

    @ApiOperation("根据sid批量删除")
    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
        return pmsPurchasebackBillService.delAll(sids);
    }

    @ApiOperation("根据SID获取一条记录")
    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<PmsPurchasebackBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<PmsPurchasebackBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
        ResultBean rb = ResultBean.fireFail();
        PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
        return rb.success().setData(vo);
@ -152,7 +134,7 @@ public class PmsPurchasebackBillRest {
    @ApiOperation(value = "转办")
    @PutMapping(value = "/assignTask")
    @ResponseBody
-	public ResultBean assignTask(@RequestBody PmsPurchasebackBillDelegateQuery query){
+    public ResultBean assignTask(@RequestBody PmsPurchasebackBillDelegateQuery query) {
        return pmsPurchasebackBillService.assignTask(query);
    }
 }
--- 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,23 +31,9 @@ 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(采购) <br/>
- * File: PmsPurchaseBill.java <br/>
- * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill <br/>
- * Description: 采购单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:45 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "采购单", description = "采购单")
@TableName("pms_purchase_bill")
@ -138,7 +124,7 @@ 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; // 办结时间

--- 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<PmsPurchaseBillMa
        List<String> 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<PmsPurchaseBillMa
        List<String> 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<String, Object> appMap = new HashMap<>();
        appMap.put("sid", businessSid);
        variables.put("app", appMap);
@ -565,7 +565,7 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
        List<String> 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<PmsPurchaseBillMa
        List<String> 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<PmsPurchaseBillMa
                List<String> 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<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                if (!resultBean.getSuccess()) {