From b64ef67b6950301c5e808cbb709248e341a3e6a2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 20 十二月 2024 22:53:14 +0800
Subject: [PATCH] 1、大理片笼及中空大理片笼自动报工，增加过渡台限制（高度超过2500或者厚度超过12） 2、卧理报工
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 9be61a8..b506c45 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
@@ -101,6 +101,8 @@
private Integer artificialOutTargetPosition;
@Value("${mes.slotMaxHeight}")
private Integer slotMaxHeight;
+ @Value("${mes.slotMaxthickness}")
+ private Integer slotMaxthickness;
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
@@ -175,7 +177,7 @@
}
}
//todo:瓒呭ぇ灏哄
- if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight())) {
+ if (slotMaxHeight < Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) || glassInfoList.get(0).getThickness() > slotMaxthickness) {
int count = bigStorageCageDetailsService.count(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getSlot, THROUGH_SLOT)
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
@@ -189,6 +191,11 @@
//淇敼纾ㄨ竟瀵瑰垪琛ㄧ殑鐜荤拑鐘舵��
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
.set(EdgGlassTaskInfo::getState, Const.EDG_GLASS_SUCCESS).in(EdgGlassTaskInfo::getGlassId, glassIdList));
+ //鎶ュ伐
+ for (String glass : glassIdList) {
+ damageService.autoSubmitReport(glass, inTaskList.get(0).getStartSlot(), "纾ㄨ竟", "杩涘ぇ鐞嗙墖绗�");
+ }
+
Map<String, List<GlassInfo>> glassListMap = glassInfoList.stream().collect(Collectors.groupingBy(GlassInfo::getGlassId));
//璁＄畻鐩爣鏍煎瓙
List<BigStorageCageHistoryTask> historyTasks = new ArrayList<>();
@@ -220,6 +227,7 @@
cageDetails.setDeviceId(bigStorageDTO.getDeviceId());
cageDetails.setSequence(bigStorageDTO.getSlotSequence());
cageDetails.setGap(glassGap);
+ cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
bigStorageCageDetailsService.save(cageDetails);
}
@@ -242,6 +250,7 @@
cageDetails.setDeviceId(0);
cageDetails.setSequence(0);
cageDetails.setGap(glassGap);
+ cageDetails.setFilmsId(info.getFilmsid());
cageDetails.setId(null);
bigStorageCageDetailsService.save(cageDetails);
}
@@ -533,6 +542,10 @@
bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_OUT);
} else {
bigStorageCageDetailsService.updateBySlot(storageCageDTOList, Const.GLASS_STATE_IN);
+ //todo:鎸夌収鏍煎瓙淇℃伅鏇存柊瀵瑰簲鐨勮澶噄d
+ List<Integer> slotList = storageCageDTOList.stream().map(UpdateBigStorageCageDTO::getTargetSlot).distinct().collect(Collectors.toList());
+ bigStorageCageDetailsService.updateDeviceIdBySlot(slotList);
+
}
log.info("4銆佸ぇ鐞嗙墖绗艰繘鐗囩姸鎬佸凡瀹屾垚宸插畬鎴愮殑鐜荤拑淇℃伅id:{}", v);
updateSlotRemainBySlots(outSuccessGlassSlot);
--
Gitblit v1.8.0