修复替换流程bug

yangys

2025-09-11 0975559314f1d4ee44a03e87c2b369f1d3e0ff8b

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

@@ -11,6 +11,7 @@
import org.springblade.core.secure.utils.AuthUtil;
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.vo.ReplaceFlowStartVO;
import org.springblade.mdm.flow.vo.ReplaceUploadVO;
@@ -110,7 +111,11 @@

      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());
@@ -121,25 +126,7 @@
         .set(FlowProgramFile::getProcessInstanceId,inst.getProcessInstanceId()).update();

   }
   /*
   public void checkProgramFiles(String processInstanceId,boolean isPass) {
      List<FlowProgramFile> flowPrograms = this.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, processInstanceId).orderByAsc(FlowProgramFile::getCreateTime).list();
      List<FlowProgramFile> purePrograms = flowPrograms.stream().filter(FlowProgramFile::isProgram).toList();
      if(isPass && purePrograms.isEmpty()){
         throw new ServiceException("请上传程序文件");
      }
      int totalSeg = 0;

      if(!purePrograms.isEmpty()){
         FlowProgramFile progFile = purePrograms.get(0);
         totalSeg = ProgramFileNameCheckUtil.getProgramSegCount(progFile.getName());
      }

      if(totalSeg != purePrograms.size()){
         throw new ServiceException("应上传"+totalSeg+"段程序，实际上传"+flowPrograms.size()+"段");
      }

   }*/

   /**
    * 上传程序徐文件（编制节点调用）
@@ -160,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);