From 609818970fb1e7ae59b2535752a5ea063aa229b0 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期六, 06 七月 2024 15:05:52 +0800 Subject: [PATCH] 1:大理片 新增计算最大宽度:避免高度大于宽度 计算出错 2、磨边前卧式理片新增最小尺寸校验 3、下片修复下片逻辑异常,新增配置 人工下片的最大尺寸 最小尺寸 直通任务的最大尺寸 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java index 6fdd959..f5300b1 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.data.annotation.Id; import java.io.Serializable; @@ -21,21 +22,19 @@ private static final long serialVersionUID = 1L; - /** - * id - */ + @Id @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 瀹� */ - private Double width; + private double width; /** * 楂� */ - private Double height; + private double height; /** * 鑶滅郴 @@ -45,7 +44,7 @@ /** * 鍘氬害 */ - private Double thickness; + private double thickness; /** * 娴佺▼鍗″彿 @@ -56,6 +55,18 @@ * 浠诲姟鐘舵�� */ private Integer state; + /** + * 鐜荤拑ID + */ + private String glassId; + /** + * 宸ヤ綅id + */ + private String workstationid; + /** + * 鏈哄櫒浜� + */ + private String Robot; } -- Gitblit v1.8.0