|
|
|
@ -125,12 +125,12 @@ void CTrackWorkFlow::WorkFlowCtrl()
|
|
|
|
|
if (m_CurWorkStep == m_OldWorkStep)//无变化
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
//进入下料函数,设置 步骤为_ETrack_Step_Unload时,不执行
|
|
|
|
|
/*//进入下料函数,设置 步骤为_ETrack_Step_Unload时,不执行
|
|
|
|
|
if (m_OldWorkStep == _ETrack_Step_Throw_Edge_End&&m_CurWorkStep == _ETrack_Step_Unload)
|
|
|
|
|
{
|
|
|
|
|
m_OldWorkStep = m_CurWorkStep;//记录当前步骤
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
if (m_OldWorkStep == _ETrack_Step_Unload)//unload 结束步骤时
|
|
|
|
|
{
|
|
|
|
@ -140,7 +140,12 @@ void CTrackWorkFlow::WorkFlowCtrl()
|
|
|
|
|
}
|
|
|
|
|
m_OldWorkStep = m_CurWorkStep;//记录当前步骤
|
|
|
|
|
//在新线程中执行
|
|
|
|
|
m_pthread=AfxBeginThread(ExecuteStepThread, this);
|
|
|
|
|
if (m_CurWorkStep== _ETrack_Step_Throw_Edge_End)
|
|
|
|
|
m_pthread = AfxBeginThread(ExecuteStepThread, this); //m_pthread只记录下料
|
|
|
|
|
else
|
|
|
|
|
AfxBeginThread(ExecuteStepThread, this);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//执行当前步骤
|
|
|
|
|