恢复推出治具超时报警

LaiPuLaser/LaiPuLaser.vcxproj

@@ -48,7 +48,7 @@
     <IncludePath>./OpenCV/Include/opencv2;./OpenCV/Include;C:\Program Files (x86)\Advantech\Common Motion\Public;C:\Program Files (x86)\Advantech\Common Motion\Examples\General;C:\Program Files\Advantech\Common Motion\Public;C:\Program Files\Advantech\Common Motion\Examples\General;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\include;C:\Program Files\IVI Foundation\VISA\WinNT\include;$(IncludePath)</IncludePath>
     <ReferencePath>C:\Program Files (x86)\IVI Foundation\VISA\WinNT\lib\bc;C:\Program Files\IVI Foundation\VISA\WinNT\lib\bc;$(ReferencePath)</ReferencePath>
     <LibraryPath>D:\紫外切割机\OpenCVStaticlib;./OpenCV/staticlib;D:\Personal\Documents\Gemalto\SuperDog 2.4\Samples\Licensing\C\x64\msc\lib;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\lib\msc;C:\Program Files\IVI Foundation\VISA\WinNT\lib\msc;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)2Cam</TargetName>
+    <TargetName>$(ProjectName)2Cam-Push</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp

@@ -690,13 +690,15 @@ bool CTrackWorkFlow::PushJigOut()
 	PlcCmd = _ETrack_PlcCmd_Push_Jig_Out;
 	SendMsgToPlc(PlcCmd, false);
 	m_bPushJigOut = false;
+
+	int CheckTimes = 450;
 	int cnt = 0;
-	while (cnt < 200 && (!m_bPushJigOut))
+	while (!m_bPushJigOut&&(cnt<CheckTimes))
 	{
-		Sleep(100);
+		Sleep(200);
 		cnt++;
 	}
-	if (cnt == 200)
+	if (cnt == CheckTimes)
 	{
 		gTrackWorkFlow1.RadAlamOnOff(true);
 		AfxMessageBox("推出治具超时!");
@@ -718,12 +720,12 @@ bool CTrackWorkFlow::IsJigOK()
 	m_bJigOK = false;
 	SendMsgToPlc(PlcCmd, false);
 	int cnt = 0;
-	while (cnt < 10 && (!m_bJigOK))
+	while (cnt < 20 && (!m_bJigOK))
 	{
-		Sleep(300);
+		Sleep(100);
 		cnt++;
 	}
-	if (cnt == 10)
+	if (cnt == 20)
 	{
 		gTrackWorkFlow1.RadAlamOnOff(true);
 		AfxMessageBox(m_TrackName + " 治具未到位!");