From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务,占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 6e9a6f7..a22ff3c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -74,10 +74,14 @@
         ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
         for (int i = 1; i <= 6; i++) {
             ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+            ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
+            ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
             if (null != requestWord.getValue()) {
                 BigStorageCageTask task = new BigStorageCageTask();
                 task.setGlassId(requestWord.getValue() + "");
                 task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+                task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
+                task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
                 inTaskList.add(task);
                 continue;
             }

--
Gitblit v1.8.0