From 7d8cd9d28e97ea54ab4c76dbe37fd910f6d279c5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 十一月 2025 08:51:41 +0800
Subject: [PATCH] 1、钢化大理片，中空大理片的理片笼详情查询代码补充
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowBigCageDetailsRequest.java | 52 ++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 6
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowBigCageDetailsVO.java | 110 ++++++++++++++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/request/BigCageDetailsRequest.java | 52 ++++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigCageDetailsVO.java | 110 ++++++++++++++++++
5 files changed, 327 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index 8a1bf3a..241b4fe 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -304,7 +304,7 @@
log.info("寮�濮嬫墽琛岃繘鐗囦换鍔★紝浠诲姟淇℃伅涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{}", task, deviceId, startDate);
//鑾峰彇鐜荤拑鐨勫熀鏈俊鎭�
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
- if (null == glassInfo) {
+ if (null == glassInfo && StringUtils.isNotBlank(task.getGlassIdIn())) {
log.info("杩涚墖鐜荤拑淇℃伅涓嶅瓨鍦紝鐜荤拑id:{}", task.getGlassIdIn());
ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
@@ -380,8 +380,8 @@
private boolean outTask(S7DataWL task, int deviceId, int cellFlag) {
Date startDate = new Date();
- GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
- if (null == glassInfo) {
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdOut()));
+ if (null == glassInfo && StringUtils.isNotBlank(task.getGlassIdIn())) {
log.info("杩涚墖鐜荤拑淇℃伅涓嶅瓨鍦紝鐜荤拑id:{}", task.getGlassIdIn());
ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/request/BigCageDetailsRequest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/request/BigCageDetailsRequest.java
new file mode 100644
index 0000000..0b7d1cb
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/request/BigCageDetailsRequest.java
@@ -0,0 +1,52 @@
+package com.mes.bigstorage.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mes.base.entity.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/9/4 17:04
+ * @Description:
+ */
+@Data
+public class BigCageDetailsRequest extends PageRequest {
+
+ @ApiModelProperty(value = "璁惧id", position = 1)
+ private Integer deviceId;
+
+ @ApiModelProperty(value = "鏍煎瓙鍙�", position = 2)
+ private Integer slot;
+
+ @ApiModelProperty(value = "娴佺▼鍗�", position = 3)
+ private String flowCardId;
+
+ @ApiModelProperty(value = "鑶滅郴", position = 4)
+ private String filmsId;
+
+ @ApiModelProperty(value = "鍘氬害", position = 5)
+ private int thickness;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 6)
+ private String engineerId;
+
+ @ApiModelProperty(value = "鐜荤拑id", position = 7)
+ private String glassId;
+
+ @ApiModelProperty(value = "鐜荤拑鎶ュ伐鐘舵�侊細8鐮存崯 9鎷胯蛋 璋冪敤鏇存柊鐘舵��/鐮存崯鎷胯蛋鎺ュ彛蹇呭～", position = 8)
+ private String state;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigCageDetailsVO.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigCageDetailsVO.java
new file mode 100644
index 0000000..85244cd
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/vo/BigCageDetailsVO.java
@@ -0,0 +1,110 @@
+package com.mes.bigstorage.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.bigstorage.entity.BigStorageCage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/9/4 17:02
+ * @Description:
+ */
+@Data
+public class BigCageDetailsVO extends BigStorageCage {
+
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛ㄤ富閿� ID", position = 1)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long detailId;
+
+ @ApiModelProperty(value = "璁惧 ID", position = 2)
+ private Integer detailDeviceId;
+
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 3)
+ private Integer detailSlot;
+
+ @ApiModelProperty(value = "鐜荤拑 ID", position = 4)
+ private String glassId;
+
+ @ApiModelProperty(value = "灏忕墖鍦ㄦ牸瀛愬唴鐨勯『搴�", position = 5)
+ private Integer sequence;
+
+ @ApiModelProperty(value = "娴佺▼鍗″彿", position = 6)
+ private String flowCardId;
+
+ @ApiModelProperty(value = "娴佺▼鍗¤惤鏋剁紪鐮�", position = 7)
+ private String flowCardSequence;
+
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
+ private Integer glassType;
+
+ @ApiModelProperty(value = "鐜荤拑瀹藉害锛堝崟浣嶏細mm锛�", position = 9)
+ private Double width;
+
+ @ApiModelProperty(value = "鐜荤拑楂樺害锛堝崟浣嶏細mm锛�", position = 10)
+ private Double height;
+
+ @ApiModelProperty(value = "鐜荤拑鍘氬害锛堝崟浣嶏細mm锛�", position = 11)
+ private Double thickness;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘 ID", position = 12)
+ private Integer temperingLayoutId;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭鍙�", position = 13)
+ private Integer temperingFeedSequence;
+
+ @ApiModelProperty(value = "X 鍧愭爣", position = 14)
+ private Integer xCoordinate;
+
+ @ApiModelProperty(value = "Y 鍧愭爣", position = 15)
+ private Integer yCoordinate;
+
+ @ApiModelProperty(value = "鐜荤拑鐘舵��", position = 16)
+ private Integer state;
+
+ @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 17)
+ private Integer gap;
+
+ @ApiModelProperty(value = "宸ョ▼鍙� ID", position = 18)
+ private String engineerId;
+
+ @ApiModelProperty(value = "灞傚彿", position = 19)
+ private Integer totalLayer;
+
+ @ApiModelProperty(value = "灞傚彿", position = 20)
+ private Integer layer;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 21)
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 22)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "鑶滅郴 ID", position = 23)
+ private String filmsId;
+
+ @ApiModelProperty(value = "鏄惁鏃嬭浆锛堣搴︼紝鍗曚綅锛氬害锛�", position = 24)
+ private Integer angle;
+
+ @ApiModelProperty(value = "鏄惁宸查挗鍖�", position = 25)
+ private Integer isTemp;
+
+ @ApiModelProperty(value = "涓┖椤哄簭", position = 26)
+ private Integer hollowSequence;
+
+ @ApiModelProperty(value = "鏄惁閰嶅", position = 27)
+ private Integer isPair;
+
+ @ApiModelProperty(value = "缁勫彿", position = 28)
+ private Integer virtualSlot;
+
+ @ApiModelProperty(value = "缁勫簭", position = 29)
+ private Integer slotSequence;
+
+ @ApiModelProperty(value = "钀芥灦椤哄簭", position = 30)
+ private Integer shelfOrder;
+
+}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowBigCageDetailsRequest.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowBigCageDetailsRequest.java
new file mode 100644
index 0000000..15f2bae
--- /dev/null
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowBigCageDetailsRequest.java
@@ -0,0 +1,52 @@
+package com.mes.hollow.entity.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mes.base.entity.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/9/4 17:04
+ * @Description:
+ */
+@Data
+public class HollowBigCageDetailsRequest extends PageRequest {
+
+ @ApiModelProperty(value = "璁惧id", position = 1)
+ private Integer deviceId;
+
+ @ApiModelProperty(value = "鏍煎瓙鍙�", position = 2)
+ private Integer slot;
+
+ @ApiModelProperty(value = "娴佺▼鍗�", position = 3)
+ private String flowCardId;
+
+ @ApiModelProperty(value = "鑶滅郴", position = 4)
+ private String filmsId;
+
+ @ApiModelProperty(value = "鍘氬害", position = 5)
+ private int thickness;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 6)
+ private String engineerId;
+
+ @ApiModelProperty(value = "鐜荤拑id", position = 7)
+ private String glassId;
+
+ @ApiModelProperty(value = "鐜荤拑鎶ュ伐鐘舵�侊細8鐮存崯 9鎷胯蛋 璋冪敤鏇存柊鐘舵��/鐮存崯鎷胯蛋鎺ュ彛蹇呭～", position = 8)
+ private String state;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowBigCageDetailsVO.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowBigCageDetailsVO.java
new file mode 100644
index 0000000..61ce454
--- /dev/null
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/vo/HollowBigCageDetailsVO.java
@@ -0,0 +1,110 @@
+package com.mes.hollow.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.hollow.entity.HollowBigStorageCage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/9/4 17:02
+ * @Description:
+ */
+@Data
+public class HollowBigCageDetailsVO extends HollowBigStorageCage {
+
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛ㄤ富閿� ID", position = 1)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long detailId;
+
+ @ApiModelProperty(value = "璁惧 ID", position = 2)
+ private Integer detailDeviceId;
+
+ @ApiModelProperty(value = "鏍呮牸鍙�", position = 3)
+ private Integer detailSlot;
+
+ @ApiModelProperty(value = "鐜荤拑 ID", position = 4)
+ private String glassId;
+
+ @ApiModelProperty(value = "灏忕墖鍦ㄦ牸瀛愬唴鐨勯『搴�", position = 5)
+ private Integer sequence;
+
+ @ApiModelProperty(value = "娴佺▼鍗″彿", position = 6)
+ private String flowCardId;
+
+ @ApiModelProperty(value = "娴佺▼鍗¤惤鏋剁紪鐮�", position = 7)
+ private String flowCardSequence;
+
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
+ private Integer glassType;
+
+ @ApiModelProperty(value = "鐜荤拑瀹藉害锛堝崟浣嶏細mm锛�", position = 9)
+ private Double width;
+
+ @ApiModelProperty(value = "鐜荤拑楂樺害锛堝崟浣嶏細mm锛�", position = 10)
+ private Double height;
+
+ @ApiModelProperty(value = "鐜荤拑鍘氬害锛堝崟浣嶏細mm锛�", position = 11)
+ private Double thickness;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘 ID", position = 12)
+ private Integer temperingLayoutId;
+
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭鍙�", position = 13)
+ private Integer temperingFeedSequence;
+
+ @ApiModelProperty(value = "X 鍧愭爣", position = 14)
+ private Integer xCoordinate;
+
+ @ApiModelProperty(value = "Y 鍧愭爣", position = 15)
+ private Integer yCoordinate;
+
+ @ApiModelProperty(value = "鐜荤拑鐘舵��", position = 16)
+ private Integer state;
+
+ @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 17)
+ private Integer gap;
+
+ @ApiModelProperty(value = "宸ョ▼鍙� ID", position = 18)
+ private String engineerId;
+
+ @ApiModelProperty(value = "灞傚彿", position = 19)
+ private Integer totalLayer;
+
+ @ApiModelProperty(value = "灞傚彿", position = 20)
+ private Integer layer;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 21)
+ private Date createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 22)
+ private Date updateTime;
+
+ @ApiModelProperty(value = "鑶滅郴 ID", position = 23)
+ private String filmsId;
+
+ @ApiModelProperty(value = "鏄惁鏃嬭浆锛堣搴︼紝鍗曚綅锛氬害锛�", position = 24)
+ private Integer angle;
+
+ @ApiModelProperty(value = "鏄惁宸查挗鍖�", position = 25)
+ private Integer isTemp;
+
+ @ApiModelProperty(value = "涓┖椤哄簭", position = 26)
+ private Integer hollowSequence;
+
+ @ApiModelProperty(value = "鏄惁閰嶅", position = 27)
+ private Integer isPair;
+
+ @ApiModelProperty(value = "缁勫彿", position = 28)
+ private Integer virtualSlot;
+
+ @ApiModelProperty(value = "缁勫簭", position = 29)
+ private Integer slotSequence;
+
+ @ApiModelProperty(value = "钀芥灦椤哄簭", position = 30)
+ private Integer shelfOrder;
+
+}
--
Gitblit v1.8.0