From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 26 十二月 2024 23:57:34 +0800
Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造:新增开始/暂停/结束任务按钮,流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造:新增除膜信息、李赛克文件需要的数据信息

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 0266265..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;
     /**
      * 宸ョ▼鍙�
      */
@@ -111,5 +119,8 @@
      * 鏃嬭浆瑙掑害
      */
     private double rotateAngle;
-
+    /**
+     * 鎵撴爣灞炴��
+     */
+    private String markIcon;
 }

--
Gitblit v1.8.0