固化流程，结束是移动节点

yangys

2025-08-14 8ab608ce1b8425fe13b0766024554031f23289dc

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java

@@ -2,11 +2,14 @@

import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.N;
import org.flowable.engine.delegate.DelegateExecution;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.commons.contants.ParamContants;
import org.springblade.mdm.commons.contants.ParamConstants;
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.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
@@ -26,11 +29,14 @@
   private final NcNodeService nodeService;
   private final NcNodeAutoCreateService ncNodeAutoCreateService;
   private final FlowCommonService flowCommonService;
   private final FlowProgramFileService flowProgramFileService;
   private final ISysClient sysClient;
   /**
    * 默认有效期间（月数）,2年
    */
   private static final int DEFAULT_VALID_MONTH = 24;
   private final NcNodeService ncNodeService;

   /**
    * 固化审批通过处理任务，
    * @param execution 流程execution
@@ -55,8 +61,10 @@
         pkgNode.setIsLocked(1);
         nodeService.updateById(pkgNode);
      }else {
         //试切的
         pkgNode.setIsCured(1);
         //设置过期日期
         pkgNode.upgradeVersionNUmber();
         pkgNode.setExpireDate(calculateExpireDate());
         nodeService.updateById(pkgNode);

@@ -67,21 +75,13 @@

   /**
    * 将节点和历史节点挪动到固化的同级节点下
    * @param pkgNode 要挪动的节点
    * @param historyProgramPackageNodes 程序包名 历史节点
    */
   void moveNodeToCuredTree(NcNode pkgNode,List<NcNode> historyProgramPackageNodes, FlowProgramProperties programProperties) {
      //创建节点到机床级别.(固化树)
      NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(programProperties);

      //移动到固化树下的机床节点下层
      //String newParentIds = machineNode.getParentIds()+","+machineNode.getId();

      //更新机床 下属节点的数据 为旧版本，锁定(最新版本=0，lock=1).
      /*
      this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, newParentIds)
         .in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
         .set(NcNode::getIsLastEdition,0).set(NcNode::getIsLocked,1).update();
       */
      //机床下现在没有文件了，程序包名升级与机床同级了，改为找到机床同级程序包名更新了
      this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, machineNode.getParentIds())
         .in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
@@ -91,18 +91,33 @@
         if(!hisPackageNode.getId().equals(pkgNode.getId())){
            hisPackageNode.setIsLastEdition(0);
         }
         hisPackageNode.setParentId(machineNode.getId());
         hisPackageNode.setParentId(machineNode.getParentId());
         hisPackageNode.setParentIds(machineNode.getParentIds());//程序包与机床节点同级

         //处理程序包下层的程序节点
         List<NcNode> programNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
         for(NcNode programNode : programNodes){
            programNode.setIsLastEdition(0);
            programNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
         }
         nodeService.updateBatchById(programNodes);
      }
      nodeService.updateBatchById(historyProgramPackageNodes);

      //新的流程文件，需要在包节点下新建，不能用老的
      List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode.getProcessInstanceId()).list();
      for(FlowProgramFile flowProgramFile : files){
         NcNode newProgNode = new NcNode();
         newProgNode.setName(flowProgramFile.getName());
         newProgNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
         newProgNode.setParentId(pkgNode.getId());
         newProgNode.setParentIds(pkgNode.getParentIds()+","+pkgNode.getId());
         newProgNode.setIsLastEdition(1);
         newProgNode.setVersionNumber(pkgNode.getVersionNumber());
         newProgNode.setFlowProgramFileId(flowProgramFile.getId());
         newProgNode.setIsCured(1);
         ncNodeService.save(newProgNode);
      }
   }

   /**
@@ -110,7 +125,7 @@
    * @return
    */
   private Date calculateExpireDate() {
      R<String> validMonResult = sysClient.getParamValue(ParamContants.CURE_VALID_MONTH_KEY);
      R<String> validMonResult = sysClient.getParamValue(ParamConstants.CURE_VALID_MONTH_KEY);

      int month = DEFAULT_VALID_MONTH;
      if(validMonResult.isSuccess() && validMonResult.getData()!=null){