From cb921a68fe5f01012125fb522086acea2aa255ba Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 27 十二月 2024 14:43:40 +0800 Subject: [PATCH] 1、中空理片笼新增配方相关功能,用于用户自定义保存中空线相关参数,避免重复输入相同的参数 2、领取任务/强制出片改造:在流程卡、路线、数量基础上新增配方id,用于关联本地流程卡的中空的参数配方 3、增加限制:同一条线路的同个流程卡仅能存在一个未完成的任务 4、卧式理片笼新增日期格式 --- 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