From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 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 0da9c7d..aecb3b9 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
@@ -1,6 +1,8 @@
package com.mes.temperingglass.entity;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.mes.base.entity.BigStorageCageBaseInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -44,12 +46,6 @@
private Integer glassType;
/**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 7)
- private double height;
-
- /**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 8)
@@ -80,18 +76,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)
@@ -104,20 +88,11 @@
private Integer state;
/**
- * 鏍煎瓙
- */
- @ApiModelProperty(value = "鏍煎瓙", position = 17)
- private Integer slot;
-
- /**
- * 閽㈠寲绫诲瀷
- */
- @ApiModelProperty(value = "閽㈠寲绫诲瀷", position = 17)
- private Integer temperingType;
-
- /**
* 宸ョ▼id
*/
@ApiModelProperty(value = "宸ョ▼id", position = 17)
- private Integer engineerId;
+ private String engineerId;
+
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0