From e72ed7fd6ce5a731583ce6edea40a9955644d3db Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 09:36:35 +0800
Subject: [PATCH] 1、切割版图显示 2、中空领任务是玻璃调度同样计算格子的厚度 3、补单的总层数用流程卡表内的layers_number替换

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 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 db245d8..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;
     /**
      * 宸ョ▼鍙�
      */

--
Gitblit v1.8.0