yangys
2025-08-12 8ede6183253248e497d391a0902bb5d41181b3bf
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -5,12 +5,15 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
@@ -41,22 +44,15 @@
   private final RuntimeService runtimeService;
   private final HistoryService historyService;
   private final TaskService taskService;
   private final IdentityService identityService;
   private final NcNodeService ncNodeService;
   private final FlowProgramFileService flowProgramFileService;
   /**
    * 固化流程的key
    */
   private static final String PROCESS_KEY = "program-cure";
   @Transactional
   public void startCure(List<NcNode> programPackageList, Map<Long,List<FlowProgramFile>> allFlowProgramFiles) {
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
      //根据分组启动流程,并插入关联表
      programPackageList.forEach(pkg -> {
         this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
@@ -67,8 +63,8 @@
    * 启动一个数控程序的固化流程
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcNode programPackage,List<FlowProgramFile> flowProgramFiles) {
      Map<String, Object> vars = null;
   public void startOne(NcNode programPackage,List<NcNode> programNodes) {
      Map<String, Object> vars = new HashMap<>();
      //该程序在计划任务时 获取编制,校对,审批的人员,作为默认用户,其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
@@ -76,13 +72,21 @@
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
            vars.remove("proessInstanceId");
            Map<String, Object> oldVars = instance.getProcessVariables();
            //机床编号
            vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
            //机床型号
            vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));
            vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
            vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
            vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
            vars.put(FlowContants.CRAFT_EDITION, oldVars.get(FlowContants.CRAFT_EDITION));
            vars.put(FlowContants.DRAWING_NO,oldVars.get(FlowContants.DRAWING_NO));
            vars.put(FlowContants.DRAWING_NO_EDITION,oldVars.get(FlowContants.DRAWING_NO_EDITION));
            vars.put(FlowContants.PRODUCT_MODEL,oldVars.get(FlowContants.PRODUCT_MODEL));
         }
      }
      if(vars == null){
         vars = new HashMap<>();
      }
      //查找历史实际的审批人
@@ -91,19 +95,27 @@
         .list();
      fillHistoryAssignees(vars, historicTasks);
      String businessKey = "0";//业务表key
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,businessKey,vars);
      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
      ncNodeService.updateById(programPackage);
      //更新文件的流程实例id,并入库
      flowProgramFiles.forEach(flowProgramFile -> {
      //更新文件的流程实例id,和 程序节点的流程文件id 并入库
      programNodes.forEach(programNode -> {
         FlowProgramFile flowProgramFile = programNode.getFlowProgramFile();
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
         this.flowProgramFileService.save(flowProgramFile);
         programNode.setFlowProgramFileId(flowProgramFile.getId());
         this.ncNodeService.save(programNode);
      });
      log.info("启动固化流程完成,实例id={}", inst.getId());
   }
@@ -142,9 +154,10 @@
      }
      vars.put("programmer",programmer);
      vars.put("checker",checker);
      vars.put("senior",senior);
      vars.put(FlowContants.PROGRAMMER,programmer);
      vars.put(FlowContants.CHECKER,checker);
      vars.put(FlowContants.SENIOR,senior);
      vars.put(FlowContants.ASSIGNEE,programmer);
   }
   /**
    * 将程序按照机器代码分组