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/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
index 24cc506..c7d5a67 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java
@@ -1,13 +1,17 @@
package com.mes.downglassinfo.entity;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.stereotype.Component;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,12 +27,28 @@
/**
* 涓嬬墖鐜荤拑淇℃伅琛╥d
*/
- private Long id;
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ヤ綅id
+ */
+ private Integer workStationId;
+
+ /**
+ * 宸ョ▼id
+ */
+ private String engineerId;
/**
* 娴佺▼鍗″彿
*/
private String flowCardId;
+
+ /**
+ * 灞傚彿
+ */
+ private Integer layer;
/**
* 椤哄簭
@@ -38,20 +58,32 @@
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
-
+ /**
+ * 鑶滅郴
+ */
private String Filmsid;
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date gmtCreate;
+
}
--
Gitblit v1.8.0