dnc导入导出格式修改

yangys

2025-08-04 5173c99276023cac788875d5fa8d5cad84112777

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

@@ -1,8 +1,13 @@
package org.springblade.mdm.flow.service;

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
@@ -10,77 +15,107 @@
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 固化流程服务
 */
@Slf4j
@Service
@AllArgsConstructor
public class CureFlowService {

   @Autowired
   private RuntimeService runtimeService;
   @Autowired
   private AutoAssignUsersService autoAssignUsersService;
   @Autowired
   private IdentityService identityService;
   private final RuntimeService runtimeService;

   @Autowired
   private NcProgramService ncProgramService;
   @Autowired
   private NcNodeService ncNodeService;
   @Autowired
   private MachineService machineService;
   private final HistoryService historyService;

   private final IdentityService identityService;

   /**
    * 固化流程的key
    */
   private static final String PROCESS_KEY = "program-cure";

   /**
    * 启动固化流程
    * @param programId 程序id
    */
   public void start(long programId){
      Map<String, Object> vars = new HashMap<>();
      //NcProgram prog = ncProgramService.getById(programId);
      NcNode progNode = ncNodeService.getById(programId);
      Machine machine = machineService.getByCode(progNode.getMachineCode());
      vars.put("machineCode",machine.getCode());
      vars.put("machineMode",machine.getName());
      vars.put("processEdition",progNode.getProcessEdition());
      vars.put("programId",programId);
      vars.put("program",progNode);


   @Transactional
   public void startCure(List<NcNode> programPackageList) {
      //根据分组启动流程，并插入关联表
      programPackageList.forEach(this::startOne);
   }

   /**
    * 启动一个数控程序的固化流程
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcNode programPackage) {
      Map<String, Object> vars = null;
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
         }

      }
      if(vars == null){
         vars = new HashMap<>();
      }
      /*
      String programmer = null;
      String checker = null;
      String senior = null;

      for (HistoricTaskInstance task : historicTasks) {
         // 获取任务的办理人
         if(task.getTaskDefinitionKey().equals("programmingTask")){
            //编制
            programmer = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("check")){
            //校对
            checker = task.getAssignee();
         }else if(task.getTaskDefinitionKey().equals("senior")){
            //审核
            senior = task.getAssignee();
         }

      }*/
      //vars.put("programmer",programmer);
      //vars.put("checker",checker);
      //vars.put("senior",senior);

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

      identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//设置流程发起人
      ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
      log.info("启动固化流程完成，实例id={}", pinst.getId());
      //这里需要新建一个同名程序包名，和下属的文件吗，不需要，在dncSendbackService中新建的，这里不处理

      int a=1;
      //log.info()
   }

   /**
    * 生成零组件编号
    * 图号、图号版次、工序号、工序名称、工艺版次、工序版次 组合起来获得零组件号
    * @param startVO
    * 将程序按照机器代码分组
    * @param ncProgramIdList
    * @return
    */
   String generatePartNo(TaskAssignVO startVO){
      //TODO 这个格式未确定，需要确认
      return String.format("%s-%s-%s-%s-%s-%s",
         startVO.getDrawingNo(),
         startVO.getDrawingNoEdition(),
         startVO.getProcessNo(),
         startVO.getProcessName(),
         startVO.getCraftEdition(),
         startVO.getProcessEdition());
   }
   /*
   Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
      List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
      return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
   }*/
}