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/BigStorageCageFeedTask.java |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
index 41ed73d..e783646 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/entity/BigStorageCageFeedTask.java
@@ -2,12 +2,14 @@
 
 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>
@@ -17,7 +19,7 @@
  * @author zhoush
  * @since 2024-04-16
  */
-@ApiModel(description = "<p>  </p>")
+@ApiModel(description = "<p> 鐞嗙墖杩涚浠诲姟 </p>")
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class BigStorageCageFeedTask implements Serializable {
@@ -27,8 +29,8 @@
     /**
      * 涓婚敭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;
 
     /**
@@ -41,7 +43,7 @@
      * 鐩爣浣嶇疆
      */
     @ApiModelProperty(value = "鐩爣浣嶇疆", position = 4)
-    private Integer tragetSlot;
+    private int targetSlot;
 
     /**
      * 鐜荤拑绫诲瀷
@@ -59,7 +61,25 @@
      * 绾胯矾
      */
     @ApiModelProperty(value = "绾胯矾", position = 7)
-    private Integer line;
+    private int line;
+    /**
+     * 瀹藉害
+     */
+    @ApiModelProperty(value = "瀹藉害", position = 8)
+    private Integer width;
+    /**
+     * 楂樺害
+     */
+    @ApiModelProperty(value = "楂樺害", position = 8)
+    private Integer height;
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 8)
+    private Date createTime;
+
+    @TableLogic
+    private int deleted;
 
 
 }

--
Gitblit v1.8.0