From b610921461e3afa6f1f1271428136dead3372afe Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 13:16:32 +0800
Subject: [PATCH] 大理片笼：出片规则调整，新增出片开关接口，用与控制大理片笼是否出钢化的玻璃 出片任务一次性生成全部 调度任务优化
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 45 ++++++++-------------------------------------
1 files changed, 8 insertions(+), 37 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 02e9750..9a83681 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.base.entity.BigStorageCageBaseInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,7 +21,7 @@
@ApiModel(description = "<p> 閽㈠寲灏忕墖淇℃伅琛� </p>")
@Data
@EqualsAndHashCode(callSuper = false)
-public class TemperingGlassInfo implements Serializable {
+public class TemperingGlassInfo extends BigStorageCageBaseInfo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -30,12 +31,6 @@
@ApiModelProperty(value = "閽㈠寲灏忕墖淇℃伅琛╥d", position = 2)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
- /**
- * 鐜荤拑id
- */
- @ApiModelProperty(value = "鐜荤拑id", position = 3)
- private String glassId;
/**
* 娴佺▼鍗�
@@ -50,28 +45,16 @@
private Integer glassType;
/**
- * 瀹�
- */
- @ApiModelProperty(value = "瀹�", position = 6)
- private Double width;
-
- /**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private Double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
- private Double thickness;
+ private double thickness;
/**
* 鑶滅郴
*/
@ApiModelProperty(value = "鑶滅郴", position = 9)
- private Integer filmsid;
+ private String filmsid;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -92,18 +75,6 @@
private Integer temperingFeedSequence;
/**
- * x鍧愭爣
- */
- @ApiModelProperty(value = "x鍧愭爣", position = 13)
- private Integer xCoordinate;
-
- /**
- * y鍧愭爣
- */
- @ApiModelProperty(value = "y鍧愭爣", position = 14)
- private Integer yCoordinate;
-
- /**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
@ApiModelProperty(value = "鏃嬭浆瑙掑害锛堥�嗘椂閽堬級", position = 15)
@@ -114,10 +85,10 @@
*/
@ApiModelProperty(value = "鐘舵��", position = 16)
private Integer state;
+
/**
- * 鏍煎瓙鍙�
+ * 宸ョ▼id
*/
- private Integer slot;
-
-
+ @ApiModelProperty(value = "宸ョ▼id", position = 17)
+ private String engineerId;
}
--
Gitblit v1.8.0