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); }