From 6abae920ad543ebdc3ee2e386828dd65e4c5ec35 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 06 十一月 2024 23:21:53 +0800 Subject: [PATCH] 1、opc订阅服务同时订阅一个节点两次,仅一个订阅任务生效,将进出片任务/完成任务放在一起 2、移除原片仓储中的下发字段 --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java index a31fa99..fd2713d 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java @@ -2,20 +2,23 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.util.Date; /** * <p> - * + * * </p> * * @author wf * @since 2024-09-10 */ @Data +@Builder @EqualsAndHashCode(callSuper = false) public class RawGlassStorageTask implements Serializable { @@ -24,37 +27,39 @@ @TableId(value = "id", type = IdType.AUTO) private Long id; - /** * 璧峰鏍煎瓙 */ - private Integer originateSlot; - + private Integer startSlot; /** * 鐩爣鏍煎瓙 */ private Integer endSlot; - + /** + * 鏋跺瓙鍙� + */ + private Integer shelf; /** * 鍘熺墖鏁伴噺 */ - private String patternQuantity; - + private Integer patternQuantity; /** * 浠诲姟绫诲瀷 */ private Integer taskType; - /** * 浠诲姟鐘舵�� */ private Integer taskState; + /** + * 鍒涘缓鏃堕棿 + */ + private Date createTime; /** * 鍒涘缓鏃堕棿 */ - private String createTime; - + private Date updateTime; } -- Gitblit v1.8.0