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

更新

Browse Source
This commit is contained in:
loujf
2023-01-06 15:31:06 +08:00
parent cd25950727
commit b58821927e
12 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@@ -527,7 +527,9 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
jo.put("container_type", this.getContainer_type());
jo.put("barcode", this.getBarcode());
jo.put("task", this.getTask());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("isOnline", this.getIsonline());
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@@ -1384,7 +1384,9 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
jo.put("specifications", this.getSpecifications());
jo.put("batch", this.getBatch());
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("putStation", this.getPut_station());
jo.put("barcode", this.getBarcode());
jo.put("material", this.getMaterial());

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
View File

@@ -717,7 +717,9 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
jo.put("io_action", io_action);
jo.put("hasGoods", this.getHasGoods());
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());
jo.put("task", this.getTask());

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@@ -714,7 +714,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
jo.put("io_action", io_action);
jo.put("hasGoods", this.getHasGoods());
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());
jo.put("task", this.getTask());

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -752,7 +752,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
jo.put("action_1", action_1);
jo.put("action_2", action_2);
jo.put("walk_y", walk_y);
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("task1", this.getTask1());
jo.put("task2", this.getTask2());
jo.put("isOnline", this.getIsonline());

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@@ -1220,7 +1220,9 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
jo.put("device_name", this.getDevice().getDevice_name());
jo.put("mode", mode);
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("getStation", this.getGetStation());
jo.put("barcode", this.getBarcode());
jo.put("material", this.getMaterial());

12
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@@ -753,6 +753,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
mode = "单机";
} else if (this.getMode() == 2) {
mode = "联机";
} else if (this.getMode() == 3) {
mode = "运行中";
} else if (this.getMode() == 4) {
mode = "叫料";
} else if (this.getMode() == 5) {
@@ -765,6 +767,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
mode = "申请入窑";
} else if (this.getMode() == 9) {
mode = "申请出窑";
} else if (this.getMode() == 11) {
mode = "强制去包装";
}
if (this.getAction() == 0) {
@@ -800,15 +804,17 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
jo.put("io_action", io_action);
jo.put("hasGoods", this.getHasGoods());
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("isError", this.getIserror());
jo.put("message", this.getMessage());
jo.put("task", this.getTask());
jo.put("weight", this.getWeight());
jo.put("material", this.getMaterial());
jo.put("barcode", this.getBarcode());
jo.put("specifications", this.getSpecifications());
jo.put("batch", this.getBatch());
// jo.put("specifications", this.getSpecifications());
// jo.put("batch", this.getBatch());
jo.put("container_type", this.getContainer_type());
return jo;
}

4
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java
View File

@@ -1641,7 +1641,9 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
jo.put("status", status);
jo.put("onoff_status", onoff_status);
jo.put("isOnline", this.getIsonline());
jo.put("error", this.getError());
if (this.getIserror()) {
jo.put("error", "设备有故障");
}
jo.put("putStation", this.getPut_station());
jo.put("barcode", this.getBarcode());
jo.put("material", this.getMaterial());