From 6bc7ce4b5bb2cbaf458766ac40d9ba8c5d40133d Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期四, 15 八月 2024 09:12:41 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java index b439101..c4caf74 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageOutTask.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,10 +28,12 @@ public BigStorageCageOutTask() { } - public BigStorageCageOutTask(String glassId, Integer startSlot, Integer endSlot, Integer width, Integer trainNumber, Integer serialNumber, Integer taskState) { + public BigStorageCageOutTask(String glassId, Integer startSlot, Integer endSlot, double width, double height, Integer trainNumber, Integer serialNumber, Integer taskState) { this.glassId = glassId; this.startSlot = startSlot; this.endSlot = endSlot; + this.width = width; + this.height = height; this.trainNumber = trainNumber; this.serialNumber = serialNumber; this.taskState = taskState; @@ -60,6 +63,16 @@ */ @ApiModelProperty(value = "鐩爣浣嶇疆", position = 5) private Integer endSlot; + /** + * 鐩爣浣嶇疆 + */ + @ApiModelProperty(value = "鐩爣浣嶇疆", position = 5) + private double width; + /** + * 鐩爣浣嶇疆 + */ + @ApiModelProperty(value = "鐩爣浣嶇疆", position = 5) + private double height; /** * 杞︽ @@ -79,4 +92,7 @@ @ApiModelProperty(value = "浠诲姟鐘舵��", position = 8) private Integer taskState; + @TableLogic + private int deleted; + } -- Gitblit v1.8.0