diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java index 0fb13996c..a80366db9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/sub_roll_conveyor_site/SubRollConveyorSiteDeviceDriver.java @@ -106,6 +106,8 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp //当前指令 Instruction inst = null; + String notCreateTaskMessage = ""; + /** * 1-执行任务;2-取货完成;3-放货完成; */ @@ -166,6 +168,24 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp Map map = new LinkedHashMap<>(); map.put("to_command", 1); this.writing(map); + }else { + String remark = "";; + if (mode != 2) { + remark = "universal_remark2"; + } + if (move != 0) { + remark = "universal_remark3"; + } + if (task != 0) { + remark = "universal_remark4"; + if (ObjectUtil.isNotEmpty(this.inst)) { + this.inst = null; + } + } + if (requireSucess) { + remark = "universal_remark5"; + } + this.setNotCreateTaskMessage(remark); } break; default: @@ -262,6 +282,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp jo.put("move", move); jo.put("isOnline", this.getIsonline()); jo.put("isError", this.getIserror()); + jo.put("notCreateTaskMessage", notCreateTaskMessage); return jo; }