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 | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 110 insertions(+), 4 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 2101d60..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")
@@ -200,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;
@@ -245,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 = "鐏伀鍣�")
@@ -254,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 = "绯荤粺")
@@ -297,11 +307,13 @@
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")
+ @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")
@@ -314,6 +326,50 @@
@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)
@@ -324,4 +380,54 @@
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