From 56914e4936b09d72a51e610cc2f2ad25ea3b879d Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Fri, 20 Dec 2024 23:56:10 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=A2=9E=E5=8A=A0agv=E5=8F=96=E7=A9=BA?=
 =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E5=86=99=E5=85=A5=E7=A1=AE=E8=AE=A4=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B710=E5=8F=96=E8=B4=A7=E5=AE=8C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../acs/device_driver/tianneng/site/SiteDeviceDriver.java   | 6 +++---
 .../src/main/java/org/nl/quartz/task/SyncDeviceStatus.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
index 6b27e14..4694081 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/site/SiteDeviceDriver.java
@@ -224,15 +224,15 @@ public class SiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceD
                     break;
                 case 6:
                     //空托盘出库
-                    log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
+                    //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
                     break;
                 case 7:
                     //涂板线申请空盘
-                    log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
+                    //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
                     break;
                 case 8:
                     //空托盘出库
-                    log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
+                    //log.info("tofix输送线SiteDeviceDriver：" + device_code + "信号为" + mode + ":" + move + ":" + requireSucess + "已无此信号协议，需输送线去掉");
                     break;
             }
             switch (flag) {
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
index 78d320d..8ac4712 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/quartz/task/SyncDeviceStatus.java
@@ -162,8 +162,8 @@ public class SyncDeviceStatus {
                     json.put("device_status", agvNdcOneDeviceDriver.getStatus());
                     json.put("energyLevel", agvNdcOneDeviceDriver.getElectric_qty());
                     json.put("transportOrder", agvNdcOneDeviceDriver.getTransportOrder());
-                    json.put("positionX", agvNdcOneDeviceDriver.getX());
-                    json.put("positionY", agvNdcOneDeviceDriver.getY());
+                    json.put("positionX",  agvNdcOneDeviceDriver.getX()+"0");
+                    json.put("positionY", agvNdcOneDeviceDriver.getY()+"0");
                     json.put("positionAngle", agvNdcOneDeviceDriver.getAngle());
                     agv.add(json);
                 }