修复审批表，确认表内容

yangys

2025-09-23 3baca21e0e6563f8379359ef2ba78c224eb4bc80

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java

@@ -5,7 +5,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
@@ -34,18 +34,18 @@

   public static final String TRY_NAME = "试切";
   public static final String CURE_NAME = "固化";
   public static final String DEVIATION_NAME = "偏离";
   public static final String DEVIATION_NAME = "临时更改单";

   /**
    * 创建树到机床级别
    * @param programProperties 程序属性
    */
   @Transactional
   public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) {
   public NcNode createNodeTreeToMachineGroup(FlowProgramProperties programProperties) {
      NcNode root;
      if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){
      if(programProperties.getProcessDefinitionKey().equals(FlowConstant.TRY_PROCESS_KEY)){
         if(Func.isEmpty(programProperties.getDeviation()) ||
            (FlowContants.Y.equals(programProperties.getHasCuredProgram()) &&  FlowContants.N.equals(programProperties.getCureProgramUseable()))){
            (FlowConstant.Y.equals(programProperties.getHasCuredProgram()) &&  FlowConstant.N.equals(programProperties.getCureProgramUseable()))){
            //普通试切，或者有固化不可用，建立试切节点
            //试切根节点
            root = rootNodeByName(TRY_NAME);
@@ -59,7 +59,7 @@
               root = createDeviationNode();
            }
         }
      }else if(programProperties.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
      }else if(programProperties.getProcessDefinitionKey().equals(FlowConstant.CURE_PROCESS_KEY)){
         root = rootNodeByName(CURE_NAME);
         if(root == null){
            root = createCureNode();
@@ -78,64 +78,23 @@
      //工序版次节点
      NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties,null);
      //加工机床节点
      return createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties,null);
      return createNodeIfNotExists(programProperties.getMachineGroupCode(),NcNode.TYPE_MACHINE_GROUP, processEditionNode,programProperties,null);
   }

   @Transactional
   public NcNode createNodeTreeToProcessEdition(FlowProgramProperties programProperties) {
      NcNode root;
      if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){
         if(Func.isEmpty(programProperties.getDeviation()) ||
            (FlowContants.Y.equals(programProperties.getHasCuredProgram()) &&  FlowContants.N.equals(programProperties.getCureProgramUseable()))){
            //普通试切，或者有固化不可用，建立试切节点
            //试切根节点
            root = rootNodeByName(TRY_NAME);
            if (root == null) {
               root = createTryNode();
            }
         }else{
            //有偏离
            root = rootNodeByName(DEVIATION_NAME);
            if(root == null){
               root = createDeviationNode();
            }
         }
      }else if(programProperties.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
         root = rootNodeByName(CURE_NAME);
         if(root == null){
            root = createCureNode();
         }
      }else{
         throw new ServiceException("流程定义不在范围内");
      }
      //创建产品型号节点
      NcNode productModelNode = createNodeIfNotExists(programProperties.getProductModel(),NcNode.TYPE_PRODUCT_MODEL, root,programProperties,null);
      //零组件号节点
      NcNode drawingNoNode = createNodeIfNotExists(programProperties.getDrawingNo(),NcNode.TYPE_DRAWING_NO, productModelNode,programProperties,null);
      //工艺版次节点
      //NcNode craftEditionNode = createNodeIfNotExists(programProperties.getCraftEdition(),NcNode.TYPE_CRAFT_EDITION, drawingNoNode,programProperties);
      //工序号节
      NcNode processNoNode = createNodeIfNotExists(programProperties.getProcessNo(),NcNode.TYPE_PROCESS_NO, drawingNoNode,programProperties,null);
      //工序版次节点
      NcNode processEditionNode = createNodeIfNotExists(programProperties.getProcessEdition(),NcNode.TYPE_PROCESS_EDITION, processNoNode,programProperties,null);
      //加工机床节点
      return createNodeIfNotExists(programProperties.getMachineCode(),NcNode.TYPE_MACHINE_CODE, processEditionNode,programProperties,null);
   }
   /**
    * 根据流程信息，自动创建各个节点,包括程序节点
    * @param programProperties 程序属性
    * @return 程序包节点实例
    */
   @Transactional
   public NcNode createNodeTreeWithProgram(FlowProgramProperties programProperties,Integer versionNumber) {
      //,int rootNodeCatgory = 1:试切，2固化，3偏离
      NcNode programPkdNode = createTreeToPackage(programProperties,versionNumber);
   public NcNode createNodeTreeWithProgram(FlowProgramProperties programProperties) {
      NcNode programPkdNode = createTreeToPackage(programProperties);
      //删除之前创建过的程序文件节点(因为重复在编制节点审批)，避免重复数据
      ncNodeService.deleteSubNodes(programPkdNode.getId());
      //ncNodeService.deleteSubNodes(programPkdNode.getId());//del 0923 18:07

      List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, programProperties.getProcessInstanceId()).list();
      List<FlowProgramFile> programFiles = flowProgramFileService.listByProcessInstanceId(programProperties.getProcessInstanceId());
      for (FlowProgramFile programFile : programFiles) {
         createProgramFileNode(programFile, programPkdNode,versionNumber);//所有文件包括程序和其他，都需要建立节点
         createProgramFileNode(programFile, programPkdNode);//所有文件包括程序和其他，都需要建立节点
      }

      return programPkdNode;
@@ -147,7 +106,7 @@
    * @param programPkdNode 程序包名 节点，程序节点的 上级
    * @param versionNumber 版本号
    */
   private void createProgramFileNode(FlowProgramFile programFile, NcNode programPkdNode, Integer versionNumber) {
   private void createProgramFileNode(FlowProgramFile programFile, NcNode programPkdNode) {
      //此处应避免重复创建

      NcNode node = new NcNode();
@@ -160,11 +119,7 @@
      node.setIsLastEdition(1);

      node.setFlowProgramFileId(programFile.getId());
      if(versionNumber == null){
         node.setVersionNumber(1);
      }else {
         node.setVersionNumber(versionNumber);
      }

      node.setParentId(programPkdNode.getId());
      node.setParentIds(programPkdNode.getParentIds()+","+programPkdNode.getId());

@@ -178,22 +133,49 @@
    * @return 程序包名节点（最末级）
    */
   @Transactional
   public NcNode createTreeToPackage(FlowProgramProperties programProperties,Integer versionNumber) {
      NcNode machineCodeNode = createNodeTreeToMachine(programProperties);
      NcNode processEditionNode = this.ncNodeService.getById(machineCodeNode.getParentId());
      //获取工序版次下其他机床名，存在则删除
      ncNodeService.lambdaUpdate().eq(NcNode::getNodeType,NcNode.TYPE_MACHINE_CODE)
         .eq(NcNode::getParentId,processEditionNode.getId()).eq(NcNode::getIsLastEdition,1)
         .ne(NcNode::getName,machineCodeNode.getName()).remove();
   public NcNode createTreeToPackage(FlowProgramProperties programProperties) {
      NcNode machineGroupNode = createNodeTreeToMachineGroup(programProperties);

      //保持加工机床是最新下发任务的机床，不是新建一个机床节点，插叙工序版次下是否有其他的机床（零件号一致，工序号，工序版次一致）
      //获取
      //加工机床和程序包名在同一级节点,同在工序版次下级
      String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo(),programProperties.getProcessEdition());
      return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, processEditionNode,programProperties,versionNumber);
      return createProgramPackageNode(programProperties,machineGroupNode);

      //return createNodeIfNotExists(programPkgName ,NcNode.TYPE_PROGRAM_PACKAGE, machineGroupNode,programProperties,versionNumber);

   }

   /**
    * 创建程序包名节点
    * @param programProperties
    * @param parentNode
    * @return
    */
   NcNode createProgramPackageNode(FlowProgramProperties programProperties,NcNode parentNode){
      NcNode node = new NcNode();

      node.setNodeType(NcNode.TYPE_PROGRAM_PACKAGE);
      node.setName(NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo(),programProperties.getProcessEdition()));
      node.setProcessInstanceId(programProperties.getProcessInstanceId());
      node.setDrawingNo(programProperties.getDrawingNo());
      node.setDrawingNoEdition(programProperties.getDrawingNoEdition());
      node.setCraftEdition(programProperties.getCraftEdition());
      node.setProcessNo(programProperties.getProcessNo());
      node.setProcessEdition(programProperties.getProcessEdition());
      node.setProcessName(programProperties.getProcessName());
      node.setMachineCode(programProperties.getMachineCode());
      node.setMachineGroupCode(programProperties.getMachineGroupCode());
      node.setProductModel(programProperties.getProductModel());

      node.setDeviation(programProperties.getDeviation());
      node.setProgramNo(programProperties.getProgramNo());
      //node.setVersionNumber(versionNumber);

      node.setParentId(parentNode.getId());
      node.setParentIds(parentNode.subNodeParentIds());

      ncNodeService.save(node);

      return node;
   }
   /**
    * 不存在则创建节点
    * @param name 节点名称
@@ -230,12 +212,12 @@
            ncNode.setProcessEdition(programProperties.getProcessEdition());
            ncNode.setProcessName(programProperties.getProcessName());
            ncNode.setMachineCode(programProperties.getMachineCode());
            ncNode.setMachineGroupCode(programProperties.getMachineGroupCode());
            ncNode.setProductModel(programProperties.getProductModel());

            ncNode.setDeviation(programProperties.getDeviation());

            if(NcNode.TYPE_PROGRAM_PACKAGE.equals(nodeType)) {//程序包节点，分配程序编号

               ncNode.setProgramNo(programProperties.getProgramNo());
            }
         }