替换流程bug修复

yangys

2025-08-16 8db9b68d0bf4b7ec2e80b580f5931a40788caac7

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

@@ -14,6 +14,8 @@
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.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.ReplaceProgramFile;
@@ -47,39 +49,12 @@
   private final TaskService taskService;
   private final IdentityService identityService;
   private final FlowProgramFileService flowProgramFileService;
   private final ReplaceProgramFileService replaceProgramFileService;
   private final ProgramFlowStatusQueryService flowStatusQueryService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private OssTemplate ossTemplate;
   private final FlowCommonService flowCommonService;
   private final OssTemplate ossTemplate;
   public static final String NODE_ID = "nodeId";
   /**
     * 转派，并记录自己的备注信息
    * @param nodeId 替换的节点id
    */
   /*
   @Transactional
   public void prestart(long nodeId,String tempInstanceId) {
      List<NcNode> fileNodes = nodeService.lambdaQuery()
         .eq(NcNode::getParentId, nodeId)
         .eq(NcNode::getIsLastEdition,1)
         .eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_FILE).list();
      List<Long> fileIds = fileNodes.stream().map(NcNode::getFlowProgramFileId).toList();

      List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery()
         .in(FlowProgramFile::getId, fileIds).list();


      //将现有文件复制到独立的表中，后续作为审批的文件，审批界面调用的接口也不同，最好单独开发
      for(FlowProgramFile programFile : programFiles) {
         FlowProgramFile newFile = new FlowProgramFile();
         BeanUtils.copyProperties(programFile, newFile);
         EntityUtil.clearBaseProperties(newFile);
         newFile.setProcessInstanceId(tempInstanceId);
         flowProgramFileService.save(newFile);
      }
   }

    */

   /**
    * 准备替换流程需要的数据
@@ -136,11 +111,14 @@
   @Transactional
   public void start(ReplaceFlowStartVO startVO){


      NcNode programPackage = nodeService.getById(startVO.getNodeId());

      Map<String, Object> vars = new HashMap<>();
      vars.put(FlowContants.ASSIGNEE,startVO.getAssignee());//第一个审批用户
      flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),startVO.getAssignee()+"");

      vars.put(FlowContants.TITLE,startVO.getTitle());
      NcNode programPackage = nodeService.getById(startVO.getNodeId());

      //机床编号
      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //Machine machine = machineService.getByCode(programPackge.getMachineCode());
@@ -181,13 +159,13 @@
   }



   /**
    * 上传程序徐文件（编制节点调用）
    * @param uploadVO 上传对象
    */
   public void uploadReplaceProgramFile(ReplaceUploadVO uploadVO) {

      //FlowProgramProperties progProps= flowCommonService.getProgramProperties(uploadVO.getProcessInstanceId());
      MultipartFile file = uploadVO.getFile();
      if(file.getSize() == 0){
         throw new ServiceException("程序文件不可为空文件");
@@ -196,8 +174,10 @@
      progProps.setDrawingNo(uploadVO.getDrawingNo());
      progProps.setProcessNo(uploadVO.getProcessNo());
      progProps.setProcessEdition(uploadVO.getProcessEdition());

      if(FlowProgramFile.TYPE_PROGRAM.equals(uploadVO.getFileType())) {
      ProgramFileNameCheckUtil.checkFilename(file.getOriginalFilename(),progProps);
      }


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