dnc导入导出格式修改

yangys

2025-08-04 5173c99276023cac788875d5fa8d5cad84112777

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

@@ -1,6 +1,7 @@
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;
@@ -31,6 +32,7 @@
/**
 * 固化流程服务
 */
@Slf4j
@Service
@AllArgsConstructor
public class CureFlowService {
@@ -41,11 +43,6 @@

   private final IdentityService identityService;

   private final NcProgramService ncProgramService;

   private final MachineService machineService;

   private final ProcessProgRefService processProgRefService;
   /**
    * 固化流程的key
    */
@@ -54,33 +51,22 @@


   @Transactional
   public void startCure(List<NcProgram> programs) {
      //DncSendBackData sendBackData;
      //List<Long> ncProgramIdList = dataList.stream().map(DncSendBackData::getId).toList();
      //Map<String,List<NcProgram>> groupedProgram = groupProgramsByMachineCode(ncProgramIdList);
      //List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
   public void startCure(List<NcNode> programPackageList) {
      //根据分组启动流程，并插入关联表
      programs.forEach(this::startOne);
      programPackageList.forEach(this::startOne);
   }

   /**
    * 启动一个数控程序的固化流程
    * @param prog 数控程序实体
    * @param programPackage 程序包名 节点实体
    */
   public void startOne(NcProgram prog){

   public void startOne(NcNode programPackage) {
      Map<String, Object> vars = null;
         //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
      if(preRef != null) {
      //该程序在计划任务时 获取编制，校对，审批的人员，作为默认用户，其中编制时第一个固定的用户
      if(programPackage.getProcessInstanceId() != null) {
         //获取审批用户
         /*
         List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
            .processInstanceId(preRef.getProcessInstanceId())
            .orderByHistoricTaskInstanceEndTime().desc()
            .list();*/
         HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
            .processInstanceId(preRef.getProcessInstanceId()).includeProcessVariables()
            .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
            .singleResult();
         if(instance != null) {//使用任务派工流程的变量
            vars = new HashMap<>(instance.getProcessVariables());
@@ -117,12 +103,9 @@

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

      ProcessProgRef ref = new ProcessProgRef();
      ref.setProcessInstanceId(pinst.getId());
      ref.setNcProgramId(prog.getId());

      processProgRefService.save(ref);
   }

   /**