From 67ac603f410319a0d999e5f493c8ef2d74163fe1 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:44:47 +0800
Subject: [PATCH] 保养标准：点检标准导入 点检名称修改/ 设备台账导入

---
 src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index e2a6fc7..4a4fa70 100644
--- a/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -71,20 +71,22 @@
     /**
      * 璁惧缁熶竴缂栧彿
      */
-    @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "1")
+    @Excel(name = "璁惧缂栧彿", width = 15, orderNum = "5")
     @ApiModelProperty(value = "璁惧缂栧彿")
     private String equipmentCode;
+
+
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "2")
+    @Excel(name = "璁惧鍚嶇О", width = 15, orderNum = "4")
     @ApiModelProperty(value = "璁惧鍚嶇О")
     private String equipmentName;
     /**
      * 浣跨敤閮ㄩ棬
      */
-    @Excel(name = "浣跨敤杞﹂棿", width = 25, dictTable = "base_factory", dicText = "factory_name", dicCode = "id", orderNum = "9")
-    @ApiModelProperty(value = "浣跨敤閮ㄩ棬")
+    @Excel(name = "鎵�灞炰骇绾�", width = 25, dictTable = "base_factory", dicText = "factory_name", dicCode = "id", orderNum = "3")
+    @ApiModelProperty(value = "鎵�灞炰骇绾�")
     @Dict(dicCode = "base_factory, factory_name, id")
     private String orgId;
     /**
@@ -104,7 +106,7 @@
     /**
      * 璁惧鍨嬪彿
      */
-    @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "3")
+    @Excel(name = "璁惧鍨嬪彿", width = 15, orderNum = "5")
     @ApiModelProperty(value = "璁惧鍨嬪彿")
     private String equipmentModel;
     /**
@@ -130,40 +132,42 @@
     /**
      * 鍑哄巶缂栧彿
      */
-    @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "12")
+    @Excel(name = "鍑哄巶缂栧彿", width = 15, orderNum = "7")
     @ApiModelProperty(value = "鍑哄巶缂栧彿")
     private String factoryNumber;
     /**
-     * 鏈哄簥鍘傚
+     * 鐢熶骇鍘傚
      */
-    @Excel(name = "鏈哄簥鍘傚", width = 15, orderNum = "13")
-    @ApiModelProperty(value = "鏈哄簥鍘傚")
+    @Excel(name = "鐢熶骇鍘傚", width = 15, orderNum = "8")
+    @ApiModelProperty(value = "鐢熶骇鍘傚")
     private String manufacturingEnterprise;
     /**
      * 鏉ユ簮鍥藉
      */
-    @Excel(name = "鏉ユ簮鍥藉", width = 25, orderNum = "14")
+    @Excel(name = "鏉ユ簮鍥藉", width = 25)
     @ApiModelProperty(value = "鏉ユ簮鍥藉")
     private String originCountry;
     /**
      * 璁惧渚涘簲鍟�
      */
-    @Excel(name = "璁惧渚涘簲鍟�", width = 25, orderNum = "15")
+    @Excel(name = "璁惧渚涘簲鍟�", width = 25)
     @ApiModelProperty(value = "璁惧渚涘簲鍟�")
     private String supplier;
     /**
      * 鍑哄巶鏃ユ湡
      */
-    @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "16")
+    @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd")
     @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date leaveFactoryDate;
     /**
-     * 楠屾敹鏃ユ湡
+     * 杩涘巶鏃ユ湡
      */
-    @Excel(name = "鎶曠敤鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "17")
-    @ApiModelProperty(value = "楠屾敹鏃ユ湡")
+
+//    @Excel(name = "杩涘巶鏃ユ湡", width = 25, format = "yyyy.MM.dd", orderNum = "6")
+    @Excel(name = "杩涘巶鏃ユ湡", width = 25, format = "yyyy.MM.dd", orderNum = "6")
+    @ApiModelProperty(value = "杩涘巶鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date acceptanceCheckDate;
@@ -290,6 +294,7 @@
     /**
      * 绔嬮」鍗″彿
      */
+    @Excel(name = "璧勪骇缂栧彿", width = 15, orderNum = "1")
     @ApiModelProperty(value = "绔嬮」鍗″彿")
     private String cardNumber;
     /**

--
Gitblit v1.9.3