固化流程

yangys

2025-08-14 a049dda2f63d59f5092994b44387fe0aa889d375

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

@@ -13,6 +13,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.excution.AutoAssignUsersService;
@@ -50,12 +52,12 @@
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;

   private final ProduceDivisionService produceDivisionService;
   @Transactional
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
   public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFilesMap) {
      //根据分组启动流程，并插入关联表
      programPackageList.forEach(pkg -> {
         this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
         this.startOne(pkg,allFlowProgramFilesMap.get(pkg.getId()));
      });
   }

@@ -125,6 +127,7 @@
    * @param vars 找到审批人后填充的map
    * @param historicTasks 历史任务集合
    */
   @Deprecated
   void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
      String programmer = null;
      String checker = null;
@@ -159,6 +162,57 @@
      vars.put(FlowContants.SENIOR,senior);
      vars.put(FlowContants.ASSIGNEE,programmer);
   }

   public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
      pkgIdFileMap.forEach((nodeId, fileList) -> {
         this.startOneNew(nodeId,fileList);
      });

   }

   private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
      Map<String, Object> vars = new HashMap<>();
      NcNode programPackage = this.ncNodeService.getById(nodeId);

      vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
      //机床型号
      //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
      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.PRODUCT_MODEL,programPackage.getProductModel());


      ProduceDivision div = produceDivisionService.getByDrawingNo(programPackage.getDrawingNo());
      if(div != null) {
         vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
         vars.put(FlowContants.CHECKER,div.getCheckerId());
         vars.put(FlowContants.SENIOR,div.getSeniorId());
         vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
      }

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人

      vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
      vars.put(FlowContants.TITLE,programPackage.getName()+"-固化");//自动增加标题

      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);

      //更新程序包名节点的流程实例id
      programPackage.setProcessInstanceId(inst.getProcessInstanceId());
      ncNodeService.updateById(programPackage);

      for(FlowProgramFile flowProgramFile : fileList){
         flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
      }
      this.flowProgramFileService.updateBatchById(fileList);

      log.info("启动固化流程完成，实例id={}", inst.getId());
   }
   /**
    * 将程序按照机器代码分组
    * @param ncProgramIdList