机床导入1

yangys

2025-08-22 ddafa0375398053baaafdee8612f68c1b75ff7cb

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java

@@ -26,10 +26,7 @@
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
import org.springblade.mdm.flow.service.execute.BatchDispatchService;
import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
@@ -42,6 +39,7 @@
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -63,7 +61,8 @@
   private final DefaultFlowCompleteService defaultFlowCompleteService;
   private final TaskDispatchService taskDispatchService;
   private final BatchDispatchService dispatchService;

   private final ReplaceFlowCompleteService replaceFlowCompleteService;
   private final TempFlowCompleteService tempFlowCompleteService;
   /**
    * 发起派工流程
    */
@@ -82,10 +81,17 @@
   }

   AbstractFlowCompleteService getActualService(String processInstanceId){
      ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
      ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
      if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)
         || inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)|| inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
         return tryFlowCompleteService;
         || inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
         String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowContants.IS_TEMP_FLOW));
         if(FlowContants.N.equals(isTempFlow)){
            return tryFlowCompleteService;
         }else{
            return tempFlowCompleteService;
         }
      }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
         return replaceFlowCompleteService;
      }else{
         return defaultFlowCompleteService;
      }