From 17f262abba94581573ac6954152a3f59234aaa76 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 24 三月 2025 13:08:52 +0800
Subject: [PATCH] art: 设备树可选标记
---
db/数据库产品化设计.pdma.json | 20 +++++++++++++++++++-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java | 1 +
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java | 5 +++++
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 6 ------
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index 8498d4a..cfcc1d6 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-3-20 13:24:21",
+ "updatedTime": "2025-3-21 11:45:26",
"dbConns": [],
"profile": {
"default": {
@@ -1520,6 +1520,24 @@
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "AD503E36-C231-4D72-8643-AE270605278C"
+ },
+ {
+ "defKey": "device_type",
+ "defName": "MDC璁惧绫诲瀷",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+ "id": "C782DB97-DE08-4CD0-BC5B-05505BD519C0"
}
],
"correlations": [],
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index f77b494..3731a33 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -174,12 +174,6 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private java.lang.String remark;
- /**
- * 浣跨敤閮ㄩ棬鎵�鏈塈D
- * 浣跨敤閮ㄩ棬ID + 鍏舵墍鏈夌埗绾D, 浠ラ�楀彿鍒嗗壊
- */
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬鎵�鏈塈D")
- private String orgParentIds;
@ApiModelProperty(value = "MDC璁惧绫诲瀷")
private String deviceType;
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java
index c9466e6..a6cd48a 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/ProductionIdModel.java
@@ -37,6 +37,11 @@
*/
private String title;
+ /**
+ * 鏄惁鍙��
+ */
+ private Boolean selectable = true;
+
List<ProductionIdModel> children = new ArrayList<>();
/**
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 e9af14d..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
@@ -67,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