|
@@ -166,7 +166,7 @@ public class TaskWorkNode {
|
|
|
BaseContextHandler.setTenant("0000");
|
|
|
|
|
|
TaskNode taskNode = taskNodeService.getById(taskNodeId);
|
|
|
- TaskNode beforTaskNode = taskNodeService.getNextNTaskNode(taskNode,-1);
|
|
|
+//
|
|
|
if (taskNode == null || taskNode.getTaskId()== null) {
|
|
|
throw new InterruptedException("当前任务节点为空");
|
|
|
}
|
|
@@ -236,6 +236,7 @@ public class TaskWorkNode {
|
|
|
Map conMap = checkCon(taskNode, tTask, queryMap);
|
|
|
|
|
|
if("03".equals(taskNode.getInterfaceType())){
|
|
|
+ TaskNode beforTaskNode = taskNodeService.getNextNTaskNode(taskNode,-1);
|
|
|
// agv搬运
|
|
|
Map agvData = new HashMap();
|
|
|
agvData.put("start",beforTaskNode.getTargetResourceId());
|