root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix querydevice接口

Browse Source
This commit is contained in:
张江玮
2023-08-28 15:27:12 +08:00
parent 39c4a2a0d2
commit 81fd26cba7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -324,6 +324,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("power", driver.getElectric_qty()); jo.put("power", driver.getElectric_qty());
jo.put("error", driver.getError()); jo.put("error", driver.getError());
jo.put("error_msg", driver.getError() == 0 ? "" : driver.getError_message()); 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) { } else if (device.getDeviceDriver() instanceof OvenGantryManipulatorDeviceDriver) {
OvenGantryManipulatorDeviceDriver driver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver(); OvenGantryManipulatorDeviceDriver driver = (OvenGantryManipulatorDeviceDriver) device.getDeviceDriver();
jo.put("device_code", driver.getDevice().getDevice_code()); jo.put("device_code", driver.getDevice().getDevice_code());