From 425e9e1f5413fdd46368e5486d582a25473f7476 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 十二月 2024 14:14:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 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