From 47c19d0819ed29c9e87f914ce8109128a15a70e8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 一月 2025 16:13:08 +0800
Subject: [PATCH] 1、大理片笼详情表新增旋转角度字段 2、原片仓储+上片联调，解决调试过程中的异常情况 3、上片新增定时任务用于扫描正在执行中的工程是否全部上片完成，及完成后的处理
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index 2b7be5c..640cf2f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -231,6 +231,7 @@
cageDetails.setState(Const.GLASS_STATE_NEW);
cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
cageDetails.setSequence(bigStorageDTO.getSlotSequence());
+ cageDetails.setAngle((int) info.getAngle());
cageDetails.setGap(glassGap);
cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
@@ -255,6 +256,7 @@
cageDetails.setDeviceId(0);
cageDetails.setSequence(0);
cageDetails.setGap(glassGap);
+ cageDetails.setAngle((int) info.getAngle());
cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
bigStorageCageDetailsService.save(cageDetails);
@@ -690,9 +692,12 @@
*/
private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfoByVirtualSlot(List<T> list, String tableName, int targetSlot, int state, int taskType) {
//浠诲姟鏁版嵁:鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲�,鐜荤拑闂撮殧
- List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
- list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
- List<T> outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ List<T> outGlassList = list;
+ if (!THROUGH_SLOT.equals(list.get(0).getSlot())) {
+ List<String> glassIdList = bigStorageGlassRelationInfoService.queryNeedOutGlassId(
+ list.get(0).getEngineerId(), list.get(0).getTemperingLayoutId(), list.get(0).getTemperingFeedSequence());
+ outGlassList = list.stream().filter(e -> glassIdList.contains(e.getGlassId())).collect(Collectors.toList());
+ }
Assert.isFalse(CollectionUtil.isEmpty(outGlassList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", outGlassList.size());
List<BigStorageCageTask> bigStorageCageTaskList = outGlassList.stream()
--
Gitblit v1.8.0