|
@@ -296,7 +296,7 @@ Error_manager Dispatch_process::dispatch_control_motion()
|
|
|
//长流程结束, 就答复 control_response_msg
|
|
|
// 注:这里执行调度控制, 即使报错了 也要答复给调度控制, 交给调度控制来进行决策.
|
|
|
iter->second.m_error = t_error;
|
|
|
- iter->second.m_dispatch_control_status = DISPATCH_CONTROL_RESPONSE;
|
|
|
+ iter->second.m_dispatch_control_status = DISPATCH_CONTROL_TASK_WITHDRAW;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
@@ -404,6 +404,9 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ std::cout << " huli test :::: " << " 123123123123123123123 = " << 1233 << std::endl;
|
|
|
+ std::cout << " huli test :::: " << " tp_catcher->check_status() = " << tp_catcher->check_status().to_string() << std::endl;
|
|
|
+ std::cout << " huli test :::: " << " tp_catcher->m_actual_device_status = " << tp_catcher->m_actual_device_status << std::endl;
|
|
|
t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
|
|
|
" tp_catcher->m_actual_device_status device_status error ");
|
|
|
dispatch_control_node.m_error = t_error;
|
|
@@ -475,6 +478,9 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ std::cout << " huli test :::: " << " 123123123123123123123 = " << 4566 << std::endl;
|
|
|
+ std::cout << " huli test :::: " << " tp_carrier->check_status() = " << tp_carrier->check_status().to_string() << std::endl;
|
|
|
+ std::cout << " huli test :::: " << " tp_carrier->m_actual_device_status = " << tp_carrier->m_actual_device_status << std::endl;
|
|
|
t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
|
|
|
" tp_carrier->m_actual_device_status device_status error ");
|
|
|
dispatch_control_node.m_error = t_error;
|
|
@@ -2627,9 +2633,9 @@ Error_manager Dispatch_process::check_task_ex(std::shared_ptr<Task_Base> p_task,
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- std::cout << " huli test :::: " << " ffffffffffffffffffffffffffffffffffffffffffffffffffffff = " << 333 << std::endl;
|
|
|
- std::cout << " huli test :::: " << " p_task->get_task_statu() = " << p_task->get_task_statu() << std::endl;
|
|
|
- std::cout << " huli test :::: " << " gggggggggggggggggggggggggggggggggggggggggggggggggggggg = " << 333 << std::endl;
|
|
|
+// std::cout << " huli test :::: " << " ffffffffffffffffffffffffffffffffffffffffffffffffffffff = " << 333 << std::endl;
|
|
|
+// std::cout << " huli test :::: " << " p_task->get_task_statu() = " << p_task->get_task_statu() << std::endl;
|
|
|
+// std::cout << " huli test :::: " << " gggggggggggggggggggggggggggggggggggggggggggggggggggggg = " << 333 << std::endl;
|
|
|
|
|
|
|
|
|
if ( p_task->get_task_statu() == Task_Base::Task_statu::TASK_OVER )
|