导入工控网，附件改名

yangys

2025-08-20 295bf6f10ad0b668d2dbaa4525a15d6d52807ef1

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

@@ -11,6 +11,7 @@
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;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
@@ -40,7 +41,7 @@
   private final FlowProgramFileService flowProgramFileService;
   private final NodeDeptQueryService nodeDeptQueryService;
   private final ProduceDivisionService produceDivisionService;

   private final FlowCommonService flowCommonService;

   /**
    * 启动派工流程
@@ -50,10 +51,13 @@
   @Transactional
   public String start(TaskAssignVO startVO){
      Map<String, Object> vars = new HashMap<>();
      //Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
      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());

      //临时流程标志，明确指定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());
@@ -77,8 +81,7 @@
      String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
      vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPkgName);

      //TODO 查询固化程序是，应该去掉有偏离单的？
      NcNode curedProgramPackage = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
      NcNode curedProgramPackage = ncNodeService.getCuredProgramPackage(programPkgName,startVO.getMachineCode());
      //设置是否有固化程序标记
      vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
      //工序版次是否一致，是否在有效期内
@@ -103,44 +106,36 @@
      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);

      if(curedProgramPackage != null) {//存在已固化程序，复制原来的程序文件。创建节点仍然在编程人员提交以后
         copyFlowProgramFiles(curedProgramPackage.getProcessInstanceId(),inst.getProcessInstanceId());
      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);
         }
      }
   }