From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
index 019c1b6..efd0f47 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMaintenanceStandardDetail.java
@@ -8,6 +8,10 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.modules.eam.dto.MaintenanceStandardImport;
+import org.jeecg.modules.eam.dto.SecondMaintenanceStandardImport;
+import org.jeecg.modules.eam.dto.ThirdMaintenanceStandardImport;
+import org.jeecg.modules.eam.dto.WeekMaintenanceStandardImport;
import java.io.Serializable;
import java.util.Date;
@@ -40,22 +44,63 @@
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
/**淇濆吇鏍囧噯ID*/
@ApiModelProperty(value = "淇濆吇鏍囧噯ID")
private String standardId;
/**淇濆吇椤瑰簭鍙�*/
@ApiModelProperty(value = "淇濆吇椤瑰簭鍙�")
- private String itemCode;
+ private Integer itemCode;
+ /**閮ㄤ綅*/
+ @ApiModelProperty(value = "閮ㄤ綅")
+ private String itemPart;
/**淇濆吇椤�*/
@ApiModelProperty(value = "淇濆吇椤�")
private String itemName;
/**瀛愪繚鍏婚」*/
@ApiModelProperty(value = "瀛愪繚鍏婚」")
private String subItemName;
- /**淇濆吇瑕佹眰*/
- @ApiModelProperty(value = "淇濆吇瑕佹眰")
+ /**妫�鏌ユ爣鍑嗘垨瑕佹眰*/
+ @ApiModelProperty(value = "妫�鏌ユ爣鍑嗘垨瑕佹眰")
private String itemDemand;
+ /**淇濆吇瑕佹眰2*/
+ @ApiModelProperty(value = "淇濆吇瑕佹眰2")
+ private String itemDemandAlias;
+ /**妫�鏌ユ柟娉�*/
+ @ApiModelProperty(value = "妫�鏌ユ柟娉�")
+ private String checkMethod;
+
+
+ public EamMaintenanceStandardDetail(){}
+
+ public EamMaintenanceStandardDetail(MaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemPart = dto.getItemPart();
+ this.itemName = dto.getItemName();
+ this.itemDemand = dto.getItemDemand();
+ }
+
+ public EamMaintenanceStandardDetail(WeekMaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemName = dto.getItemName();
+ this.subItemName = dto.getSubItemName() + " " + (dto.getItemPart() == null ? "" : dto.getItemPart());
+ this.itemDemand = dto.getItemDemand();
+ }
+
+ public EamMaintenanceStandardDetail(SecondMaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemName = dto.getItemName();
+ this.itemPart = dto.getItemPart();
+ this.itemDemand = dto.getItemDemand();
+ this.itemDemandAlias = dto.getItemDemandAlias();
+ this.checkMethod = dto.getCheckMethod();
+ }
+
+ public EamMaintenanceStandardDetail(ThirdMaintenanceStandardImport dto) {
+ this.itemCode = dto.getItemCode();
+ this.itemName = dto.getItemName();
+ this.itemPart = dto.getItemPart();
+ this.itemDemand = dto.getItemDemand();
+ this.itemDemandAlias = dto.getItemDemandAlias();
+ this.checkMethod = dto.getCheckMethod();
+ }
}
--
Gitblit v1.9.3