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/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
index cff3d2e..62fe8b6 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
@@ -2,16 +2,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- *
+ *
* </p>
*
* @author wf
@@ -23,48 +22,48 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 璁惧id
*/
private Integer deviceId;
-
/**
* 鏍煎瓙id
*/
- private String slotId;
-
+ private Integer slot;
+ /**
+ * 鏋跺瓙淇℃伅
+ */
+ private Integer shelf;
/**
* 鍘熺墖瀹�
*/
private Double patternWidth;
-
/**
* 鍘熺墖楂�
*/
private Double patternHeight;
-
/**
* 鍘熺墖鍘氬害
*/
private Double patternThickness;
-
/**
* 鑶滅郴
*/
private String filmsId;
-
/**
* 鍒涘缓鏃堕棿
*/
private Date createTime;
-
/**
* 鍓╀綑鏁伴噺
*/
- private String remainQuantity;
+ private Integer remainQuantity;
+ /**
+ * 鐘舵��
+ */
+ private Integer state;
}
--
Gitblit v1.8.0