From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 29 七月 2025 11:27:45 +0800
Subject: [PATCH] 添加定型指派设备
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 462 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 319 insertions(+), 143 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..59e3040 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;
@@ -14,172 +15,347 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
/**
* @Description: 璁惧鍙拌处
* @Author: jeecg-boot
- * @Date: 2025-03-19
+ * @Date: 2025-03-19
* @Version: V1.0
*/
@Data
@TableName("eam_equipment")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_equipment瀵硅薄", description="璁惧鍙拌处")
+@ApiModel(value = "eam_equipment瀵硅薄", description = "璁惧鍙拌处")
public class EamEquipment implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
- /**鍒涘缓浜�*/
+ private java.lang.String id;
+ /**
+ * 鍒涘缓浜�
+ */
@ApiModelProperty(value = "鍒涘缓浜�")
- private java.lang.String createBy;
- /**鍒涘缓鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
- private java.util.Date createTime;
- /**鏇存柊浜�*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
+ private java.util.Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
@ApiModelProperty(value = "鏇存柊浜�")
- private java.lang.String updateBy;
- /**鏇存柊鏃堕棿*/
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
- private java.util.Date updateTime;
- /**鍒犻櫎鏍囪*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss ")
+ private java.util.Date updateTime;
+ /**
+ * 鍒犻櫎鏍囪
+ */
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private java.lang.Integer delFlag;
- /**璁惧缁熶竴缂栧彿*/
- @Excel(name = "璁惧缂栧彿", width = 15)
+ private java.lang.Integer delFlag;
+ /**
+ * 璁惧缁熶竴缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
@ApiModelProperty(value = "璁惧缂栧彿")
- private java.lang.String equipmentCode;
- /**璁惧鍚嶇О*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ private java.lang.String equipmentCode;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
@ApiModelProperty(value = "璁惧鍚嶇О")
- private java.lang.String equipmentName;
- /**鍏抽敭璁惧鏍囪瘑*/
- @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15)
- @ApiModelProperty(value = "鍏抽敭璁惧鏍囪瘑")
- private java.lang.String equipmentImportance;
- /**鎶�鏈姸鎬�*/
- @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "technology_status")
- @ApiModelProperty(value = "鎶�鏈姸鎬�")
- @Dict(dicCode = "technology_status")
- private java.lang.String technologyStatus;
- /**鎿嶄綔绯荤粺*/
- @Excel(name = "鎿嶄綔绯荤粺", width = 15)
- @ApiModelProperty(value = "鎿嶄綔绯荤粺")
- private java.lang.String operationSystem;
- /**浣跨敤閮ㄩ棬*/
- @Excel(name = "浣跨敤閮ㄩ棬", width = 15)
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
- private java.lang.String orgId;
- /**璁惧绠＄悊鍛�*/
- @Excel(name = "璁惧绠＄悊鍛�", width = 15)
- @ApiModelProperty(value = "璁惧绠＄悊鍛�")
- private java.lang.String equipmentManager;
- /**璁惧鍒嗙被*/
- @Excel(name = "璁惧鍒嗙被", width = 15, dicCode = "equipment_category")
- @ApiModelProperty(value = "璁惧鍒嗙被")
- @Dict(dicCode = "equipment_category")
- private java.lang.String equipmentCategory;
- /**璁惧鍨嬪彿*/
- @Excel(name = "璁惧鍨嬪彿", width = 15)
+ private java.lang.String equipmentName;
+ /**
+ * 浣跨敤閮ㄩ棬
+ */
+ @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id", orderNum = "9")
+ @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+ @Dict(dicCode = "mdc_production, production_name, id")
+ private java.lang.String orgId;
+ /**
+ * 璁惧绠＄悊鍛�
+ */
+ @Excel(name = "璁惧绠＄悊鍛�", width = 35, dictTable = "sys_user", dicText = "realname", dicCode = "username", orderNum = "10")
+ @ApiModelProperty(value = "璁惧绠＄悊鍛�")
+ @Dict(dicCode = "sys_user, realname, username")
+ private java.lang.String equipmentManager;
+ /**
+ * 璁惧绫诲埆
+ */
+ @Excel(name = "璁惧绫诲埆", width = 15, dicCode = "equipment_category", orderNum = "5")
+ @ApiModelProperty(value = "璁惧绫诲埆")
+ @Dict(dicCode = "equipment_category")
+ private java.lang.String equipmentCategory;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
@ApiModelProperty(value = "璁惧鍨嬪彿")
- private java.lang.String equipmentModel;
- /**璁惧瑙勬牸*/
- @Excel(name = "璁惧瑙勬牸", width = 15)
+ private java.lang.String equipmentModel;
+ /**
+ * 璁惧瑙勬牸
+ */
+ @Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "4")
@ApiModelProperty(value = "璁惧瑙勬牸")
- private java.lang.String equipmentSpecification;
- /**涓昏酱杩炴帴灏哄*/
- @Excel(name = "涓昏酱杩炴帴灏哄", width = 15)
- @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
- private java.lang.String spindleConnectDimension;
- /**鎬诲姛鐜�*/
- @Excel(name = "鎬诲姛鐜�", width = 15)
- @ApiModelProperty(value = "鎬诲姛鐜�")
- private java.lang.String equipmentPower;
- /**瀹夎浣嶇疆*/
- @Excel(name = "瀹夎浣嶇疆", width = 15)
- @ApiModelProperty(value = "瀹夎浣嶇疆")
- private java.lang.String installationPosition;
- /**璧勪骇鐘舵��*/
- @Excel(name = "璧勪骇鐘舵��", width = 15, dicCode = "asset_status")
+ private java.lang.String equipmentSpecification;
+
+ /**
+ * 瀹夎浣嶇疆
+ */
+ @Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "11")
+ @ApiModelProperty(value = "瀹夎浣嶇疆")
+ private java.lang.String installationPosition;
+ /**
+ * 璧勪骇浣跨敤鐘舵��
+ */
+ @Excel(name = "璧勪骇浣跨敤鐘舵��", width = 15, dicCode = "asset_status", orderNum = "7")
@ApiModelProperty(value = "璧勪骇鐘舵��")
- @Dict(dicCode = "asset_status")
- private java.lang.String assetStatus;
- /**绔嬮」鍗″彿*/
- @Excel(name = "绔嬮」鍗″彿", width = 15)
- @ApiModelProperty(value = "绔嬮」鍗″彿")
- private java.lang.String cardNumber;
- /**鍑哄巶缂栧彿*/
- @Excel(name = "鍑哄巶缂栧彿", width = 15)
- @ApiModelProperty(value = "鍑哄巶缂栧彿")
- private java.lang.String factoryNumber;
- /**鏈哄簥鍘傚*/
- @Excel(name = "鏈哄簥鍘傚", width = 15)
- @ApiModelProperty(value = "鏈哄簥鍘傚")
- private java.lang.String manufacturingEnterprise;
- /**鏉ユ簮鍥藉*/
- @Excel(name = "鏉ユ簮鍥藉", width = 15)
- @ApiModelProperty(value = "鏉ユ簮鍥藉")
- private java.lang.String originCountry;
- /**鍑哄巶鏃ユ湡*/
- @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date leaveFactoryDate;
- /**楠屾敹鏃ユ湡*/
- @ApiModelProperty(value = "楠屾敹鏃ユ湡")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date acceptanceCheckDate;
- /**璐ㄤ繚寮�濮嬫棩鏈�*/
- @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date warrantyStartDate;
- /**璐ㄤ繚缁撴潫鏃ユ湡*/
- @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)
- @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
- private java.lang.String mdcFlag;
- /*=====================涓婇潰鏄矁鍏嬫ā鏉垮瓧娈�======================*/
- /**鐗圭璁惧;鏄惁涓虹壒绉嶈澶�*/
- @ApiModelProperty(value = "鏄惁鐗圭璁惧")
- private java.lang.String specialEquipment;
- /**璁惧鍥剧墖*/
+ @Dict(dicCode = "asset_status")
+ private java.lang.String assetStatus;
+ /**
+ * 鍑哄巶缂栧彿
+ */
+ @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
+ @ApiModelProperty(value = "鍑哄巶缂栧彿")
+ private java.lang.String factoryNumber;
+ /**
+ * 鏈哄簥鍘傚
+ */
+ @Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
+ @ApiModelProperty(value = "鏈哄簥鍘傚")
+ private java.lang.String manufacturingEnterprise;
+ /**
+ * 鏉ユ簮鍥藉
+ */
+ @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
+ @ApiModelProperty(value = "鏉ユ簮鍥藉")
+ private java.lang.String originCountry;
+ /**
+ * 璁惧渚涘簲鍟�
+ */
+ @Excel(name = "璁惧渚涘簲鍟�", width = 25, orderNum = "15")
+ @ApiModelProperty(value = "璁惧渚涘簲鍟�")
+ private String supplier;
+ /**
+ * 鍑哄巶鏃ユ湡
+ */
+ @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "16")
+ @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", orderNum = "17")
+ @ApiModelProperty(value = "楠屾敹鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date acceptanceCheckDate;
+ /**
+ * 璁惧鍥剧墖
+ */
@ApiModelProperty(value = "璁惧鍥剧墖")
- private java.lang.String equipmentImage;
- /**閲嶉噺*/
- @ApiModelProperty(value = "閲嶉噺")
- private java.lang.String equipmentWeight;
- /**鏄惁鏈夊伐鑹哄弬鏁�*/
+ private java.lang.String equipmentImage;
+ /**
+ * 鐢垫満鍙版暟
+ */
+ @Excel(name = "鐢垫満鍙版暟", width = 15, orderNum = "18")
+ @ApiModelProperty(value = "鐢垫満鍙版暟")
+ private Integer motorsNumber;
+ /**
+ * 鎬诲姛鐜�(KW)
+ */
+ @Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "19")
+ @ApiModelProperty(value = "鎬诲姛鐜�")
+ private java.lang.String equipmentPower;
+ /**
+ * 閲嶉噺(鍚�)
+ */
+ @Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "20")
+ @ApiModelProperty(value = "閲嶉噺(鍚�)")
+ private java.lang.String equipmentWeight;
+ /**
+ * 鏄惁鏈夊伐鑹哄弬鏁�
+ */
+ @Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "has_no", orderNum = "21")
@ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
- private java.lang.String processParametersFlag;
- /**鏄惁鏈夌簿搴﹀弬鏁�*/
+ private java.lang.String processParametersFlag;
+ /**
+ * 鏄惁鏈夌簿搴﹀弬鏁�
+ */
+ @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "has_no", orderNum = "22")
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
- private java.lang.String precisionParametersFlag;
- /**璁惧绔彛*/
- @ApiModelProperty(value = "璁惧绔彛")
- private java.lang.String equipmentPort;
- /**鍧愭爣鏁伴噺*/
- @ApiModelProperty(value = "鍧愭爣鏁伴噺")
- private java.lang.Integer coordinateNum;
- /**澶囨敞*/
+ private java.lang.String precisionParametersFlag;
+
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 50, orderNum = "99")
@ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- /**
- * 浣跨敤閮ㄩ棬鎵�鏈塈D
- * 浣跨敤閮ㄩ棬ID + 鍏舵墍鏈夌埗绾D, 浠ラ�楀彿鍒嗗壊
- */
- @ApiModelProperty(value = "浣跨敤閮ㄩ棬鎵�鏈塈D")
- private String orgParentIds;
- @ApiModelProperty(value = "MDC璁惧绫诲瀷")
- private String deviceType;
+ private java.lang.String remark;
+ /**
+ * 澶栧舰灏哄
+ */
+ @Excel(name = "澶栧舰灏哄", width = 15, orderNum = "24")
+ @ApiModelProperty(value = "澶栧舰灏哄")
+ private String overallDimensions;
+ /**
+ * 璁惧绉嶇被
+ */
+ @Excel(name = "璁惧绉嶇被", width = 15, orderNum = "6", dictTable = "sys_category", dicCode = "code", dicText = "name")
+ @ApiModelProperty(value = "璁惧绉嶇被")
+ @Dict(dictTable = "sys_category", dicCode = "code", dicText = "name")
+ private String equipmentType;
+ /**
+ * 鍘熷浠峰��
+ */
+ @Excel(name = "鍘熷��(鍏�)", width = 15, orderNum = "25")
+ @ApiModelProperty(value = "鍘熷浠峰��")
+ private BigDecimal originalValue;
+ /**
+ * 璧勯噾鏉ユ簮
+ */
+ @Excel(name = "璧勯噾鏉ユ簮", width = 15, orderNum = "26")
+ @ApiModelProperty(value = "璧勯噾鏉ユ簮")
+ private String fundingSource;
+
+ /**
+ * 鍔熻兘鐢ㄩ��
+ */
+ @Excel(name = "鍔熻兘鐢ㄩ��", width = 15, orderNum = "27")
+ @ApiModelProperty(value = "鍔熻兘鐢ㄩ��")
+ private String functionUse;
+ /**
+ * 鎬ц兘鎸囨爣
+ */
+ @Excel(name = "鎬ц兘鎸囨爣", width = 15, orderNum = "28")
+ @ApiModelProperty(value = "鎬ц兘鎸囨爣")
+ private String performanceIndicators;
+
+ /**
+ * 鍏ュ笎鏃堕棿
+ */
+ @Excel(name = "鍏ュ笎鏃堕棿", width = 15, format = "yyyy/MM/dd", orderNum = "29")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍏ュ笎鏃堕棿")
+ private Date bookingTime;
+
+ /**
+ * 绠＄悊鍒嗙被锛圓\B\C锛�
+ */
+ @Excel(name = "绠＄悊鍒嗙被", width = 15, dicCode = "equipment_abc_flag", orderNum = "8")
+ @ApiModelProperty(value = "绠＄悊鍒嗙被")
+ @Dict(dicCode = "equipment_abc_flag")
+ private java.lang.String equipmentImportance;
+
+ /**
+ * 鎶�鏈姸鎬�
+ */
+ @Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status", orderNum = "7")
+ @ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Dict(dicCode = "technology_status")
+ private java.lang.String technologyStatus;
+
+
+
+ /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈� 寮�濮� ==========================**/
+
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ @ApiModelProperty(value = "鎿嶄綔绯荤粺")
+ private java.lang.String operationSystem;
+ /**
+ * 涓昏酱杩炴帴灏哄
+ */
+ @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
+ private java.lang.String spindleConnectDimension;
+ /**
+ * 绔嬮」鍗″彿
+ */
+ @ApiModelProperty(value = "绔嬮」鍗″彿")
+ private java.lang.String cardNumber;
+ /**
+ * 鏄惁瀹炴柦MDC
+ */
+ @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
+ private java.lang.String mdcFlag;
+
+ @ApiModelProperty(value = "MDC璁惧绫诲瀷")
+ private String deviceType;
+ /**
+ * 璁惧绔彛
+ */
+ @ApiModelProperty(value = "璁惧绔彛")
+ private java.lang.String equipmentPort;
+ /**
+ * 鍧愭爣鏁伴噺
+ */
+ @ApiModelProperty(value = "鍧愭爣鏁伴噺")
+ private java.lang.Integer coordinateNum;
+ /**
+ * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
+ */
+ @ApiModelProperty(value = "鏄惁鐗圭璁惧")
+ private java.lang.String specialEquipment;
+
+
+
+ /**
+ * 璐ㄤ繚寮�濮嬫棩鏈�
+ */
+ @ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date warrantyStartDate;
+ /**
+ * 璐ㄤ繚缁撴潫鏃ユ湡
+ */
+ @ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private java.util.Date warrantyEndDate;
+
+ /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈� 缁撴潫 ==========================**/
+
+ @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;
+
+ // 璁惧埆绠＄悊 鎵嬫寔绔帴鍙ｄ娇鐢�
+ @TableField(exist = false)
+ private String value;
+ @TableField(exist = false)
+ private String text;
+
+ public String getValue() {
+ return this.id;
+ }
+
+ public String getText() {
+ return this.equipmentCode + "[" + this.equipmentName + "]";
+ }
}
--
Gitblit v1.9.3