From ad7474b151b11acf9f09c15a131e871a50fec4d5 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 16 十月 2023 19:04:17 +0800
Subject: [PATCH] 保养计划
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 882e779..b2b8041 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -2,9 +2,11 @@
import lombok.Data;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author lnl
@@ -63,22 +65,22 @@
@Excel(name = "鍧愭爣鏁伴噺")
private BigDecimal coordinateNum;
- @Excel(name = "璁惧鐘舵��")
+ @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
private String equipmentStatus;
@Excel(name = "閲嶉噺")
private String equipmentUda3;
- @Excel(name = "閲嶉噺璁￠噺鍗曚綅",dicCode = "id",dicText = "name",dictTable = "mom_base_unit")
+ @Excel(name = "閲嶉噺璁￠噺鍗曚綅")
private String equipmentUda4;
@Excel(name = "鍔熻兘浣嶇疆")
private String equipmentUda5;
@Excel(name = "瀹夎浣嶇疆")
- private String equipmentUda2;
+ private String location;
- @Excel(name = "鍑哄巶鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "鍑哄巶鏃ユ湡")
private String leaveFactoryDate;
@Excel(name = "绔嬮」鍗″彿")
@@ -87,11 +89,11 @@
@Excel(name = "璧勯噾鏉ユ簮")
private String fundSource;
- @Excel(name = "楠屾敹鏃ユ湡",importFormat = "yyyyMMdd")
+ @Excel(name = "楠屾敹鏃ユ湡")
private String acceptanceCheckDate;
@Excel(name = "鍑哄巶缂栧彿")
- private String factoryNo;
+ private String factoryNumber;
@Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
private String constructorId;
@@ -108,6 +110,26 @@
@Excel(name = "鎬诲姛鐜�")
private String gpo;
+ @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
+ private String technologyStatus;
+
+ @Excel(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name", name = "杞﹂棿")
+ private String factoryModelId;
+
+ @Excel(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "浜х嚎")
+ private String workCenterId;
+
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�",format = "yyyyMMdd")
+ private Date warrantyStart;
+
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡",format = "yyyyMMdd")
+ private Date warrantyEnd;
+
+ @Excel(dicCode = "property_status",name = "璧勪骇鐘舵��")
+ private String propertyStatus;
+
+
+
--
Gitblit v1.9.3