From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index f77b494..7f5a5d0 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -33,6 +34,7 @@
private java.lang.String id;
/**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private java.lang.String createBy;
/**鍒涘缓鏃堕棿*/
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -41,6 +43,7 @@
private java.util.Date createTime;
/**鏇存柊浜�*/
@ApiModelProperty(value = "鏇存柊浜�")
+ @Dict(dicCode = "sys_user, realname, username")
private java.lang.String updateBy;
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@@ -59,11 +62,11 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private java.lang.String equipmentName;
/**鍏抽敭璁惧鏍囪瘑*/
- @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15)
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15, dicCode = "yn")
@ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
private java.lang.String equipmentImportance;
/**鎶�鏈姸鎬�*/
- @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "technology_status")
+ @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status")
@ApiModelProperty(value = "鎶�鏈姸鎬�")
@Dict(dicCode = "technology_status")
private java.lang.String technologyStatus;
@@ -72,15 +75,17 @@
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
private java.lang.String operationSystem;
/**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤閮ㄩ棬", width = 15)
+ @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
@ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
private java.lang.String orgId;
/**璁惧绠＄悊鍛�*/
- @Excel(name = "璁惧绠＄悊鍛�", width = 15)
+ @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "璁惧绠＄悊鍛�")
+ @Dict(dicCode = "sys_user, realname, username")
private java.lang.String equipmentManager;
/**璁惧鍒嗙被*/
- @Excel(name = "璁惧鍒嗙被", width = 15, dicCode = "equipment_category")
+ @Excel(name = "璁惧鎵�灞炲垎绫�", width = 15, dicCode = "equipment_category")
@ApiModelProperty(value = "璁惧鍒嗙被")
@Dict(dicCode = "equipment_category")
private java.lang.String equipmentCategory;
@@ -93,7 +98,7 @@
@ApiModelProperty(value = "璁惧瑙勬牸")
private java.lang.String equipmentSpecification;
/**涓昏酱杩炴帴灏哄*/
- @Excel(name = "涓昏酱杩炴帴灏哄", width = 15)
+ @Excel(name = "涓昏酱杩炴帴灏哄", width = 25)
@ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
private java.lang.String spindleConnectDimension;
/**鎬诲姛鐜�*/
@@ -122,31 +127,35 @@
@ApiModelProperty(value = "鏈哄簥鍘傚")
private java.lang.String manufacturingEnterprise;
/**鏉ユ簮鍥藉*/
- @Excel(name = "鏉ユ簮鍥藉", width = 15)
+ @Excel(name = "鏈哄簥鏉ユ簮鍥藉", width = 25)
@ApiModelProperty(value = "鏉ユ簮鍥藉")
private java.lang.String originCountry;
/**鍑哄巶鏃ユ湡*/
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy-MM-dd")
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date leaveFactoryDate;
/**楠屾敹鏃ユ湡*/
+ @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy-MM-dd")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date acceptanceCheckDate;
/**璐ㄤ繚寮�濮嬫棩鏈�*/
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 25, format = "yyyy-MM-dd")
@ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date warrantyStartDate;
/**璐ㄤ繚缁撴潫鏃ユ湡*/
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 25, format = "yyyy-MM-dd")
@ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date warrantyEndDate;
/**鏄惁瀹炴柦MDC*/
- @Excel(name = "鏄惁瀹炴柦MDC", width = 15)
+ @Excel(name = "鏄惁瀹炴柦MDC", width = 15, dicCode = "yn")
@ApiModelProperty(value = "鏄惁瀹炴柦MDC")
private java.lang.String mdcFlag;
/*=====================涓婇潰鏄矁鍏嬫ā鏉垮瓧娈�======================*/
@@ -174,12 +183,16 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private java.lang.String remark;
- /**
- * 浣跨敤閮ㄩ棬鎵�鏈塈D
- * 浣跨敤閮ㄩ棬ID + 鍏舵墍鏈夌埗绾D, 浠ラ�楀彿鍒嗗壊
- */
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬鎵�鏈塈D")
- private String orgParentIds;
@ApiModelProperty(value = "MDC璁惧绫诲瀷")
private String deviceType;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "缁翠慨鐘舵��")
+ @Dict(dicCode = "equipment_repair_status")
+ private String repairStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "淇濆吇鐘舵��")
+ @Dict(dicCode = "equipment_maintenance_status")
+ private String maintenanceStatus;
}
--
Gitblit v1.9.3