From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
index 99fb29f..6524403 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCageDetails.java
@@ -1,6 +1,7 @@
package com.mes.edgstoragecage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -28,6 +29,11 @@
private Long id;
/**
+ * 宸ョ▼id
+ */
+ private String engineerId;
+
+ /**
* 璁惧id
*/
private Integer deviceId;
@@ -40,7 +46,7 @@
/**
* 鐜荤拑id
*/
- private Integer glassId;
+ private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
@@ -60,27 +66,27 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
/**
* 纾ㄥ墠瀹�
*/
- private Double edgWidth;
+ private double edgWidth;
/**
* 纾ㄥ墠楂�
*/
- private Double edgHeight;
+ private double edgHeight;
/**
* 閽㈠寲鐗堝浘id
@@ -98,7 +104,7 @@
private Integer patternSequence;
/**
- * 鐘舵��
+ * 鐘舵�� 锛堣瘑鍒悗鎴愬姛鐘舵��100锛屽嚭鐗囦换鍔�101锛� 鎷胯蛋200锛岀牬鎹�201锛�
*/
private Integer state;
@@ -106,6 +112,11 @@
* 鐜荤拑闂撮殭
*/
private Integer gap;
+ /**
+ * 鐜荤拑闂撮殭
+ */
+ @TableField(exist = false)
+ private Integer count;
}
--
Gitblit v1.8.0