From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java | 99 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 92 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
index 0467855..52b355e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
@@ -2,18 +2,19 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.sql.Timestamp;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
- *
+ *
* </p>
*
* @author wu
- * @since 2024-06-13
+ * @since 2024-06-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -21,24 +22,108 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
+ /**
+ * 绾胯矾
+ */
+ private Integer line;
+
+ /**
+ * 宸ュ簭
+ */
+ private String workingProcedure;
+
+ /**
+ * 鐜荤拑id
+ */
private String glassId;
- private Integer deviceId;
-
+ /**
+ * 宸ョ▼鍙�
+ */
private String engineerId;
+ /**
+ * 閽㈠寲鐗堝浘id
+ */
private Integer temperingLayoutId;
- private LocalDateTime damageTime;
+ /**
+ * 鐢熶骇鏃堕棿
+ */
+ private Timestamp damageTime;
+ /**
+ * 澶囨敞
+ */
private String remark;
+ /**
+ * 绫诲瀷锛�0锛氭姤宸� 1锛氱牬鎹� 2锛氭嬁璧�
+ */
private Integer type;
+ /**
+ * 鐘舵�侊細0锛氭湭鎶ュ伐 1锛氬凡鎶ュ伐
+ */
private Integer status;
+ /**
+ * 娴佺▼鍗�
+ */
+ private String processId;
+
+ /**
+ * 搴忓彿
+ */
+ private Integer orderNumber;
+
+ /**
+ * 宸ヨ壓纭搴忓彿
+ */
+ private Integer technologyNumber;
+
+ /**
+ * 鐮存崯绫诲瀷
+ */
+ private String breakageType;
+
+ /**
+ * 鐮存崯鍘熷洜
+ */
+ private String breakageReason;
+
+ /**
+ * 璐ｄ换宸ュ簭
+ */
+ private String responsibleProcess;
+
+ /**
+ * 璐ｄ换浜哄憳
+ */
+ private String responsiblePersonnel;
+
+ /**
+ * 璐ｄ换鐝粍
+ */
+ private String responsibleTeam;
+
+ /**
+ * 璐ｄ换璁惧
+ */
+ private String responsibleEquipment;
+
+ /**
+ * 鎶ュ伐鐝粍鍚嶇О
+ */
+ private String teamsGroupsName;
+
+ /**
+ * 鎶ュ伐璁惧鍚嶇О
+ */
+ private String deviceName;
+
}
--
Gitblit v1.8.0