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 | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 b32b909..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
@@ -52,12 +52,13 @@
@ApiModelProperty(value = "璁惧瑙勬牸")
private String specification;
/**璁惧鐘舵��*/
- @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17")
+ @Excel(name = "璁惧鐘舵��", width = 15,orderNum = "17",dicCode = "equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
@Dict(dicCode = "equipment_status")
private String equipmentStatus;
/**鎶�鏈姸鎬�*/
@ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Excel(name = "鎶�鏈姸鎬�", width = 15,orderNum = "18",dicCode = "technology_status")
@Dict(dicCode = "technology_status")
private String technologyStatus;
/**璧勪骇缂栧彿*/
@@ -90,11 +91,11 @@
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNumber;
/**鍑哄巶鏃ユ湡*/
- @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "22")
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 15,orderNum = "23")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
/**楠屾敹鏃ユ湡*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "25")
+ @Excel(name = "楠屾敹鏃ユ湡", width = 15,orderNum = "26")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
/**鎵�鏈夌粍缁�*/
@@ -120,7 +121,7 @@
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String functionary;
/**浣嶇疆*/
- @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "21")
+ @Excel(name = "瀹夎浣嶇疆", width = 15,orderNum = "22")
@ApiModelProperty(value = "浣嶇疆")
private String location;
/**閲嶈搴�*/
@@ -160,15 +161,15 @@
@ApiModelProperty(value = "澶囩敤瀛楁2")
private String equipmentUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "閲嶉噺", width = 15,orderNum = "18")
+ @Excel(name = "閲嶉噺", width = 15,orderNum = "19")
@ApiModelProperty(value = "澶囩敤瀛楁3")
private String equipmentUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "19")
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅", width = 15,orderNum = "20")
@ApiModelProperty(value = "澶囩敤瀛楁4")
private String equipmentUda4;
/**澶囩敤瀛楁5*/
- @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "20")
+ @Excel(name = "鍔熻兘浣嶇疆", width = 15,orderNum = "21")
@ApiModelProperty(value = "澶囩敤瀛楁5")
private String equipmentUda5;
/**绉熸埛id*/
@@ -225,7 +226,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sealDate;
@ApiModelProperty(value = "璧勯噾鏉ユ簮")
- @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "24")
+ @Excel(name = "璧勯噾鏉ユ簮", width = 15,orderNum = "25")
private String fundSource;
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private String factoryNo;
@@ -264,7 +265,7 @@
@Excel(name = "鍧愭爣鏁伴噺", width = 15,orderNum = "16")
private BigDecimal coordinateNum;
@ApiModelProperty(value = "绔嬮」鍗″彿")
- @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "23")
+ @Excel(name = "绔嬮」鍗″彿", width = 15,orderNum = "24")
private String projectApprovalNo;
private String standardA;
private String standardB;
@@ -296,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