|
@@ -350,6 +350,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
|
|
|
// if (autoNode.getInterfaceType() != null) {
|
|
|
// taskNode.setInterfaceType(autoNode.getInterfaceType().getKey());
|
|
|
// }
|
|
|
+ String taskType = bpMap.get(t.getProcedureId()).getType();
|
|
|
//依据设备类型判断调用接口类型
|
|
|
if("1".equals(taskNode.getAutoNode().getCategory())){
|
|
|
taskNode.setInterfaceType(DictionaryKey.INTERFACETYPE_PLC);
|
|
@@ -376,19 +377,21 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
|
|
|
if(null!= autoCode.getResourceId()) {
|
|
|
taskNode.setResourceId(getResourceIdByAutoCode(autoCode.getResourceId().toString()));
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
else if("2".equals(taskNode.getAutoNode().getCategory())){
|
|
|
taskNode.setInterfaceType(DictionaryKey.INTERFACETYPE_AGV);
|
|
|
}else if("4".equals(taskNode.getAutoNode().getCategory())){
|
|
|
taskNode.setInterfaceType(DictionaryKey.INTERFACETYPE_WMS);
|
|
|
- String taskType = bpMap.get(t.getProcedureId()).getType();
|
|
|
+
|
|
|
if("上料".equals(taskType)){
|
|
|
taskNode.setNodeType("1");
|
|
|
+ taskNode.setResourceId(t.getResourceId());
|
|
|
}else if("下料".equals(taskType)){
|
|
|
taskNode.setNodeType("2");
|
|
|
+ taskNode.setResourceId(t.getResourceId());
|
|
|
}else if("翻面".equals(taskType)){
|
|
|
taskNode.setNodeType("4");
|
|
|
+ taskNode.setResourceId(t.getResourceId());
|
|
|
}else{
|
|
|
taskNode.setNodeType("0");
|
|
|
}
|