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 | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 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 1f3a632..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,49 +1,43 @@ package com.mes.taskcache.entity; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import lombok.EqualsAndHashCode; + +import java.util.Date; /** - * <p> - * - * </p> - * - * @author zhoush - * @since 2024-04-07 + * 鍗у紡鐞嗙墖绗间换鍔¤〃 */ @Data -@EqualsAndHashCode(callSuper = false) -public class TaskCache implements Serializable { - - private static final long serialVersionUID = 1L; - +@TableName("task_cache") +public class TaskCache { /** - * ID缂栧彿 + * 浠诲姟缂栧彿 */ - @TableId("ID") - private String id; - + private String glassId; /** * 璧峰 */ - private String startCell; - + private int startCell; /** - * 鐩爣 + * 缁撴潫 */ - private String endCell; - + private int endCell; /** - * 浠诲姟绫诲瀷 1:杩� 2锛氬嚭 + * 浠诲姟绫诲瀷 */ - private String taskType; - + private int taskType; /** - * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝e湪杩涜 2瀹屾垚 + * 浠诲姟鐘舵�� */ - private String taskStauts; + private int taskStatus; + /** + * 鍒涘缓鏃堕棿 + */ + private Date createTime; + @TableLogic + private int deleted; } -- Gitblit v1.8.0