锁定流程完成

yangys

2025-08-17 0ef4cc755bddd87799b8bfdd65c8123df6e149d0

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

@@ -53,8 +53,7 @@
   private final NodeDeptQueryService nodeDeptQueryService;
   private final FlowCommonService flowCommonService;
   private final OssTemplate ossTemplate;
   public static final String NODE_ID = "nodeId";

   private final MachineService machineService;

   /**
    * 准备替换流程需要的数据
@@ -110,22 +109,23 @@
    */
   @Transactional
   public void start(ReplaceFlowStartVO startVO){


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

      Map<String, Object> vars = new HashMap<>();

      flowCommonService.putFlowVariablesByNode(vars,programPackage);
      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(programPackge.getMachineCode());
      Machine machine = machineService.getByCode(programPackage.getMachineCode());
      //机床型号
      //if(machine != null) {
         //vars.put(FlowContants.MACHINE_MODE, programPackge.getMachineMode());
      //}
      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());
@@ -137,13 +137,16 @@
      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());

      vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
      vars.put(NODE_ID, startVO.getNodeId());

      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()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.REPLACE_PROCESS_KEY,startVO.getNodeId()+"",vars);
      //replaceProgramFileService.lambdaUpdate().eq(ReplaceProgramFile::getTempId,startVO.getTempId()).set(ReplaceProgramFile::getProcessInstanceId,inst.getProcessInstanceId());

      //更新节点的流程id，避免重复发起流程
      programPackage.setProcessInstanceId(inst.getId());
      this.nodeService.updateById(programPackage);
      /*
      Task startTask = taskService.createTaskQuery()
         .processInstanceId(inst.getId())