From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
index f145de5..5a79a88 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCage.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,6 +19,7 @@
* @author zhoush
* @since 2024-03-27
*/
+@Api(description = "澶х悊鐗囩")
@Data
@EqualsAndHashCode(callSuper = false)
public class BigStorageCage implements Serializable {
@@ -26,29 +29,46 @@
/**
* 澶х悊鐗囩琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "澶х悊鐗囩琛╥d", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* 璁惧id
*/
+ @ApiModelProperty(value = "璁惧id", position = 3)
private Integer deviceId;
/**
* 鏍呮牸鍙�
*/
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 4)
private Integer slot;
+
+ /**
+ * 鏍呮牸鍙�
+ */
+ @ApiModelProperty(value = "鏈�灏忓帤搴�", position = 5)
+ private Integer minThickness;
+ /**
+ * 鏍呮牸鍙�
+ */
+ @ApiModelProperty(value = "鏈�澶у帤搴�", position = 6)
+ private Integer maxThickness;
/**
* 鍚敤鐘舵��
*/
- private String enableState;
+ @ApiModelProperty(value = "鍚敤鐘舵��", position = 7)
+ private Integer enableState;
/**
* 鍓╀綑瀹藉害
*/
+ @ApiModelProperty(value = "鍓╀綑瀹藉害", position = 8)
private Integer remainWidth;
+ @ApiModelProperty(hidden = true)
@TableField(exist = false)
private List<BigStorageCageDetails> bigStorageCageDetails;
--
Gitblit v1.8.0