不必须等待另一轨道下料完成,即可下料

模板自动同时加载

LaiPuLaser/DlgDnCutCamera.cpp

@@ -474,6 +474,22 @@ void DlgHawkvisCamera::OnBnClickedSaveCatchTemp()
 		else
 			str += " ʧ°Ü!";
 		gLogMgr->WriteDebugLog(str);
+
+		if (m_pHawkvisCtrl == &m_HawkvisCtrl1)
+		{
+			m_pHawkvisCtrl = &m_HawkvisCtrl2;
+			Sleep(100);
+			OnBnClickedLoadCatchTemp();
+			m_pHawkvisCtrl = &m_HawkvisCtrl1;//恢复
+		}
+		else
+		{
+			m_pHawkvisCtrl = &m_HawkvisCtrl1;
+			Sleep(100);
+			OnBnClickedLoadCatchTemp();
+			m_pHawkvisCtrl = &m_HawkvisCtrl2;//恢复
+		}
+		
 	}
 	catch (...)
 	{

LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp

@@ -1459,15 +1459,17 @@ void CTrackWorkFlow::UnLoad()
 	//如果另外一个轴在unload ,要等待其unload 完成
 	if (gProgram_SZ_XL->IsbAutoWorkMode())
 	{
+		int cnt = 0;
 		while (!gExitApp)
 		{
-			Sleep(200);
+			Sleep(500);
 			//获取另外一个轴的状态
 			ETrackWorkStep OtherTrackWorkStep = gProgram_SZ_XL->GetOtherTrackWorkStep(m_TrackType);
-			if (OtherTrackWorkStep != _ETrack_Step_Unload)
+			if ((OtherTrackWorkStep != _ETrack_Step_Unload)||cnt>10)
 			{
 				break;
 			}
+			cnt++;
 		}
 	}