From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期日, 20 十月 2024 21:06:51 +0800 Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase,仅需要有脚本变动的时候开启在执行,避免启动报错 3、原片仓储新增入库请求、出库情况,调整整体逻辑,增加格子号架子号,任务表、详情表、工位表都需要记录架子信息,用于任务执行过程中,架子在执行过程中可返回架子对应的工位上,避免架子乱放后格子架子号不对应的情况发生。 --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 21 +++++++++++---------- 1 files changed, 11 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 8c6a3be..dbef25a 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,36 +27,34 @@ @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 String createTime; + private Date createTime; } -- Gitblit v1.8.0