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/downglassinfo/entity/DownGlassTask.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java index 9c8a82c..79f62f9 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java @@ -1,5 +1,6 @@ package com.mes.downglassinfo.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,7 +25,7 @@ /** * id */ - @TableId(value = "id") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** @@ -36,27 +37,27 @@ /** * 璧峰 */ - private String startCell; + private Integer startCell; /** * 鐩爣 */ - private String endCell; + private Integer endCell; /** * 浠诲姟绫诲瀷 1:杩� 2锛氬嚭 */ - private String taskType; + private Integer taskType; /** * 瀹� */ - private Double width; + private Integer width; /** * 楂� */ - private Double height; + private Integer height; /** * 鑶滅郴 @@ -66,12 +67,16 @@ /** * 鍘氬害 */ - private Double thickness; + private Integer thickness; /** * 娴佺▼鍗″彿 */ private String flowCardId; + /** + * 灞傚彿 + */ + private int layer; /** * 浠诲姟鐘舵�� 0 鏈紑濮� 1姝e湪杩涜 2瀹屾垚 -- Gitblit v1.8.0