3 Commits

2 changed files with 8 additions and 4 deletions

View File

@@ -392,11 +392,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
if (!ObjectUtil.isEmpty(task)) { if (!ObjectUtil.isEmpty(task)) {
this.executeReadyTask(task); boolean flag = this.executeReadyTask(task);
return flag;
} else { } else {
notCreateInstMessage = "universal_notCreateInstMessage"; notCreateInstMessage = "universal_notCreateInstMessage";
return false;
} }
return true;
} }
} }
@@ -448,11 +449,12 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
} }
if (!ObjectUtil.isEmpty(task)) { if (!ObjectUtil.isEmpty(task)) {
this.executeReadyTask(task); boolean flag1 = this.executeReadyTask(task);
return flag1;
} else { } else {
notCreateInstMessage = "universal_notCreateInstMessage"; notCreateInstMessage = "universal_notCreateInstMessage";
return false;
} }
return true;
} }
} }
@@ -597,6 +599,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
instructionService.create(instdto); instructionService.create(instdto);
} catch (Exception e) { } catch (Exception e) {
logServer.deviceExecuteLog(device_code, "", instdto.getInstruction_code(), "->" + e.getMessage()); logServer.deviceExecuteLog(device_code, "", instdto.getInstruction_code(), "->" + e.getMessage());
return false;
} }
//创建指令后修改任务状态 //创建指令后修改任务状态
taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex());

View File

@@ -169,6 +169,7 @@ export default {
}) })
}, },
updateAgvData(agvDataList) { updateAgvData(agvDataList) {
this.agvList = agvDataList
// 更新AGV数据 // 更新AGV数据
agvDataList.forEach(data => { agvDataList.forEach(data => {
const agvIndex = this.agvList.findIndex(agv => agv.vehicle_code === data.vehicle_code) const agvIndex = this.agvList.findIndex(agv => agv.vehicle_code === data.vehicle_code)