From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
index 7387b27..6a2c903 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/utils/TreeBuilder.java
@@ -91,11 +91,11 @@
});
}
- // 6. 寰幆妫�娴�
- if (sorted.size() != nodes.size()) {
- handleSortingFailure(nodes, sorted, nodeMap);
- return Collections.emptyList();
- }
+// // 6. 寰幆妫�娴�
+// if (sorted.size() != nodes.size()) {
+// handleSortingFailure(nodes, sorted, nodeMap);
+// return Collections.emptyList();
+// }
return sorted;
}
@@ -110,7 +110,8 @@
node.getParentId(),
node.getName(),
node.getCode(),
- node.getType()
+ node.getType(),
+ node.getCreateTime()
);
treeMap.put(newNode.getId(), newNode);
});
--
Gitblit v1.9.3