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-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
index a46ec96..3857c1d 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.util;
+import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.model.MdcProductionTreeModel;
@@ -25,6 +26,9 @@
List<MdcProductionTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
MdcProduction mdcProduction = recordList.get(i);
+ if (StrUtil.isEmpty(mdcProduction.getDescription())){
+ mdcProduction.setDescription("");
+ }
records.add(new MdcProductionTreeModel(mdcProduction));
}
List<MdcProductionTreeModel> tree = findChildren(records, idList);
@@ -63,6 +67,7 @@
if (m.getParentId() != null && m.getParentId().equals(model.getId())) {
model.getChildren().add(m);
ProductionIdModel pim = new ProductionIdModel().convert(m);
+ idModel.setSelectable(false);
idModel.getChildren().add(pim);
}
}
--
Gitblit v1.9.3