yangys
2025-08-09 c723796f39021476247cf1adf8dc587939c95535
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -34,7 +34,7 @@
   /**
    * 创建树到机床级别
    * @param programProperties
    * @param programProperties 程序属性
    */
   @Transactional
   public NcNode createNodeTreeToMachine(FlowProgramProperties programProperties) {
@@ -81,7 +81,8 @@
      //,int rootNodeCatgory = 1:试切,2固化,3偏离
      NcNode programPkdNode = createTreeToPackage(programProperties);
      //删除之前创建过的程序文件节点(因为重复在编制节点审批),避免重复数据
      this.ncNodeService.lambdaUpdate().eq(NcNode::getParentId, programPkdNode.getId()).remove();
      //this.ncNodeService.lambdaUpdate().eq(NcNode::getParentId, programPkdNode.getId()).remove();
      ncNodeService.deleteSubNodes(programPkdNode.getId());
      List<FlowProgramFile> programFiles = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId, programProperties.getProcessInstanceId()).list();
      for (FlowProgramFile programFile : programFiles) {
@@ -90,6 +91,12 @@
   }
   /**
    * 建立程序文件节点
    * @param programFile 流程文件
    * @param programPkdNode 程序包名 节点,程序节点的 上级
    * @param programProperties 流程发起的程序的属性
    */
   private void createProgramFileNode(FlowProgramFile programFile, NcNode programPkdNode, FlowProgramProperties programProperties) {
      //此处应避免重复创建
@@ -114,9 +121,10 @@
   /**
    * 创建节点到程序包级别
    * @param programProperties
    * @return
    * @param programProperties 程序属性
    * @return 程序包名节点(最末级)
    */
   @Transactional
   public NcNode createTreeToPackage(FlowProgramProperties programProperties) {
      NcNode machineCodeNode = createNodeTreeToMachine(programProperties);
      String programPkgName = NcNodeService.genProgramName(programProperties.getDrawingNo(),programProperties.getProcessNo());
@@ -159,7 +167,7 @@
            ncNode.setProcessName(programProperties.getProcessName());
            ncNode.setMachineCode(programProperties.getMachineCode());
            ncNode.setProductModel(programProperties.getProductModel());
            //ncNode.setMachineMode(programProperties.getMachineMode());
         }
         ncNode.setIsLastEdition(1);