From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 08 九月 2023 16:23:47 +0800
Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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 604e31b..2101d60 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
@@ -297,5 +297,31 @@
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 = "杞﹂棿")
+ 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")
+ private String workCenterId;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15,orderNum = "37",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date warrantyStart;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15,orderNum = "38",format = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ private Date warrantyEnd;
+ @Dict(dicCode = "property_status")
+ @Excel(width = 15,orderNum = "41",dicCode = "property_status",name = "璧勪骇鐘舵��")
+ private String propertyStatus;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newStart;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date newEnd;
+ @TableField(exist = false)
+ private String newABCTag;
}
--
Gitblit v1.9.3