From be8a6f171bd41aa50fb7310b2ccbe753dac20b89 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 143 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..4435ed5 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
@@ -32,8 +32,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="mom_eam_equipment瀵硅薄", description="mom_eam_equipment")
-public class Equipment implements Serializable {
+public class Equipment implements Serializable {
private static final long serialVersionUID = 1L;
+
private String id;
/**璁惧缂栫爜*/
@Excel(name = "缁熶竴缂栫爜", width = 15,orderNum = "0")
@@ -52,12 +53,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 +92,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 +122,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 +162,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*/
@@ -199,6 +201,13 @@
@Dict(dicCode = "id",dictTable = "mom_eam_precision_parameters_template",dicText = "name")
private String precisionParametersTemplateId;
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氱被鍨嬶紙瀛楀吀technology_status_verification_type锛�")
+ @Dict(dicCode = "technology_status_verification_type")
+ private String technologyStatusVerificationType;
+
+ @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬崟鎹�")
+ private String technologyStatusVerificationBill;
+
@TableField(exist = false)
private String processParametersTemplateName;
@@ -225,7 +234,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;
@@ -244,6 +253,7 @@
private String securityConfiguration;
@ApiModelProperty(value = "鍐峰嵈绯荤粺")
@Excel(name = "鍐峰嵈绯荤粺", width = 15,orderNum = "10")
+ @Dict(dicCode = "cooling_system")
private String coolingSystem;
@Excel(name = "鐏伀鍣�", width = 15,orderNum = "11")
@ApiModelProperty(value = "鐏伀鍣�")
@@ -253,6 +263,7 @@
private String fireExtinguisherValidityPeriod;
@Excel(name = "鎿嶄綔绯荤粺", width = 15,orderNum = "13")
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ @Dict(dicCode = "operation_flag")
private String operatingSystem;
@Excel(name = "绯荤粺", width = 15,orderNum = "14")
@ApiModelProperty(value = "绯荤粺")
@@ -264,7 +275,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 +307,127 @@
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_area",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;
+
+ @Excel(name = "鎶�鏈姸鎬佸埌鏈熸椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date technologyStatusExpirationTime;
+
+ @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date technologyStatusQualificationTime;
+
+ @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date nextTechnologyStatusQualificationTime;
+
+ @Excel(name = "鏈浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date secondMaintenanceTime;
+
+ @Excel(name = "涓嬫浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date nextSecondMaintenanceTime;
+
+ @Excel(name = "鏈涓変繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date thirdMaintenanceTime;
+
+ @Excel(name = "涓嬫涓変繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private java.util.Date nextThirdMaintenanceTime;
+
+ @ApiModelProperty(value = "鐢熶骇绾縄D")
+ @Dict(dictTable = "mom_eam_equipment",dicText = "num",dicCode = "id")
+ 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)
+ 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;
+ @TableField(exist = false)
+ List<EquipmentSpares> equipmentSparesList;
+ @TableField(exist = false)
+ private String equipmentCategoryUda1;
+ @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;
+ @Dict(dicCode = "is_product")
+ 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;
+
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date startTime;
+
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ @TableField(exist = false)
+ private String yseNoInspectionStandard;
+ @TableField(exist = false)
+ private String yseNoMaintenance2Standard;
+ @TableField(exist = false)
+ private String yseNoMaintenance3Standard;
+ @TableField(exist = false)
+ private List<String> userWorkCenterIds;
+
}
--
Gitblit v1.9.3