From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 5b24168..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,8 +2,9 @@
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;
@@ -25,9 +26,14 @@
private Long id;
/**
+ * 绾胯矾
+ */
+ private Integer line;
+
+ /**
* 宸ュ簭
*/
- private Integer workingProcedureId;
+ private String workingProcedure;
/**
* 鐜荤拑id
@@ -47,7 +53,7 @@
/**
* 鐢熶骇鏃堕棿
*/
- private LocalDateTime damageTime;
+ private Timestamp damageTime;
/**
* 澶囨敞
@@ -67,7 +73,7 @@
/**
* 娴佺▼鍗�
*/
- private Integer processId;
+ private String processId;
/**
* 搴忓彿
--
Gitblit v1.8.0