From a4cc855f17c36f6ceda20100bc491bc6a0071c27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 11 七月 2024 10:33:06 +0800
Subject: [PATCH] 下片：人工下片表字段改为其他 大理片：新增读取plc数据计时功能
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index 490bbbf..33fe7f5 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.base.entity.BigStorageCageBaseInfo;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import io.swagger.annotations.Api;
@@ -23,15 +24,15 @@
@Api(description = "澶х悊鐗囩璇︽儏")
@Data
@EqualsAndHashCode(callSuper = false)
-public class BigStorageCageDetails implements Serializable {
+public class BigStorageCageDetails extends BigStorageCageBaseInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 澶х悊鐗囩璇︽儏琛╥d
*/
- @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -40,17 +41,6 @@
@ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
- /**
- * 鏍呮牸鍙�
- */
- @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
- private Integer slot;
-
- /**
- * 鐜荤拑id
- */
- @ApiModelProperty(value = "鐜荤拑id", position = 5)
- private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
@@ -71,22 +61,16 @@
private Integer glassType;
/**
- * 瀹�
- */
- @ApiModelProperty(value = "瀹�", position = 9)
- private Double width;
-
- /**
* 楂�
*/
@ApiModelProperty(value = "楂�", position = 10)
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 11)
- private Double thickness;
+ private double thickness;
/**
* 閽㈠寲鐗堝浘id
--
Gitblit v1.8.0