From db5bbbd28b8a93b55fedd3dbcc66a5c12734935e Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Wed, 28 Dec 2022 16:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/acs/device_driver/agv/ItemProtocol.java  | 4 ++--
 .../org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java   | 4 ++--
 .../org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java
index 66d7c5c..004cee0 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/ItemProtocol.java
@@ -70,8 +70,8 @@ public class ItemProtocol {
         ArrayList list = new ArrayList();
         list.add(new ItemDto(item_status, "AGV状态", "DB602.W0"));
         list.add(new ItemDto(item_type, "AGV任务类型", "DB602.W2"));
-        list.add(new ItemDto(item_x_coordinate, "AGVx坐标", "DB602.D4"));
-        list.add(new ItemDto(item_y_coordinate, "AGVy坐标", "DB602.D6"));
+        //list.add(new ItemDto(item_x_coordinate, "AGVx坐标", "DB602.D4"));
+        //list.add(new ItemDto(item_y_coordinate, "AGVy坐标", "DB602.D6"));
         return list;
     }
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java
index ed27869..9984b8b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/agv/MaGangAgvDeviceDriver.java
@@ -99,8 +99,8 @@ public class MaGangAgvDeviceDriver extends AbstractOpcDeviceDriver implements De
         device_code = this.getDeviceCode();
         status = this.itemProtocol.getStatus();
         type = this.itemProtocol.getType();
-        x_coordinate = this.itemProtocol.getX_coordinate();
-        y_coordinate = this.itemProtocol.getY_coordinate();
+        //x_coordinate = this.itemProtocol.getX_coordinate();
+        //y_coordinate = this.itemProtocol.getY_coordinate();
     }
 
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java
index 07b0ae1..1e5f593 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/led/MaGangLedDeviceDriver.java
@@ -87,7 +87,7 @@ public class MaGangLedDeviceDriver extends AbstractOpcDeviceDriver implements De
     public void execute() throws Exception {
         String message = null;
         device_code = this.getDeviceCode();
-        D01 = this.itemProtocol.getD01();
+        //D01 = this.itemProtocol.getD01();
     }