修复替换流程bug

yangys

2025-09-11 0975559314f1d4ee44a03e87c2b369f1d3e0ff8b

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

@@ -1,27 +1,20 @@
package org.springblade.mdm.flow.service;

import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.simpleframework.xml.core.Replace;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
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.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowVariableContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.ReplaceProgramFile;
import org.springblade.mdm.flow.vo.ReplaceFlowStartVO;
import org.springblade.mdm.flow.vo.ReplaceUploadVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
@@ -30,16 +23,13 @@
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.mdm.utils.ProgramFileNameCheckUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@AllArgsConstructor
@Service
@@ -109,6 +99,7 @@
    */
   @Transactional
   public void start(ReplaceFlowStartVO startVO){
      flowProgramFileService.checkProgramFiles(startVO.getTempInstanceId(),true);
      NcNode programPackage = nodeService.getById(startVO.getNodeId());

      Map<String, Object> vars = new HashMap<>();
@@ -117,50 +108,24 @@
      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");

      vars.put(FlowContants.TITLE,startVO.getTitle());
      //以下被flowCommonService.putFlowVariablesByNode(vars,programPackage);代替了
      /*
      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      //机床型号
      if(machine != null) {
         vars.put(FlowContants.MACHINE_MODE, machine.getName());
      }
      vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
      vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
      vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
      vars.put(FlowContants.CRAFT_EDITION,programPackage.getCraftEdition());

      vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
      vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());

      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(FlowContants.NODE_ID, startVO.getNodeId());
      vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode()));
      */
      vars.put("comment", startVO.getComment());
      vars.put(FlowContants.MY_PROCESS_NAME,"替换流程");
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      String userId = String.valueOf(AuthUtil.getUserId());
      identityService.setAuthenticatedUserId(userId);//设置流程发起人
      vars.put(FlowVariableContants.ACT_PROGRAMMER,userId);//发起人按照实际编程人员算

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
      //更新节点的流程id，避免重复发起流程
      programPackage.setProcessInstanceId(inst.getId());
      this.nodeService.updateById(programPackage);
      /*
      Task startTask = taskService.createTaskQuery()
         .processInstanceId(inst.getId())
         .singleResult();

      // 添加评论
      taskService.addComment(startTask.getId(), inst.getProcessInstanceId(),startVO.getComment());
      */
      flowProgramFileService.lambdaUpdate()
         .eq(FlowProgramFile::getProcessInstanceId,startVO.getTempInstanceId())
         .set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();

   }



   /**
@@ -182,7 +147,7 @@
      }


      String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo());
      String programName = NcNodeService.genProgramName(progProps.getDrawingNo(),progProps.getProcessNo(),progProps.getProcessEdition());

      BladeFile bfile = ossTemplate.putFile(file);