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/bigstoragetask/entity/BigStorageCageOutTask.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 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 2094530..5c6a121 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,33 +2,50 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
/**
* <p>
- *
+ *
* </p>
*
* @author zhoush
* @since 2024-04-16
*/
-@ApiModel(description = "<p> </p>")
+@ApiModel(description = "<p> 鐞嗙墖鍑虹浠诲姟 </p>")
@Data
@EqualsAndHashCode(callSuper = false)
public class BigStorageCageOutTask implements Serializable {
private static final long serialVersionUID = 1L;
+ public BigStorageCageOutTask() {
+ }
+
+ public BigStorageCageOutTask(String glassId, Integer startSlot, Integer endSlot, double width, double height, Integer trainNumber, Integer serialNumber, Integer taskState, Date createTime) {
+ this.glassId = glassId;
+ this.startSlot = startSlot;
+ this.endSlot = endSlot;
+ this.width = width;
+ this.height = height;
+ this.trainNumber = trainNumber;
+ this.serialNumber = serialNumber;
+ this.taskState = taskState;
+ this.createTime = createTime;
+ }
+
/**
* 涓婚敭id
*/
- @ApiModelProperty(value = "涓婚敭id", position = 2)
- @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "涓婚敭id", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -48,6 +65,16 @@
*/
@ApiModelProperty(value = "鐩爣浣嶇疆", position = 5)
private Integer endSlot;
+ /**
+ * 鐩爣浣嶇疆
+ */
+ @ApiModelProperty(value = "鐩爣浣嶇疆", position = 5)
+ private double width;
+ /**
+ * 鐩爣浣嶇疆
+ */
+ @ApiModelProperty(value = "鐩爣浣嶇疆", position = 5)
+ private double height;
/**
* 杞︽
@@ -67,5 +94,13 @@
@ApiModelProperty(value = "浠诲姟鐘舵��", position = 8)
private Integer taskState;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 9)
+ private Date createTime;
+
+ @TableLogic
+ private int deleted;
}
--
Gitblit v1.8.0