From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 635f2df..1f49bde 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
@@ -12,6 +12,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -60,29 +61,27 @@
@ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
private Integer glassType;
- /**
- * 楂�
- */
- @ApiModelProperty(value = "楂�", position = 10)
- private Double height;
/**
* 鍘氬害
*/
@ApiModelProperty(value = "鍘氬害", position = 11)
- private Double thickness;
+ private double thickness;
+
+ @ApiModelProperty(value = "鏃嬭浆瑙掑害", position = 12)
+ private Integer angle;
/**
- * 閽㈠寲鐗堝浘id
+ * x鍧愭爣
*/
- @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
- private Integer temperingLayoutId;
+ @ApiModelProperty(value = "x鍧愭爣", position = 13)
+ private Integer xCoordinate;
/**
- * 閽㈠寲鐗堝浘鐗囧簭
+ * y鍧愭爣
*/
- @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
- private Integer temperingFeedSequence;
+ @ApiModelProperty(value = "y鍧愭爣", position = 14)
+ private Integer yCoordinate;
/**
* 鐘舵��
@@ -99,20 +98,29 @@
/**
* 宸ョ▼鍙�
*/
- @ApiModelProperty(value = "宸ョ▼鍙�")
- private String engineerId;
+ @ApiModelProperty(value = "灞�", position = 17)
+ private int layer;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updateTime;
/**
* 杩涚墖浠诲姟
*/
- @ApiModelProperty(value = "杩涚墖浠诲姟", position = 16)
+ @ApiModelProperty(value = "杩涚墖浠诲姟", position = 18)
@TableField(exist = false)
private BigStorageCageFeedTask bigStorageCageFeedTask;
/**
* 鍑虹墖浠诲姟
*/
- @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 17)
+ @ApiModelProperty(value = "鍑虹墖浠诲姟", position = 19)
@TableField(exist = false)
private BigStorageCageOutTask bigStorageCageOutTask;
--
Gitblit v1.8.0