增加车床程序处理；退回改为实际编程员

yangys

2025-09-03 a3a9933cf1b49006edf470615236f94ebdaa4cb9

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

@@ -1,6 +1,5 @@
package org.springblade.mdm.flow.excution;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
@@ -8,7 +7,6 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
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.service.FlowCommonService;
@@ -23,7 +21,6 @@
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,16 +28,13 @@
@AllArgsConstructor
@Service("startDispatcher")
public class StartDispatcher  {

   private final RuntimeService runtimeService;
   private final AutoAssignUsersService autoAssignUsersService;

   private final IdentityService identityService;
   private final NcNodeService ncNodeService;

   private final FlowProgramFileService flowProgramFileService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final ProduceDivisionService produceDivisionService;
   private final FlowCommonService flowCommonService;

   /**
@@ -56,7 +50,7 @@
      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());

      //机床编号
@@ -86,13 +80,15 @@
      NcNode curedProgramPackage = null;
      if(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
         //正常流程(非临时流程) 且不是 偏离单,才匹配固化程序
         curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getProcessEdition(), startVO.getMachineCode());
         curedProgramPackage = ncNodeService.getLastCuredProgramPackageWithoutProcessEdition(programPkgName,startVO.getMachineCode());
         //设置是否有固化程序标记
         vars.put(FlowContants.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowContants.Y : FlowContants.N);
         //工序版次是否一致，是否在有效期内
         if (curedProgramPackage != null && Func.isBlank(startVO.getDeviation())) {//偏离单优先，如果有偏离单，那么找到固化程序的也不算固化了
         if (curedProgramPackage != null) {
            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.CURED_LOCKED, curedProgramPackage.hasLocked()?FlowContants.Y:FlowContants.N);
            vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowContants.Y : FlowContants.N);
            vars.put("curedProcessEdition", curedProgramPackage.getProcessEdition());
            vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y : FlowContants.N);
         } else {
            vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
@@ -100,7 +96,7 @@
         }

      }else{
         //临时流程，不管固化
         //临时流程/偏离单，不匹配固化程序
         vars.put(FlowContants.HAS_CURED_PROGRAM,FlowContants.N);
      }
      String myProcessName = "试切下发流程";
@@ -116,11 +112,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);
      }