From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java index e4b9286..9226203 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/entity/TaskCache.java @@ -1,15 +1,43 @@ package com.mes.taskcache.entity; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -@Data //lombok 绠�鍐檍ava浠g爜 瀹炰綋绫荤殑get涓巗et +import java.util.Date; + +/** + * 鍗у紡鐞嗙墖绗间换鍔¤〃 + */ +@Data @TableName("task_cache") public class TaskCache { - private String ID;//浠诲姟缂栧彿 - private String startCell;//璧峰 - private String endCell;//缁撴潫 - private String taskType;//浠诲姟绫诲瀷 - private String taskStatus;//浠诲姟鐘舵�� + /** + * 浠诲姟缂栧彿 + */ + private String glassId; + /** + * 璧峰 + */ + private int startCell; + /** + * 缁撴潫 + */ + private int endCell; + /** + * 浠诲姟绫诲瀷 + */ + private int taskType; + /** + * 浠诲姟鐘舵�� + */ + private int taskStatus; + /** + * 鍒涘缓鏃堕棿 + */ + private Date createTime; + + @TableLogic + private int deleted; } -- Gitblit v1.8.0