Browse Source

完成回退流程开发

zx 4 years ago
parent
commit
3d9a355acb

+ 0 - 2
lidar_locate/Locate_communicator.h

@@ -31,8 +31,6 @@ public:
     Error_manager cancel_request(message::Measure_request_msg& request);
     Error_manager check_statu(int terminal_id);
 
-
-
 protected:
     Locate_communicator();
     virtual Error_manager encapsulate_msg(Communication_message* message);

+ 1 - 0
system/PickupProcessTask.cpp

@@ -92,6 +92,7 @@ Error_manager PickupProcessTask::search_space()
     request.mutable_car_info()->CopyFrom(m_car_info);
 
     code = Parkspace_communicator::get_instance_pointer()->search_request(request,m_search_response_msg);
+    m_step_statu=ePicking_step::eDispatch_step;
     return code;
 }
 

+ 1 - 1
system/StoreProcessTask.cpp

@@ -354,7 +354,7 @@ void StoreProcessTask::Main()
             }
             else
             {
-                m_step_statu==eStoring_step::eComplete;
+                m_step_statu=eStoring_step::eComplete;
             }
         }
         //第四步,完成,退出循环

+ 1 - 0
system/system_communicator.h

@@ -29,6 +29,7 @@ public:
     Error_manager post_entrance_statu(message::Picking_process_statu_msg& msg);
     ~System_communicator();
 
+    Error_manager wait_for_measure_msg(std::string license);
 protected:
     //重载函数
     virtual Error_manager encapsulate_msg(Communication_message* message);