优化代码

yangys

2025-08-07 a0881c9a8dbff2bf7f3e10255b998b9529c7aef3

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java

@@ -1,5 +1,6 @@
package org.springblade.mdm.flow.service.execute;

import org.apache.commons.lang3.StringUtils;
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
@@ -10,7 +11,9 @@
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -23,7 +26,8 @@
public class TryFlowCompleteService extends AbstractFlowCompleteService {
   @Autowired
   private FlowProgramFileService flowProgramFileService;

   @Autowired
   private NcNodeService ncNodeService;
   @Autowired
   private NcNodeAutoCreateService ncNodeAutoCreateService;
   @Autowired
@@ -58,8 +62,28 @@
      if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
         variables.remove(FlowContants.PROCESS_EDITION);//TODO 临时错误是，组长提交的时候会提交一个空串，清空了内部数据
      }else{
         //升版
         //工序版次不一致，并且审核通过（可用）是，才更新为新的工序版次号
         Map<String, Object> currentVars = task.getProcessVariables();
         if(StringUtils.equals(String.valueOf(currentVars.getOrDefault(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y)),FlowContants.N) && operateResult.equals(FlowContants.Y)){
            //工序版次不一致，并且审核通过（可用） 升版,更新为新的工序版本，后续进入 校对 节点
            Object objProcessEdition = variables.get(FlowContants.PROCESS_EDITION);
            if(objProcessEdition == null){
               //应该升版，但前端没有传递该参数
               throw new ServiceException("请录入新的工序版本号");
            }
            String newProcessEdition = String.valueOf(objProcessEdition);
            NcNode programPkgNode= ncNodeService.getByProcessInstanceId(processInstanceId);
            programPkgNode.setProcessEdition(newProcessEdition);
            ncNodeService.updateById(programPkgNode);

            //创建程序树
            //节点在试切下还是固化下面？确认了，节点建立在试切下，最终走固化流程后才进入固化
            //确认程序可用了，进入校对。这里直接建立节点，因为可能不走编程节点了
            this.ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
         }else{
            //工序版次一致，但是拒绝了，后续会进入编制节点
            variables.remove(FlowContants.PROCESS_EDITION);
         }
      }
      taskService.complete(taskId, variables);
   }