From b4a18bfef6cb9f5d48a12b455dfa78f9ef67e348 Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 수, 07 6월 2023 10:29:07 +0900
Subject: [PATCH] Revert "Ongoing50 #4517 CF AOI Review 결과 파일 찾기 실패 개선"

---
 ReviewSystem/ReviewSystem/MainFrm.cpp |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/MainFrm.cpp b/ReviewSystem/ReviewSystem/MainFrm.cpp
index 62cab8a..5021d3a 100644
--- a/ReviewSystem/ReviewSystem/MainFrm.cpp
+++ b/ReviewSystem/ReviewSystem/MainFrm.cpp
@@ -41,6 +41,8 @@
 	ID_INDICATOR_SCRL,
 };
 
+// �젙�쓽 
+
 // CMainFrame �깮�꽦/�냼硫�
 
 CMainFrame::CMainFrame()
@@ -68,13 +70,18 @@
 	if (CFrameWndEx::OnCreate(lpCreateStruct) == -1)
 		return -1;
 
+	SetUnhandledExceptionFilter(TopLevelExceptionFilterCallBack);
+
 	ModifyStyle(WS_CAPTION, NULL);
 
 	SetMenu(NULL);
 
 	//SetTimer(ID_TIMER_RESET_COMM, 2000, NULL);
 
-	SetTimer(ID_TIMER_ALIVE, 1813, NULL); //->> 湲곗〈 SetTimer(ID_TIMER_ALIVE, 1000, NULL); 
+	/*< SWK 20221221 - #4403 MOD Start >*/
+//	SetTimer(ID_TIMER_ALIVE, 1813, NULL); //->> 湲곗〈 SetTimer(ID_TIMER_ALIVE, 1000, NULL); 
+	SetTimer(ID_TIMER_ALIVE, 2000, NULL);
+	/*< SWK 20221221 - #4403 MOD End >*/
 
 	//SetTimer(ID_TIMER_AFM_ALIVE, 5000, NULL);
 
@@ -84,11 +91,14 @@
 
 	SetTimer(ID_TIMER_SEND_SIGNAL_ALIVE, 100, NULL);
 
-	system("net use Y: \\\\126.100.100.1\\d\\DIT_ResultData pw:dit/user:Server/persistent:yes");
-
 	//LYW Align Reconnect
 	//�뾽�뜲�씠�듃�떆
-	system("netsh interface set interface name = \"Align #1\" admin = disable&& netsh interface set interface name = \"Align #1\" admin = enable&& netsh interface set interface name = \"Align #2\" admin = disable&& netsh interface set interface name = \"Align #2\" admin = enable");
+	system("netsh interface set interface name = \"Align #1\" admin = disable"
+		"&& netsh interface set interface name = \"Align #1\" admin = enable"
+		"&& netsh interface set interface name = \"Align #2\" admin = disable"
+		"&& netsh interface set interface name = \"Align #2\" admin = enable"
+		"&& net use Y : \\\\126.100.100.1\\d\\DIT_ResultData pw : dit / user : Server / persistent : yes");
+
 	Sleep(2000);
 
 //	SetTimer(ID_TIMER_WSI_LONGRUN_TEST_TIME, 10000, NULL);
@@ -447,9 +457,9 @@
 #define strScript "RESTART^AFControl.exe^C:\\AFControl\\program\\AFControl.exe"
 	
 	CFile file;
-	if( FALSE == file.Open(_T("C:\\DIT_Review\\MakeScript.TSF"),CFile::modeCreate | CFile::modeWrite) )
+	if( FALSE == file.Open(_T("D:\\DIT_Review\\MakeScript.TSF"),CFile::modeCreate | CFile::modeWrite) ) //210805
 	{
-		g_pLog->DisplayMessage(_T("File[C:\\DIT_Review\\MakeScript.TSF] Create Fail!!"));
+		g_pLog->DisplayMessage(_T("File[D:\\DIT_Review\\MakeScript.TSF] Create Fail!!")); //210805
 		return;
 	}
 
@@ -481,7 +491,7 @@
 	CString strTarget;
 	strTarget.Format(_T("\\\\126.100.100.220\\c\\RemoteTaskMgr\\T\\CopyScript.TSF"));
 	
-	BOOL bRet = CopyFile(_T("C:\\DIT_Review\\MakeScript.TSF"),strTarget,FALSE);
+	BOOL bRet = CopyFile(_T("D:\\DIT_Review\\MakeScript.TSF"),strTarget,FALSE); //210805
 	if(bRet == FALSE)
 		g_pLog->DisplayMessage(_T("[%s]Send Script Fail!"), strTarget);
 	/////////////////////////////////////
@@ -614,12 +624,10 @@
 void CMainFrame::OnClose()
 {
 	// TODO: �뿬湲곗뿉 硫붿떆吏� 泥섎━湲� 肄붾뱶瑜� 異붽� 諛�/�삉�뒗 湲곕낯媛믪쓣 �샇異쒗빀�땲�떎.
-	if (IDNO == AfxMessageBox(_T("Exit Review System?"), MB_YESNO | MB_ICONQUESTION))
+	if (IDNO == AfxMessageBox(_T("�봽濡쒓렇�옩 醫낅즺�떆 \nCIM OFFLINE \n�꽕鍮� 留ㅻ돱�뼹 紐⑤뱶\n�긽�깭瑜� 癒쇱� �솗�씤�빐 二쇱떗�떆�삤.\n�젙留� 醫낅즺 �븯�떆寃좎뒿�땲源�?"), MB_YESNO | MB_ICONQUESTION))
 	{
 		return;
 	}
-
-	g_pLog->DisplayMessage(_T("Program exit by User!"));
 
 	DeinitReviewInterface();
 
@@ -854,6 +862,24 @@
 
 	switch(pCopyDataStruct->dwData)
 	{
+	case COPYDATA_RAW_DOWNLOAD_ACK:
+	case COPYDATA_RAW_UPLOAD_ACK:
+	case COPYDATA_LOT_UPLOAD_ACK:
+	case COPYDATA_IMAGE_UPLOAD_ACK:
+	{
+		CFTPCopyDataParam ftpCopyDataParam;
+
+		ftpCopyDataParam = *(static_cast<CFTPCopyDataParam*>(pCopyDataStruct->lpData));
+		if (ftpCopyDataParam.m_nSendResultCode == FALSE)
+		{
+			CMainFrame* pMain = static_cast<CMainFrame*>(AfxGetMainWnd());
+			CSequenceProcessor* pSequenceProcessor = pMain->IRP2P_GetSequenceProcessor();
+			if (pSequenceProcessor == NULL)	return FALSE;
+			pSequenceProcessor->sendUploadResult2SequenceProcessor(ftpCopyDataParam.m_nSendResultCode);
+		}
+		
+	}
+	break;
 	case COPYDATA_SYSTEMSETTING2REVIEWSYSTEM:
 		{
 			COPYDATA_SYSTEM2REV* pCopyData = (COPYDATA_SYSTEM2REV*)pCopyDataStruct->lpData;
@@ -881,6 +907,14 @@
 			if (pCopyData) OnCopyDataAoiServer(pCopyData);
 		}
 		break;
+
+	case COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM:
+	{
+		DlgReviewOffSetTool* pReviewOffSetTool = m_pView->GetReviewOffSetToolHandle();
+		pReviewOffSetTool->PostMessage(WM_OFFSETTOOL_MESSAGE, 0, 200);
+
+	}
+	break;
 	}
 
 	return __super::OnCopyData(pWnd, pCopyDataStruct);
@@ -940,4 +974,5 @@
 		return TRUE;
 	}
 	return FALSE;
-}
\ No newline at end of file
+}
+

--
Gitblit v1.9.3