排产修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java

@@ -18,6 +18,8 @@ public class GetNodeQuery implements Query {
     @ApiModelProperty(value = "环节定义id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
 
  /*   @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;*/

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -326,7 +326,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
-        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        Map<String, Object> variables = new HashMap<>();
+        variables.put("money", Integer.valueOf(dto.getCurrentAmount()).intValue() > 0);
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -406,6 +407,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleApply busVehicleApply = fetchBySid(bv.getBusinessSid());
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        bv.setFormVariables(variables);
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -482,6 +487,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());
+        variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -500,6 +511,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        //根据业务sid查询排产信息
+        BusVehicleApply busVehicleApply = fetchBySid(query.getBusinessSid());
+        variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+        bv.setFormVariables(variables);
         bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
@@ -520,6 +537,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         if (busVehicleApply == null) {
             return rb.setMsg("该申请不存在");
         }
+
         String businessTaskId = busVehicleApply.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
             if (businessTaskId.equals(query.getTaskId())) {
@@ -531,6 +549,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 }
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
+               Map<String, Object> variables = new HashMap<>();
+                //根据业务sid查询排产信息
+                variables.put("money", busVehicleApply.getCurrentAmount().intValue() > 0);
+                flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -13,7 +13,7 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
     ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:5:455004"),//TODO
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO
     // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     RECORDAPPLICATION("入账申请", "process_xbwq2c7p:1:285008"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"),

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -29,17 +29,13 @@ package com.yxt.anrui.flowable.biz.flow;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.yxt.anrui.flowable.api.flow.*;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
-import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
-import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService;
-import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
 import com.yxt.common.base.utils.StringUtils;
@@ -367,7 +363,7 @@ public class FlowableRest implements FlowableFeign {
 
         ResultBean<List<LatestTaskVo>> resultBean = flowtaskService.taskReject(fl);
         if (!resultBean.getSuccess()) {
-            return rb;
+            return rb.setMsg(resultBean.getMsg());
         }
         String nodeState = resultBean.getData().get(0).getName_();
         String taskDefKey = resultBean.getData().get(0).getTask_def_key_();