From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 5269ef6..5080c03 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
@@ -202,6 +202,7 @@
private String precisionParametersTemplateId;
@ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氱被鍨嬶紙瀛楀吀technology_status_verification_type锛�")
+ @Dict(dicCode = "technology_status_verification_type")
private String technologyStatusVerificationType;
@ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬崟鎹�")
@@ -305,8 +306,8 @@
private List<EquipmentProcessParameters> processEditTableList;
@TableField(exist = false)
private List<EquipmentPrecisionParameters> precisionEditTableList;
- @Dict(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name")
- @Excel(width = 15,dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name",orderNum = "39", name = "杞﹂棿")
+ @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")
@@ -358,6 +359,13 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date nextThirdMaintenanceTime;
+ @ApiModelProperty(value = "鐢熶骇绾縄D")
+ private String lineId;
+
+ @ApiModelProperty(value = "鏄惁涓昏澶�")
+ @Dict(dicCode = "is_product")
+ private String isMeta;
+
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@TableField(exist = false)
@@ -375,4 +383,10 @@
@TableField(exist = false)
private String maintenanceOrderId;
private String checkPeriod;
+ @TableField(exist = false)
+ private List<Equipment> equipmentOfLineTable;
+ @TableField(exist = false)
+ private String showId;
+ @TableField(exist = false)
+ private Integer sumOfEquipment;
}
--
Gitblit v1.9.3