diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java index b98a72a6d..ac79f4826 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java @@ -267,7 +267,7 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv action = "放货完成"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java index 682e9296f..01608dbea 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java @@ -481,7 +481,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i move = "有托盘"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("task", task); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java index bdadf2053..5c019438c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java @@ -339,7 +339,7 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple jo.put("hasGoods", true); } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("temperature", temperature); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java index 7155d9960..9c9b1ce2d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java @@ -756,7 +756,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple } if(deviceStatus && error == 0){ iserror = true; - message = "信号连接超时!"; + message = "信号连接异常!"; } if(error == 0 && !deviceStatus){ iserror = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index b683db1a7..cd2ae858a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -854,7 +854,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } if(deviceStatus && error == 0){ iserror = true; - message = "信号连接超时!"; + message = "信号连接异常!"; } if(error == 0 && !deviceStatus){ iserror = false; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java index 328889301..0abb62f4c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device/PaperTubeConveyorDeviceDriver.java @@ -220,7 +220,7 @@ public class PaperTubeConveyorDeviceDriver extends AbstractOpcDeviceDriver imple message = ""; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index 3e74f6042..7f98f0835 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java @@ -760,7 +760,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl requireSucess = "1"; } if(error == 0 && iserror){ - this.message = "信号连接超时!"; + this.message = "信号连接异常!"; } map.put("message", message); map.put("requireSucess", requireSucess); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java index f018ed366..7d96453aa 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/rgv/RgvDeviceDriver.java @@ -335,7 +335,7 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr jo.put("hasGoods", true); } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 2cb5be23e..68fb0a3e7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -631,7 +631,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme requireSucess = "1"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index c7ed79a40..89bec6906 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -464,7 +464,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl requireSucess = "1"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java index 1135ab5ae..666b39259 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java @@ -457,7 +457,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver requireSucess = "1"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java index c1103c6b3..77e3be6e9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_onefloor_agv_conveyor/SiemensOneFloorAGVConveyorDeviceDriver.java @@ -350,7 +350,7 @@ public class SiemensOneFloorAGVConveyorDeviceDriver extends AbstractOpcDeviceDri requireSucess = "1"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 61499818d..2b05d4067 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java @@ -1282,7 +1282,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl map.put("9", "双任务前工位允许放货"); map.put("10", "双任务前工位放货完成"); }else if(type == 4){ - return "信号连接超时!"; + return "信号连接异常!"; } else { return "未执行任务"; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java index 5bfb4ac2f..fcb586e9e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java @@ -464,7 +464,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver jo.put("hasGoods", true); } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java index 68b4bc87d..e9fa63271 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java @@ -874,7 +874,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp applySucess = "1"; } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("requireSucess", requireSucess); jo.put("applySucess", applySucess); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 0e19aa287..7940cda94 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -1106,7 +1106,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe jo.put("hasGoods", true); } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("driver_type", "standard_conveyor_control_with_scanner"); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index f70ad76b3..921fc4484 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -236,7 +236,7 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("hasGoods", true); } if(error == 0 && iserror){ - message = "信号连接超时!"; + message = "信号连接异常!"; } jo.put("device_name", this.getDevice().getDevice_name()); jo.put("mode", mode);