From 81fd26cba77fe2f6c3d7619d318f0ef151d7d8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Mon, 28 Aug 2023 15:27:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=20querydevice=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 3ee15e51e..18fc1e0c0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -324,6 +324,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { jo.put("power", driver.getElectric_qty()); jo.put("error", driver.getError()); jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); + } else if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { + AgvNdcTwoDeviceDriver driver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); + jo.put("device_code", driver.getDevice().getDevice_code()); + jo.put("device_name", driver.getDevice().getDevice_name()); + jo.put("status", driver.getStatus()); + jo.put("power", driver.getElectric_qty()); + jo.put("error", driver.getError()); + jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); } else if (device.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) { OvenGantryManipulatorDeviceDriver driver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver(); jo.put("device_code", driver.getDevice().getDevice_code());