固化流程1

yangys

2025-08-14 6043e2e1c832db2bf7bb1868ae9ca727f7b988b3

 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,9 +11,13 @@
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.flow.service.FlowProgramProperties;
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;
import org.springframework.transaction.annotation.Transactional;

import java.util.Map;

@@ -23,12 +28,14 @@
public class TryFlowCompleteService extends AbstractFlowCompleteService {
   @Autowired
   private FlowProgramFileService flowProgramFileService;

   @Autowired
   private NcNodeService ncNodeService;
   @Autowired
   private NcNodeAutoCreateService ncNodeAutoCreateService;
   @Autowired
   private FlowCommonService flowCommonService;

   @Transactional
   @Override
   public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
      Task task = currentTask(taskId);
@@ -52,15 +59,41 @@
      addApproveRecord(taskId,comment,variables);

      //在编制任务时，创建节点（没有节点则创建，有就直接使用
      if(task.getTaskDefinitionKey().equals("programmingTask") && "Y".equals(operateResult)) {
         ncNodeAutoCreateService.createNodeTreeWithProgram(flowCommonService.getProgramProperties(processInstanceId));
      }
      if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
         variables.remove(FlowContants.PROCESS_EDITION);//TODO 临时错误是，组长提交的时候会提交一个空串，清空了内部数据
      }else{
         //升版
      /*
      if(task.getTaskDefinitionKey().equals("programmingTask") && FlowContants.Y.equals(operateResult)) {
         FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId);
         ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
         //原来版次的程序，此时应该清除，是不是要挪过来呢？版次已经不对了
         //TODO 老节点清除吗

         //走到编制节点，如果是有固化程序且通过了，说明需要升版（重新编写），将固化的原来的程序设置lastEdition=0
         if(FlowContants.Y.equals(progProperties.getHasCuredProgram())) {
            NcNode curedProgramPackage = ncNodeService.getById(Func.toLong(progProperties.getCuredNodeId()));
            curedProgramPackage.setIsLastEdition(0);
            curedProgramPackage.setIsLocked(1);
            ncNodeService.updateById(curedProgramPackage);
         }

      }*/
      if(task.getTaskDefinitionKey().equals("approveTask") && FlowContants.Y.equals(operateResult)) {
         //试切流程，或者 偏离流程 高师通过的时候创建节点
         //createProgramNodes(processInstanceId);
      }
      variables.remove(FlowContants.PROCESS_EDITION);//不要升版了
      //if(!"confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
      if("confirmIsUseableTask".equals(task.getTaskDefinitionKey())){
         //工序版次不一致，并且审核通过（可用）是，才更新为新的versionNumber
         FlowProgramProperties progProperties = flowCommonService.getProgramProperties(processInstanceId);
         variables.put(FlowContants.CURE_PROGRAM_USEABLE,operateResult);

         if(FlowContants.Y.equals(operateResult) && FlowContants.N.equals(progProperties.getIsProcessEditionSame())) {
            //确认程序可用 且 工序版次不一致，进入校对。这里需要升级程序的版本号
            Long curedNodeId = progProperties.getCuredNodeId();
            ncNodeService.upgradeVersionNumber(curedNodeId);
         }
      }
      taskService.complete(taskId, variables);
   }


}