From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 8b0232b..2ed246d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -51,20 +51,10 @@
@Autowired(required = false)
MiloService miloService;
-
-// @Resource(name = "cacheGlassStartCallback")
-// SubscriptionCallback cacheGlassStartCallback;
-//
-// @Resource(name = "cacheGlassTestCallback")
-// SubscriptionCallback cacheGlassTestCallback;
-
@Resource
EdgStorageDeviceTaskService edgStorageDeviceTaskService;
- // @Resource
-// EdgGlassTaskQueueInfoService edgGlassTaskQueueInfoService;
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
-
@Resource
GlassInfoService glassInfoService;
@Resource
@@ -101,16 +91,6 @@
private String glassInIdTwo = "";
private String glassIdOne = "";
private String glassIdTwo = "";
-
- // @Scheduled(fixedDelay = Long.MAX_VALUE)
-// public void startOneOpcTask() throws Exception {
-// miloService.subscriptionFromOpcUa(Arrays.asList("mes.WL1.edg_storage_device_one_task[1].task_state"), cacheGlassStartCallback);
-// }
-//
-// @Scheduled(fixedDelay = Long.MAX_VALUE)
-// public void startTwoOpcTask() throws Exception {
-// miloService.subscriptionFromOpcUa(Arrays.asList("mes.WL2.edg_storage_device_two_task[1].task_state"), cacheGlassStartCallback);
-// }
@Scheduled(fixedDelay = 1000)
public void startOneOpcTask() {
@@ -707,10 +687,9 @@
if (2 == taskHistory.getTaskType()) {
remainWidth = 0;
} else {
- EdgStorageCage storageCage = edgStorageCageService.getOne(new LambdaQueryWrapper<EdgStorageCage>()
- .eq(EdgStorageCage::getDeviceId, device).eq(EdgStorageCage::getSlot, slot));
- EdgStorageCageDetails bigDetails = list.stream().filter(e -> e.getGlassId().equals(taskHistory.getGlassIdIn())).findFirst().orElse(null);
- remainWidth = storageCage.getRemainWidth() - glassGap - (int) Math.max(bigDetails.getWidth(), bigDetails.getHeight());
+ for (EdgStorageCageDetails item : list) {
+ remainWidth = remainWidth - glassGap - (int) Math.max(item.getWidth(), item.getHeight());
+ }
if (remainWidth <= 0) {
remainWidth = 0;
}
--
Gitblit v1.8.0