From 2986ce86c5a49d1456b6be561358c42e2b19913e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 12 十月 2025 23:09:14 +0800
Subject: [PATCH] 1、 中空创建任务界面流程卡总量及笼内实际数量显示bug修复
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 25 ++++++++++++++++++++-----
1 files changed, 20 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 5fd3c47..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
@@ -72,9 +72,17 @@
*/
private double pHeight;
/**
- * 鐗堝浘id
+ * 鍘熺墖鐗堝浘id
*/
private Integer stockId;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer xAxis;
+ /**
+ * 鍘熺墖鐗堝浘鐗堝簭
+ */
+ private Integer yAxis;
/**
* 閽㈠寲鐗堝浘缂栧彿(鏋跺彿)
*/
@@ -86,11 +94,11 @@
/**
* x鍧愭爣
*/
- private Integer xAxis;
+ private Integer xAxisHeat;
/**
* y鍧愭爣
*/
- private Integer yAxis;
+ private Integer yAxisHeat;
/**
* 宸ョ▼鍙�
*/
@@ -102,10 +110,17 @@
/**
* 璁㈠崟搴忓彿
*/
- private String orderSort;
+ private Integer orderSort;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer combine;
/**
* 鏃嬭浆瑙掑害
*/
private double rotateAngle;
-
+ /**
+ * 鎵撴爣灞炴��
+ */
+ private String markIcon;
}
--
Gitblit v1.8.0