更改

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

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

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

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

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

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()) {