修复偏离单回传程序版本都是2的问题

yangys

2025-08-22 eebd71b9197ba70f21d161958a1e5ae0539dcd47

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

@@ -50,11 +50,15 @@
    */
   @Transactional
   public String start(TaskAssignVO startVO){
      if(!FlowContants.Y.equals(startVO.getIsTempFlow())){
         startVO.setIsTempFlow(FlowContants.N);
      }
      Map<String, Object> vars = new HashMap<>();
      //this.putDefaultAssignees(vars,startVO.getDrawingNo());

      ProduceDivision div = flowCommonService.putDefaultAssignees(vars,startVO.getDrawingNo(),null);
      vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//第一个用户组长

      vars.put(FlowContants.TITLE,startVO.getTitle());

      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
      String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
@@ -78,69 +82,77 @@
      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(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
         //正常流程(非临时流程) 且不是 偏离单,才匹配固化程序
         curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getProcessEdition(), 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
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      if(curedProgramPackage != null) {//存在已固化程序，复制原来的程序文件。创建节点仍然在编程人员提交以后
         copyFlowProgramFiles(curedProgramPackage.getProcessInstanceId(),inst.getProcessInstanceId());
      ProcessInstance inst;
      if(startVO.isTemporaryFlow()){
         vars.put(FlowContants.ASSIGNEE,div.getProgrammerId());//第一个用户编制上传文件
         inst = runtimeService.startProcessInstanceByKey(FlowContants.APPEND_PROCESS_KEY,businessKey,vars);
      }else{
         vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//第一个用户组长
         inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
      }
      if(curedProgramPackage != null) {//存在已固化程序，复制原来的程序文件。
         copyFlowProgramFiles(curedProgramPackage.getId(),inst.getProcessInstanceId());
         curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
         ncNodeService.updateById(curedProgramPackage);
      }


      return inst.getProcessInstanceId();
   }

   /**
    * 将默认审批用户放入map中
    * @param vars 启动流程的变量map
    * @param drawingNo 零组件号
    */
   void putDefaultAssignees(Map<String, Object> vars,String drawingNo){
      ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(drawingNo);
      vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
      vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
      vars.put(FlowContants.CHECKER,div.getCheckerId());
      vars.put(FlowContants.SENIOR,div.getSeniorId());

      vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//第一个审批用户：组长
   }

   /**
    * 复制流程程序文件
    * @param processInstanceId 新启动的流程id
    */
   private void copyFlowProgramFiles(String oldProcessInstanceId,String processInstanceId) {
      List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery()
         .eq(FlowProgramFile::getProcessInstanceId,oldProcessInstanceId).list();
   private void copyFlowProgramFiles(long packageNameNodeId,String processInstanceId) {
      List<Long> fileIds = ncNodeService.getProgramFilesByPackageId(packageNameNodeId).stream().map(NcNode::getFlowProgramFileId).toList();
      if(!fileIds.isEmpty()) {
         List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().in(FlowProgramFile::getId, fileIds).list();

      for (FlowProgramFile file : fileList) {
         FlowProgramFile newFile = new FlowProgramFile();
         BeanUtils.copyProperties(file, newFile);
         EntityUtil.clearBaseProperties(newFile);
         for (FlowProgramFile file : fileList) {
            FlowProgramFile newFile = new FlowProgramFile();
            BeanUtils.copyProperties(file, newFile);
            EntityUtil.clearBaseProperties(newFile);

         newFile.setProcessInstanceId(processInstanceId);
            newFile.setProcessInstanceId(processInstanceId);

         this.flowProgramFileService.save(newFile);
            this.flowProgramFileService.save(newFile);
         }
      }
   }