From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改：10mm及以上厚度的玻璃走直通任务，厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询，同一个流程卡同一层出现2种厚度，导致厚度赋值异常，目前已改为查询最后一次导入的为准
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index a4b0121..e82e684 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,33 +26,39 @@
/**
* id
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 鐜荤拑id
+ */
+ private String glassId;
+
/**
* 璧峰
*/
- private String startCell;
+ private Integer startCell;
/**
* 鐩爣
*/
- private String endCell;
+ private Integer endCell;
/**
* 浠诲姟绫诲瀷 1:杩� 2锛氬嚭
*/
- private String taskType;
+ private Integer taskType;
/**
* 瀹�
*/
- private Double width;
+ private Integer width;
/**
* 楂�
*/
- private Double height;
+ private Integer height;
/**
* 鑶滅郴
@@ -59,17 +68,27 @@
/**
* 鍘氬害
*/
- private Double thickness;
+ private Integer thickness;
/**
* 娴佺▼鍗″彿
*/
private String flowCardId;
+ /**
+ * 灞傚彿
+ */
+ private int layer;
/**
* 浠诲姟鐘舵�� 0 鏈紑濮� 1姝ｅ湪杩涜 2瀹屾垚
*/
- private Integer taskStauts;
+ private Integer taskStatus;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date CreateTime;
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0