From 093579c99049bf09ecf8e5d0f80179fde1ddc776 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 10 七月 2024 09:49:31 +0800
Subject: [PATCH] 下片：下片任务状态字段名称修改 大理片：1、扫码任务新增确认字校验：确认字为0，请求有id的情况不处理 2、新增定时任务处理进出片任务执行过程中出现破损玻璃的情况 待完成：破损表新增功能未实现
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
index adb87cf..f5300b1 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Id;
import java.io.Serializable;
@@ -21,21 +22,19 @@
private static final long serialVersionUID = 1L;
- /**
- * id
- */
+ @Id
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鑶滅郴
@@ -45,7 +44,7 @@
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
/**
* 娴佺▼鍗″彿
@@ -56,6 +55,18 @@
* 浠诲姟鐘舵��
*/
private Integer state;
+ /**
+ * 鐜荤拑ID
+ */
+ private String glassId;
+ /**
+ * 宸ヤ綅id
+ */
+ private String workstationid;
+ /**
+ * 鏈哄櫒浜�
+ */
+ private String Robot;
}
--
Gitblit v1.8.0