From b3bcb467a943ff5440d9953eeab9d3dd018ba0ca Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 수, 16 6월 2021 17:26:40 +0900
Subject: [PATCH] Ongoing80 #3428 CF AOI Review Recipe Editor 리뷰 우선순위 조건 타입 변경기능 적용 및 검증 - 우선 순위 조건 Defect Type -> Defecct Code 변경 - Defect Code 고정 -> 텍스트로 설정 - 텍스트를 비워두거나 ALL, all을 입력시 모든 Defect코드에 대하여 우선순위 정렬

---
 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 14ac4c3..9993875 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -964,7 +964,7 @@
 	//	m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Revolver Set GoHome Success!"));
 	//}
 
-	//210330 kyh Align Image 초기화
+	//#3357 KYH Align Image 초기화 ADD START
 	CCameraControlAlign* pAlignCameraControl = m_pSP2P->ISP2P_GetAlignCameraControl();
 	if (pAlignCameraControl != NULL)
 	{
@@ -972,6 +972,7 @@
 
 		g_pLog->DisplayMessage(_T("[Align] Align Image Clear"));
 	}
+	//#3357 KYH Align Image 초기화 ADD END
 
  	// get transfer data
  	int nResultCode = 0;
@@ -1026,6 +1027,10 @@
 				
 
 			}
+
+			// #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD START
+			pDitRawClient->GetGlassData()->m_tmReviewLoading = CTime::GetCurrentTime();
+			// #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD END
 			
 
 			CString strGlassIDTemp = NULL;
@@ -1042,8 +1047,9 @@
 			m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] Send Loading Success Signal!"));
 
 			strFileName.Format(_T("%s_%s"), strGlassIDTemp, strGlassStepIdTemp);
-			bFileFind = FindRawBinFile(strFileName);
-			//bFileFind = TRUE;
+			//업데이트시
+			//bFileFind = FindRawBinFile(strFileName);
+			bFileFind = TRUE;
 
 			pDitRawClient->SetReviewStart();
 			Sleep(1000);
@@ -4494,7 +4500,7 @@
 
 	SetWsiType(0);
 	WSIAllReadySignal(1);
-	Sleep(500);
+	Sleep(1000);
 	if(!WSIAllStartSignal())
 	{
 		g_pLog->DisplayMessage(_T("[WSI] WSI Start Fail!!"));
@@ -4690,7 +4696,7 @@
 			//3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error 알람 발생 원인 분석 및 조치 START
 			g_pLog->DisplayMessage(_T("[GantryAutoGo] No Exist Send Point,TwoGantrySyncMode OFF!"), vectorPosX.size());
 			g_pLog->DisplayMessage(_T("[GantryAutoGo] (%d)Gantry Path Send Fail"), pModuleStatus->GetGantryIndex()); //taek 210128
-			pMotorControl->GantrySetTwoGantrySyncModeSend(1);
+			pMotorControl->GantrySetTwoGantrySyncModeSend(0);
 			//3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error 알람 발생 원인 분석 및 조치 END
 		}
 		else
@@ -7727,7 +7733,8 @@
 	pSignalControl->WritePacketData(_T("15100"), sizeof(DVDataPack_CPJT), (short*)&DVData);*/
 }
 
-void CSequenceProcessor_CPJT::MakeDVData2() //210325 kyh FDC 
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD START
+void CSequenceProcessor_CPJT::MakeDVData2()
 {
 
 	const CRsRcpReviewInfo* pRsRcpReviewInfo = m_pSP2P->ISP2P_Recipe_GetRsRcpReviewInfo();
@@ -7981,8 +7988,6 @@
 	pSignalControl->WritePacketData(_T("16128"), sizeof(nWSI1_PC_HDD_CHECK), (short*)&nWSI1_PC_HDD_CHECK);
 	pSignalControl->WritePacketData(_T("16132"), sizeof(nWSI2_PC_HDD_CHECK), (short*)&nWSI2_PC_HDD_CHECK);
 
-
-
 	pSignalControl->WritePacketData(_T("16136"), sizeof(nReviewVersion), (short*)&nReviewVersion);
 	pSignalControl->WritePacketData(_T("16140"), sizeof(nWSI00Version), (short*)&nWSI00Version);
 	pSignalControl->WritePacketData(_T("16144"), sizeof(nWSI01Version), (short*)&nWSI01Version);
@@ -7990,6 +7995,7 @@
 
 	return;
 }
+//#3358 KYH FDC 데이터 전송 시점 개선 ADD END
 
 DWORD CSequenceProcessor_CPJT::GetDiskUsage()
 {

--
Gitblit v1.9.3