增加临时流程处理

yangys

2025-08-20 51054f0da5dd4718212064510fff045815388b90

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

@@ -57,7 +57,7 @@
      vars.put(FlowContants.TITLE,startVO.getTitle());

      //临时流程标志，明确指定Y，属于临时流程
      vars.put(FlowContants.IS_TEMP_FLOW,FlowContants.Y.equals(startVO.getIsTempFlow())?FlowContants.Y:FlowContants.N);

      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
@@ -81,25 +81,35 @@
      String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);

      NcNode curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getMachineCode());
      //设置是否有固化程序标记
      vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
      //工序版次是否一致，是否在有效期内
      if(curedProgramPackage != null && Func.isBlank(startVO.getDeviation())){//偏离单优先，如果有偏离单，那么找到固化程序的也不算固化了
         vars.put(FlowContants.CURED_NODE_ID,curedProgramPackage.getId());
         vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
         vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
      vars.put(FlowContants.IS_TEMP_FLOW,FlowContants.Y.equals(startVO.getIsTempFlow())?FlowContants.Y:FlowContants.N);
      NcNode curedProgramPackage = null;
      if(FlowContants.N.equals(startVO.getIsTempFlow())) {
         curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName, startVO.getMachineCode());
         //设置是否有固化程序标记
         vars.put(FlowContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
         //工序版次是否一致，是否在有效期内
         if (curedProgramPackage != null && Func.isBlank(startVO.getDeviation())) {//偏离单优先，如果有偏离单，那么找到固化程序的也不算固化了
            vars.put(FlowContants.CURED_NODE_ID, curedProgramPackage.getId());
            vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? "Y" : "N");
            vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y : FlowContants.N);
         } else {
            vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
            vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
         }

      }else{
         vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
         vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
         //临时流程，不管固化
         vars.put(FlowContants.HAS_CURED_PROGRAM,FlowContants.N);
      }
      String myProcessName = "试切下发流程";
      if(vars.getOrDefault(FlowContants.HAS_CURED_PROGRAM,FlowContants.N).equals(FlowContants.Y)){
      if(vars.getOrDefault(FlowContants.IS_TEMP_FLOW,FlowContants.N).equals(FlowContants.Y)){
         myProcessName = "试切补充流程";
      }else if(StringUtils.isNotBlank(startVO.getDeviation()) ){
         myProcessName = "偏离单";
      }else if(vars.getOrDefault(FlowContants.HAS_CURED_PROGRAM,FlowContants.N).equals(FlowContants.Y)){
         myProcessName = "固化下发流程";
      }
      if(StringUtils.isNotBlank(startVO.getDeviation()) ){
         myProcessName = "偏离单";
      }

      vars.put(FlowContants.MY_PROCESS_NAME, myProcessName);

      String businessKey = "0";//业务表key