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

提升机缺少floor

Browse Source
This commit is contained in:
pangshenghao
2023-06-07 17:35:08 +08:00
parent fcb21e1c7f
commit f82cdee8fb
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/device_status/DeviceStatusDeviceDriver.java
View File

@@ -74,6 +74,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
String load = ""; String load = "";
String alarm = ""; String alarm = "";
String task_id = ""; String task_id = "";
String floor ="";
Boolean iserror = false; Boolean iserror = false;
Boolean hasGoods = false; Boolean hasGoods = false;
@@ -110,6 +111,7 @@ public class DeviceStatusDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("load", load); jo.put("load", load);
jo.put("alarm", alarm); jo.put("alarm", alarm);
jo.put("task_id", task_id); jo.put("task_id", task_id);
jo.put("floor",floor);
jo.put("isOnline", this.getIsonline()); jo.put("isOnline", this.getIsonline());
jo.put("isError",this.getIserror()); jo.put("isError",this.getIserror());
jo.put("hasGoods", this.getHasGoods()); jo.put("hasGoods", this.getHasGoods());

3
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/DeviceStatusData.java
View File

@@ -29,4 +29,7 @@ public class DeviceStatusData {
//任务号 //任务号
String taskId; String taskId;
//楼层
String floor;
} }

1
acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/QueryLKDeviceStatus.java
View File

@@ -70,6 +70,7 @@ public class QueryLKDeviceStatus {
deviceStatusDeviceDriver.setLoad(deviceStatusData.getLoad()); deviceStatusDeviceDriver.setLoad(deviceStatusData.getLoad());
deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm()); deviceStatusDeviceDriver.setAlarm(deviceStatusData.getAlarm());
deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId()); deviceStatusDeviceDriver.setTask_id(deviceStatusData.getTaskId());
deviceStatusDeviceDriver.setFloor(deviceStatusData.getFloor());
deviceStatusDeviceDriver.setIsonline(true); deviceStatusDeviceDriver.setIsonline(true);
if(!"0".equals(deviceStatusData.getAlarm())) { if(!"0".equals(deviceStatusData.getAlarm())) {
deviceStatusDeviceDriver.setIserror(true); deviceStatusDeviceDriver.setIserror(true);

3
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -608,6 +608,9 @@ export default {
} else if (val === 'task_id') { } else if (val === 'task_id') {
const obj = { name: '任务号', value: data[val] } const obj = { name: '任务号', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'floor') {
const obj = { name: '楼层', value: data[val] }
this.arr.push(obj)
} }
} }
} }