From b283060729a6adce9eb9dca499d6111d393c5d3c Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 05 九月 2025 11:15:56 +0800
Subject: [PATCH] 设备管理来源国家调整为手输
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 89 +++++++++++++++++++++++++-------------------
1 files changed, 51 insertions(+), 38 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 59e3040..5b77bf4 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
@@ -36,115 +36,115 @@
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private java.lang.String id;
+ private String id;
/**
* 鍒涘缓浜�
*/
@ApiModelProperty(value = "鍒涘缓浜�")
@Dict(dicCode = "sys_user, realname, username")
- private java.lang.String createBy;
+ private 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;
+ private Date createTime;
/**
* 鏇存柊浜�
*/
@ApiModelProperty(value = "鏇存柊浜�")
@Dict(dicCode = "sys_user, realname, username")
- private java.lang.String updateBy;
+ private 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;
+ private Date updateTime;
/**
* 鍒犻櫎鏍囪
*/
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- private java.lang.Integer delFlag;
+ private Integer delFlag;
/**
* 璁惧缁熶竴缂栧彿
*/
@Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
@ApiModelProperty(value = "璁惧缂栧彿")
- private java.lang.String equipmentCode;
+ private String equipmentCode;
/**
* 璁惧鍚嶇О
*/
@Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
@ApiModelProperty(value = "璁惧鍚嶇О")
- private java.lang.String equipmentName;
+ private 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;
+ private 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;
+ private String equipmentManager;
/**
* 璁惧绫诲埆
*/
@Excel(name = "璁惧绫诲埆", width = 15, dicCode = "equipment_category", orderNum = "5")
@ApiModelProperty(value = "璁惧绫诲埆")
@Dict(dicCode = "equipment_category")
- private java.lang.String equipmentCategory;
+ private String equipmentCategory;
/**
* 璁惧鍨嬪彿
*/
@Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
@ApiModelProperty(value = "璁惧鍨嬪彿")
- private java.lang.String equipmentModel;
+ private String equipmentModel;
/**
* 璁惧瑙勬牸
*/
@Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "4")
@ApiModelProperty(value = "璁惧瑙勬牸")
- private java.lang.String equipmentSpecification;
+ private String equipmentSpecification;
/**
* 瀹夎浣嶇疆
*/
@Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "11")
@ApiModelProperty(value = "瀹夎浣嶇疆")
- private java.lang.String installationPosition;
+ private String installationPosition;
/**
* 璧勪骇浣跨敤鐘舵��
*/
@Excel(name = "璧勪骇浣跨敤鐘舵��", width = 15, dicCode = "asset_status", orderNum = "7")
@ApiModelProperty(value = "璧勪骇鐘舵��")
@Dict(dicCode = "asset_status")
- private java.lang.String assetStatus;
+ private String assetStatus;
/**
* 鍑哄巶缂栧彿
*/
@Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
@ApiModelProperty(value = "鍑哄巶缂栧彿")
- private java.lang.String factoryNumber;
+ private String factoryNumber;
/**
* 鏈哄簥鍘傚
*/
@Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
@ApiModelProperty(value = "鏈哄簥鍘傚")
- private java.lang.String manufacturingEnterprise;
+ private String manufacturingEnterprise;
/**
* 鏉ユ簮鍥藉
*/
- @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
+ @Excel(name = "鏉ユ簮鍥藉", width = 25, dicCode = "source_country", orderNum = "14")
@ApiModelProperty(value = "鏉ユ簮鍥藉")
- private java.lang.String originCountry;
+ private String originCountry;
/**
* 璁惧渚涘簲鍟�
*/
@@ -158,7 +158,7 @@
@ApiModelProperty(value = "鍑哄巶鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date leaveFactoryDate;
+ private Date leaveFactoryDate;
/**
* 楠屾敹鏃ユ湡
*/
@@ -166,12 +166,12 @@
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date acceptanceCheckDate;
+ private Date acceptanceCheckDate;
/**
* 璁惧鍥剧墖
*/
@ApiModelProperty(value = "璁惧鍥剧墖")
- private java.lang.String equipmentImage;
+ private String equipmentImage;
/**
* 鐢垫満鍙版暟
*/
@@ -183,32 +183,32 @@
*/
@Excel(name = "鎬诲姛鐜�(KW)", width = 15, orderNum = "19")
@ApiModelProperty(value = "鎬诲姛鐜�")
- private java.lang.String equipmentPower;
+ private String equipmentPower;
/**
* 閲嶉噺(鍚�)
*/
@Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "20")
@ApiModelProperty(value = "閲嶉噺(鍚�)")
- private java.lang.String equipmentWeight;
+ private String equipmentWeight;
/**
* 鏄惁鏈夊伐鑹哄弬鏁�
*/
@Excel(name = "鏈夋棤宸ヨ壓鍙傛暟", width = 15, dicCode = "has_no", orderNum = "21")
@ApiModelProperty(value = "鏄惁鏈夊伐鑹哄弬鏁�")
- private java.lang.String processParametersFlag;
+ private String processParametersFlag;
/**
* 鏄惁鏈夌簿搴﹀弬鏁�
*/
@Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "has_no", orderNum = "22")
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
- private java.lang.String precisionParametersFlag;
+ private String precisionParametersFlag;
/**
* 澶囨敞
*/
@Excel(name = "澶囨敞", width = 50, orderNum = "99")
@ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
+ private String remark;
/**
* 澶栧舰灏哄
*/
@@ -263,7 +263,7 @@
@Excel(name = "绠＄悊鍒嗙被", width = 15, dicCode = "equipment_abc_flag", orderNum = "8")
@ApiModelProperty(value = "绠＄悊鍒嗙被")
@Dict(dicCode = "equipment_abc_flag")
- private java.lang.String equipmentImportance;
+ private String equipmentImportance;
/**
* 鎶�鏈姸鎬�
@@ -271,9 +271,22 @@
@Excel(name = "鎶�鏈姸鎬�", width = 15, dicCode = "technology_status", orderNum = "7")
@ApiModelProperty(value = "鎶�鏈姸鎬�")
@Dict(dicCode = "technology_status")
- private java.lang.String technologyStatus;
+ private String technologyStatus;
+ /**
+ * 璁惧鐢ㄩ��
+ */
+ @Excel(name = "璁惧鐢ㄩ��", width = 15, dicCode = "equipment_use", orderNum = "7")
+ @ApiModelProperty(value = "璁惧鐢ㄩ��")
+ @Dict(dicCode = "equipment_use")
+ private String equipmentUse;
+ /**
+ * 鎿嶄綔宸�
+ */
+ @Excel(name = "鎿嶄綔宸�", width = 15, orderNum = "28")
+ @ApiModelProperty(value = "鎿嶄綔宸�")
+ private String operator;
/** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈� 寮�濮� ==========================**/
@@ -281,22 +294,22 @@
* 鎿嶄綔绯荤粺
*/
@ApiModelProperty(value = "鎿嶄綔绯荤粺")
- private java.lang.String operationSystem;
+ private String operationSystem;
/**
* 涓昏酱杩炴帴灏哄
*/
@ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
- private java.lang.String spindleConnectDimension;
+ private String spindleConnectDimension;
/**
* 绔嬮」鍗″彿
*/
@ApiModelProperty(value = "绔嬮」鍗″彿")
- private java.lang.String cardNumber;
+ private String cardNumber;
/**
* 鏄惁瀹炴柦MDC
*/
@ApiModelProperty(value = "鏄惁瀹炴柦MDC")
- private java.lang.String mdcFlag;
+ private String mdcFlag;
@ApiModelProperty(value = "MDC璁惧绫诲瀷")
private String deviceType;
@@ -304,17 +317,17 @@
* 璁惧绔彛
*/
@ApiModelProperty(value = "璁惧绔彛")
- private java.lang.String equipmentPort;
+ private String equipmentPort;
/**
* 鍧愭爣鏁伴噺
*/
@ApiModelProperty(value = "鍧愭爣鏁伴噺")
- private java.lang.Integer coordinateNum;
+ private Integer coordinateNum;
/**
* 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
*/
@ApiModelProperty(value = "鏄惁鐗圭璁惧")
- private java.lang.String specialEquipment;
+ private String specialEquipment;
@@ -324,14 +337,14 @@
@ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date warrantyStartDate;
+ private Date warrantyStartDate;
/**
* 璐ㄤ繚缁撴潫鏃ユ湡
*/
@ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private java.util.Date warrantyEndDate;
+ private Date warrantyEndDate;
/** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈� 缁撴潫 ==========================**/
--
Gitblit v1.9.3