diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java index 596be83..b01a57e 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ItemProtocol.java @@ -33,6 +33,8 @@ ItemProtocol { */ public static String item_to_command = "to_command"; + public static String item_to_error = "to_error"; + private ProductionLineDockingStationDeviceDriver driver; @@ -65,7 +67,9 @@ ItemProtocol { return getOpcIntegerValue(item_to_command); } - + public int getTo_error() { + return getOpcIntegerValue(item_to_error); + } Boolean isonline; @@ -105,6 +109,7 @@ ItemProtocol { public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); + list.add(new ItemDto(item_to_error, "下发故障代码", "DB2.W2")); return list; } } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java index ea24327..94f079b 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/production_line_docking_station/ProductionLineDockingStationDeviceDriver.java @@ -130,6 +130,7 @@ public class ProductionLineDockingStationDeviceDriver extends AbstractOpcDeviceD .build(); logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); + requireSucess = false; } if (action != last_action) { diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java index 5dde87f..2c95456 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/ItemProtocol.java @@ -33,6 +33,7 @@ ItemProtocol { */ public static String item_to_command = "to_command"; + public static String item_to_task = "to_task"; private RemoveSealCoverPositionDriver driver; @@ -65,7 +66,9 @@ ItemProtocol { return getOpcIntegerValue(item_to_command); } - + public int getTo_task() { + return getOpcIntegerValue(item_to_task); + } Boolean isonline; @@ -104,7 +107,8 @@ ItemProtocol { public static List getWriteableItemDtos() { ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); + list.add(new ItemDto(item_to_command, "下发命令", "DB2.W2")); + list.add(new ItemDto(item_to_task, "下发故障代码", "DB2.W8")); return list; } } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java index 86f4268..732906e 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/zz_driver/remove_seal_cover_position/RemoveSealCoverPositionDriver.java @@ -125,6 +125,7 @@ public class RemoveSealCoverPositionDriver extends AbstractOpcDeviceDriver imple .build(); logDto.setLog_level(2); luceneExecuteLogService.deviceExecuteLog(logDto); + requireSucess = false; } if (action != last_action) {