From c1cb663f4308ddf02ee6ea435c809c8162585b03 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 01 八月 2024 16:38:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
index 0787b09..f5300b1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -5,9 +5,6 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Id;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-//import javax.persistence.Id;
import java.io.Serializable;
@@ -25,26 +22,19 @@
private static final long serialVersionUID = 1L;
- /**
- * id
- */
- @TableId(value = "id", type = IdType.AUTO)
-
-
-
@Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鑶滅郴
@@ -54,7 +44,7 @@
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
/**
* 娴佺▼鍗″彿
@@ -65,6 +55,18 @@
* 浠诲姟鐘舵��
*/
private Integer state;
+ /**
+ * 鐜荤拑ID
+ */
+ private String glassId;
+ /**
+ * 宸ヤ綅id
+ */
+ private String workstationid;
+ /**
+ * 鏈哄櫒浜�
+ */
+ private String Robot;
}
--
Gitblit v1.8.0