From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 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 8f50981..ce530ac 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
@@ -15,7 +15,7 @@
/**
* 娴佺▼鍗″彿
*/
- private String projectId;
+ private String processId;
/**
* 宸ョ▼绉嶇被
@@ -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,17 +54,35 @@
private String glassType;
/**
+ * 灞傛暟
+ */
+ private int layer;
+
+ /**
+ * 鎬诲眰鏁�
+ */
+ private int totalLayer;
+
+ /**
* 灏忕墖瀹斤紙鍔犵（閲忥級
*/
- private Double pWidth;
+ private double pWidth;
/**
* 灏忕墖楂橈紙鍔犵（閲忥級
*/
- private Double pHeight;
+ private double pHeight;
/**
- * 鐗堝浘id
+ * 鍘熺墖鐗堝浘id
*/
private Integer stockId;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer xAxis;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer yAxis;
/**
* 閽㈠寲鐗堝浘缂栧彿(鏋跺彿)
*/
@@ -65,11 +94,11 @@
/**
* x鍧愭爣
*/
- private Integer xAxis;
+ private Integer xAxisHeat;
/**
* y鍧愭爣
*/
- private Integer yAxis;
+ private Integer yAxisHeat;
/**
* 宸ョ▼鍙�
*/
@@ -78,5 +107,20 @@
* 灏忕墖缂栧彿
*/
private String glassId;
-
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private Integer orderSort;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer combine;
+ /**
+ * 鏃嬭浆瑙掑害
+ */
+ private double rotateAngle;
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0