fix: 大屏信息补充
This commit is contained in:
@@ -106,6 +106,8 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
//当前指令
|
//当前指令
|
||||||
Instruction inst = null;
|
Instruction inst = null;
|
||||||
|
|
||||||
|
String notCreateTaskMessage = "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1-执行任务;2-取货完成;3-放货完成;
|
* 1-执行任务;2-取货完成;3-放货完成;
|
||||||
*/
|
*/
|
||||||
@@ -166,6 +168,24 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
map.put("to_command", 1);
|
map.put("to_command", 1);
|
||||||
this.writing(map);
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -262,6 +282,7 @@ public class SubRollConveyorSiteDeviceDriver extends AbstractOpcDeviceDriver imp
|
|||||||
jo.put("move", move);
|
jo.put("move", move);
|
||||||
jo.put("isOnline", this.getIsonline());
|
jo.put("isOnline", this.getIsonline());
|
||||||
jo.put("isError", this.getIserror());
|
jo.put("isError", this.getIserror());
|
||||||
|
jo.put("notCreateTaskMessage", notCreateTaskMessage);
|
||||||
return jo;
|
return jo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user