From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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..e2da1a1 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,15 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
@@ -23,33 +25,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 +67,24 @@
/**
* 鍘氬害
*/
- private Double thickness;
+ private Integer thickness;
/**
* 娴佺▼鍗″彿
*/
private String flowCardId;
+ /**
+ * 灞傚彿
+ */
+ private int layer;
/**
* 浠诲姟鐘舵�� 0 鏈紑濮� 1姝ｅ湪杩涜 2瀹屾垚
*/
- private Integer taskStauts;
+ private Integer taskStatus;
-
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date CreateTime;
}
--
Gitblit v1.8.0