From ae5544f8a02a36a51989a5bccb994c7f542aeb74 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 14 三月 2024 16:22:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 6e1dd19..6232df8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -306,11 +306,13 @@
private List<EquipmentProcessParameters> processEditTableList;
@TableField(exist = false)
private List<EquipmentPrecisionParameters> precisionEditTableList;
+ /**宸ュ尯*/
@Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
@Excel(width = 15,dicCode = "id",dictTable = "mom_base_area",dicText = "name",orderNum = "39", name = "宸ュ尯")
private String factoryModelId;
+ /**涓績*/
@Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎",orderNum = "40")
- @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
private String workCenterId;
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15,orderNum = "37",format = "yyyy-MM-dd")
@@ -394,6 +396,18 @@
private String isLineEquip;
@Dict(dicCode = "is_product")
private String isJudging;
+ @Dict(dicCode = "is_product")
+ private String isLine;
+ @Dict(dicCode = "is_product")
+ @TableField(exist = false)
+ private String nums;
+ @TableField(exist = false)
+ private String equipmentId;
+ @TableField(exist = false)
+ private List<Equipment> keyEquipmentUpdateList;
+ /**宸ユ*/
+ @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
+ private String areaId;
}
--
Gitblit v1.9.3