From 20159916dd5f3a89b97a9ba83bed37b841471921 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 12:43:58 +0800
Subject: [PATCH] 上片模块：上片模块对接完成，命令可正常写入 上片逻辑：复位后需要向plc发送联动请求，联动请求为1后可接收到上片机发送的上片请求，否则无法执行上片任务
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 622197a..54e844b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -25,17 +25,28 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
+
+ /**
+ * 瀹�
+ */
+ private double oHeight;
+
+ /**
+ * 楂�
+ */
+ private double oWidth;
+
/**
* 鍘氬害
*/
- private Double glassThickness;
+ private double glassThickness;
/**
* 鐜荤拑鑶滅郴
@@ -43,13 +54,23 @@
private String glassType;
/**
+ * 灞傛暟
+ */
+ private int layer;
+
+ /**
+ * 鎬诲眰鏁�
+ */
+ private int totalLayer;
+
+ /**
* 灏忕墖瀹斤紙鍔犵（閲忥級
*/
- private Double pWidth;
+ private double pWidth;
/**
* 灏忕墖楂橈紙鍔犵（閲忥級
*/
- private Double pHeight;
+ private double pHeight;
/**
* 鐗堝浘id
*/
@@ -78,5 +99,13 @@
* 灏忕墖缂栧彿
*/
private String glassId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private Integer orderSort;
+ /**
+ * 鏃嬭浆瑙掑害
+ */
+ private double rotateAngle;
}
--
Gitblit v1.8.0