From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 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 c4c9f4c..4c06b4b 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
@@ -1,95 +1,120 @@
package com.mes.bigstorage.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.mes.base.entity.BigStorageCageBaseInfo;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
+@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
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
- /**
- * 鏍呮牸鍙�
- */
- private Integer slot;
-
- /**
- * 鐜荤拑id
- */
- private String glassId;
/**
* 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
*/
+ @ApiModelProperty(value = "灏忕墖鍦ㄦ牸鍐呯殑椤哄簭", position = 6)
private Integer sequence;
/**
* 娴佺▼鍗″彿
*/
+ @ApiModelProperty(value = "娴佺▼鍗″彿", position = 7)
private String flowCardId;
/**
* 鐜荤拑绫诲瀷
*/
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
private Integer glassType;
- /**
- * 瀹�
- */
- private Double width;
-
- /**
- * 楂�
- */
- private Double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ @ApiModelProperty(value = "鍘氬害", position = 11)
+ private double thickness;
/**
* 閽㈠寲鐗堝浘id
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
private Integer temperingLayoutId;
/**
* 閽㈠寲鐗堝浘鐗囧簭
*/
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
private Integer temperingFeedSequence;
/**
* 鐘舵��
*/
+ @ApiModelProperty(value = "鐘舵��", position = 14)
private Integer state;
/**
* 鐜荤拑闂撮殭
*/
+ @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 15)
private Integer gap;
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
+ private String engineerId;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "灞�", position = 17)
+ private int layer;
+
+ /**
+ * 杩涚墖浠诲姟
+ */
+ @ApiModelProperty(value = "杩涚墖浠诲姟", position = 18)
+ @TableField(exist = false)
+ private BigStorageCageFeedTask bigStorageCageFeedTask;
+
+ /**
+ * 鍑虹墖浠诲姟
+ */
+ @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 19)
+ @TableField(exist = false)
+ private BigStorageCageOutTask bigStorageCageOutTask;
}
--
Gitblit v1.8.0