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

yangys

2025-08-22 eebd71b9197ba70f21d161958a1e5ae0539dcd47

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

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

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

      //临时流程标志，明确指定Y，属于临时流程
      vars.put(FlowContants.TITLE,startVO.getTitle());

      //机床编号
      vars.put(FlowContants.MACHINE_CODE,startVO.getMachineCode());
@@ -83,8 +84,9 @@

      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());
      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);
         //工序版次是否一致，是否在有效期内
@@ -114,11 +116,16 @@

      String businessKey = "0";//业务表key
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      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);
      }