From 12aae066961121fa0aa7c9617edc2320cb657d87 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 10 四月 2025 09:58:16 +0800
Subject: [PATCH] 1、取消钢化任务按钮 2、中空创建任务界面新增颜色标识：直通片台流程卡高亮显示 3、配置表新增按照id查询对应配置的值
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index aecb3b9..4b22d1a 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -46,40 +46,27 @@
private Integer glassType;
/**
- * 鍘氬害
- */
- @ApiModelProperty(value = "鍘氬害", position = 8)
- private double thickness;
-
- /**
- * 鑶滅郴
- */
- @ApiModelProperty(value = "鑶滅郴", position = 9)
- private String filmsid;
-
- /**
* 閽㈠寲鏄惁鎺ュ彈妯斁
*/
@ApiModelProperty(value = "閽㈠寲鏄惁鎺ュ彈妯斁", position = 10)
private Integer ishorizontal;
/**
- * 閽㈠寲鐗堝浘id
- */
- @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 11)
- private Integer temperingLayoutId;
-
- /**
- * 閽㈠寲鐗堝浘鐗囧簭
- */
- @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 12)
- private Integer temperingFeedSequence;
-
- /**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
@ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 15)
private Integer angle;
+ /**
+ * x鍧愭爣
+ */
+ @ApiModelProperty(value = "x鍧愭爣", position = 13)
+ private Integer xCoordinate;
+
+ /**
+ * y鍧愭爣
+ */
+ @ApiModelProperty(value = "y鍧愭爣", position = 14)
+ private Integer yCoordinate;
/**
* 鐘舵��
@@ -87,11 +74,6 @@
@ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
- /**
- * 宸ョ▼id
- */
- @ApiModelProperty(value = "宸ョ▼id", position = 17)
- private String engineerId;
@TableLogic
private int deleted;
--
Gitblit v1.8.0