From 91d7afedf3ea51ee87ee47d4da2e1b6243f8fb84 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 05 一月 2025 21:50:21 +0800
Subject: [PATCH] 1、大理片笼进片任务新增数量校验，当收到进片请求时，拿电气的玻璃数量与mes接收到的数量作比较，相同继续执行，不相同结束本次任务 2、李赛克文件优化，合中空玻璃每个间隔框的类型可能不同，需要在界面上做选择 3、中空设备号与格子号不匹配bug解决 4、自动报工存在接口调用异常，临时将调用接口回退原版本，待最新接口调用无异常后更新接口 5、fixbug:中空大理片详情界面删除接口异常
---
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