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/downglassinfo/entity/DownGlassTask.java | 32 ++++++++++++++++++++++---------- 1 files changed, 22 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 5903d00..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 @@ -1,10 +1,12 @@ package com.mes.downglassinfo.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * <p> @@ -23,33 +25,39 @@ /** * id */ - @TableId(value = "id") + @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,20 +67,24 @@ /** * 鍘氬害 */ - private Double thickness; + private Integer thickness; /** * 娴佺▼鍗″彿 */ private String flowCardId; + /** + * 灞傚彿 + */ + private int layer; /** * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝e湪杩涜 2瀹屾垚 */ - private Integer taskStauts; + private Integer taskStatus; /** - * 鐜荤拑id + * 鍒涘缓鏃堕棿 */ - private String glassId; + private Date CreateTime; } -- Gitblit v1.8.0