加入确认表导出

yangys

2025-08-29 4187bc6d6f6595958cac264eb49455bf4d716800

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java

@@ -66,7 +66,7 @@
         ProgramNodeVO node = new ProgramNodeVO();
         node.setId(String.valueOf(workshop.getId()));
         node.setName(workshop.getDeptName());

         node.setNodeType("workshop");
         roots.add(node);

         //加入车间下的工段
@@ -77,7 +77,7 @@
            nodeGd.setId(String.valueOf(gd.getId()));
            nodeGd.setName(gd.getDeptName());
            nodeGd.setParentId(gd.getParentId());

            nodeGd.setNodeType("seg");
            node.addChildren(nodeGd);

            //加入工段下的机床
@@ -86,6 +86,7 @@
               nodeMachine.setName(machine.getCode());
               nodeMachine.setId(String.valueOf(machine.getId()));
               nodeMachine.setMachineCode(machine.getCode());
               nodeMachine.setNodeType("machine");
               addFolderNodes(nodeMachine);

               nodeGd.addChildren(nodeMachine);
@@ -107,6 +108,7 @@
      sendNode.setName("SEND");
      sendNode.setMachineCode(nodeMachine.getMachineCode());
      sendNode.setDirType(MachineFile.DIR_TYPE_SEND);
      sendNode.setNodeType("dir");
      //sendNode.setParentId(nodeMachine.getId());

      ProgramNodeVO recNode = new ProgramNodeVO();
@@ -114,13 +116,25 @@
      recNode.setName("REC");
      recNode.setMachineCode(nodeMachine.getMachineCode());
      recNode.setDirType(MachineFile.DIR_TYPE_REC);
      recNode.setNodeType("dir");

      ProgramNodeVO tempNode = new ProgramNodeVO();
      tempNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_TEMP);
      tempNode.setName("TEMP");
      tempNode.setMachineCode(nodeMachine.getMachineCode());
      tempNode.setDirType(MachineFile.DIR_TYPE_TEMP);

      tempNode.setNodeType("dir");
      nodeMachine.setChildren(Arrays.asList(sendNode,recNode,tempNode));
   }

   /**
    * 树查询
    * @param keyword 关键字
    * @return 搜索道德机器列表
    */
   public List<String> treeSearch(String keyword) {
      return machineService.lambdaQuery()
         .like(Machine::getCode,keyword)
         .list().stream().map(m -> {return Func.toStr(m.getId());}).toList();
   }
}