From e51c7d378341e4b8d1529947c2c25f5c10701de9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 13 五月 2025 15:45:23 +0800
Subject: [PATCH] art: 设备管理-设备台账-新增、列表修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 8
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java | 254 +++++++++++++++++++++++++++++++++-----------------
2 files changed, 170 insertions(+), 92 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 0756a99..e2e70ba 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
@@ -15,6 +15,8 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @Description: 璁惧鍙拌处
@@ -69,120 +71,90 @@
/**
* 璁惧缁熶竴缂栧彿
*/
- @Excel(name = "璁惧缂栧彿", width = 15)
+ @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
@ApiModelProperty(value = "璁惧缂栧彿")
private java.lang.String equipmentCode;
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
@ApiModelProperty(value = "璁惧鍚嶇О")
private java.lang.String equipmentName;
/**
- * 鍏抽敭璁惧鏍囪瘑
- */
- @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15, dicCode = "yn")
- @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 = 25, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ @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")
+ @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")
- @ApiModelProperty(value = "璁惧鍒嗙被")
+ @Excel(name = "璁惧绫诲埆", width = 15, dicCode = "equipment_category", orderNum = "5")
+ @ApiModelProperty(value = "璁惧绫诲埆")
@Dict(dicCode = "equipment_category")
private java.lang.String equipmentCategory;
/**
* 璁惧鍨嬪彿
*/
- @Excel(name = "璁惧鍨嬪彿", width = 15)
+ @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
@ApiModelProperty(value = "璁惧鍨嬪彿")
private java.lang.String equipmentModel;
/**
* 璁惧瑙勬牸
*/
- @Excel(name = "璁惧瑙勬牸", width = 15)
+ @Excel(name = "璁惧瑙勬牸", width = 15, orderNum = "4")
@ApiModelProperty(value = "璁惧瑙勬牸")
private java.lang.String equipmentSpecification;
- /**
- * 涓昏酱杩炴帴灏哄
- */
- @Excel(name = "涓昏酱杩炴帴灏哄", width = 25)
- @ApiModelProperty(value = "涓昏酱杩炴帴灏哄")
- private java.lang.String spindleConnectDimension;
- /**
- * 鎬诲姛鐜�
- */
- @Excel(name = "鎬诲姛鐜�", width = 15)
- @ApiModelProperty(value = "鎬诲姛鐜�")
- private java.lang.String equipmentPower;
+
/**
* 瀹夎浣嶇疆
*/
- @Excel(name = "瀹夎浣嶇疆", width = 15)
+ @Excel(name = "瀹夎浣嶇疆", width = 15, orderNum = "11")
@ApiModelProperty(value = "瀹夎浣嶇疆")
private java.lang.String installationPosition;
/**
* 璧勪骇鐘舵��
*/
- @Excel(name = "璧勪骇鐘舵��", width = 15, dicCode = "asset_status")
+ @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)
+ @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
@ApiModelProperty(value = "鍑哄巶缂栧彿")
private java.lang.String factoryNumber;
/**
* 鏈哄簥鍘傚
*/
- @Excel(name = "鏈哄簥鍘傚", width = 15)
+ @Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
@ApiModelProperty(value = "鏈哄簥鍘傚")
private java.lang.String manufacturingEnterprise;
/**
* 鏉ユ簮鍥藉
*/
- @Excel(name = "鏈哄簥鏉ユ簮鍥藉", width = 25)
+ @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")
+ @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")
@@ -190,59 +162,142 @@
/**
* 楠屾敹鏃ユ湡
*/
- @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy-MM-dd")
+ @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;
- /**
- * 璐ㄤ繚寮�濮嬫棩鏈�
- */
- @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, dicCode = "yn")
- @ApiModelProperty(value = "鏄惁瀹炴柦MDC")
- private java.lang.String mdcFlag;
- /*=====================涓婇潰鏄矁鍏嬫ā鏉垮瓧娈�======================*/
- /**
- * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
- */
- @ApiModelProperty(value = "鏄惁鐗圭璁惧")
- private java.lang.String specialEquipment;
/**
* 璁惧鍥剧墖
*/
@ApiModelProperty(value = "璁惧鍥剧墖")
private java.lang.String equipmentImage;
/**
- * 閲嶉噺
+ * 鐢垫満鍙版暟
*/
- @ApiModelProperty(value = "閲嶉噺")
+ @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;
/**
* 鏄惁鏈夌簿搴﹀弬鏁�
*/
+ @Excel(name = "鏈夋棤绮惧害鍙傛暟", width = 15, dicCode = "has_no", orderNum = "22")
@ApiModelProperty(value = "鏄惁鏈夌簿搴﹀弬鏁�")
private java.lang.String precisionParametersFlag;
+
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 50, orderNum = "99")
+ @ApiModelProperty(value = "澶囨敞")
+ private java.lang.String remark;
+ /**
+ * 鍖哄彿
+ */
+ @Excel(name = "鍖哄彿", width = 15, orderNum = "23")
+ @ApiModelProperty(value = "鍖哄彿")
+ private String areaCode;
+ /**
+ * 澶栧舰灏哄
+ */
+ @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;
+
+
+
+ /** =================== 鑸畤鏁戠敓 鏈敤鐨勫瓧娈� 寮�濮� ==========================**/
+
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ @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;
/**
* 璁惧绔彛
*/
@@ -254,12 +309,34 @@
@ApiModelProperty(value = "鍧愭爣鏁伴噺")
private java.lang.Integer coordinateNum;
/**
- * 澶囨敞
+ * 鐗圭璁惧;鏄惁涓虹壒绉嶈澶�
*/
- @ApiModelProperty(value = "澶囨敞")
- private java.lang.String remark;
- @ApiModelProperty(value = "MDC璁惧绫诲瀷")
- private String deviceType;
+ @ApiModelProperty(value = "鏄惁鐗圭璁惧")
+ private java.lang.String specialEquipment;
+
+ /**
+ * 鎶�鏈姸鎬�
+ */
+ @ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Dict(dicCode = "technology_status")
+ private java.lang.String technologyStatus;
+
+ /**
+ * 璐ㄤ繚寮�濮嬫棩鏈�
+ */
+ @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 = "缁翠慨鐘舵��")
@@ -271,6 +348,7 @@
@Dict(dicCode = "equipment_maintenance_status")
private String maintenanceStatus;
+ // 璁惧埆绠＄悊 鎵嬫寔绔帴鍙ｄ娇鐢�
@TableField(exist = false)
private String value;
@TableField(exist = false)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index b704de3..f0615fc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -251,10 +251,10 @@
// sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
// continue;
// }
- if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
- sb.append(String.format("璁惧缂栫爜[%s]鎶�鏈姸鎬佷负绌猴紝鏃犳硶瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
- continue;
- }
+// if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
+// sb.append(String.format("璁惧缂栫爜[%s]鎶�鏈姸鎬佷负绌猴紝鏃犳硶瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
+// continue;
+// }
EamEquipment one = eamEquipmentService.getOne(new LambdaQueryWrapper<EamEquipment>().eq(EamEquipment::getEquipmentCode, eamEquipment.getEquipmentCode()).eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0));
if (one != null) {
sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
--
Gitblit v1.9.3