From a6552335164ce062567b76aa7d097fd046129474 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 23 7월 2021 10:07:55 +0900
Subject: [PATCH] Ongoing90 #3517 CF AOI Review 자가진단 기능 개선
---
DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp | 77 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 32 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
index 4b6b6bb..5033f78 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
@@ -78,7 +78,11 @@
m_StackResult.StackFileReadStart(pData->GetGlassData()->m_strGlassID);
}
-
+ if (m_RawMergeResult.getRawMergeUse())
+ {
+ SendMessageFTPDownloadDataFile(pData->GetGlassData());
+ m_RawMergeResult.RawMergeFileReadStart(pData->GetGlassData()->m_strGlassID);
+ }
return TRUE;
}
@@ -121,7 +125,13 @@
_TimeDelay(5000); // �씠誘몄� 蹂듭궗 �떆媛� ��湲�
//210218 CJH - 寃��궗 醫낅즺�떆 寃곌낵�뙆�씪 諛� CCD Image �뾽濡쒕뱶
SendMessageFTPUploadRaw(pData->GetGlassData());
- SendMessageFTPUploadImage(pData->GetGlassData(), FTPCMD_AOI_IMAGE);
+
+ BOOL bIsBDI = strcmp((pData->GetGlassData()->m_strLine), _T("BDI")) == 0 ? TRUE : FALSE;
+ if (bIsBDI)
+ {
+ SendMessageFTPUploadImage(pData->GetGlassData(), FTPCMD_AOI_IMAGE);
+ }
+
SendMessageFTPUploadImage(pData->GetGlassData(), FTPCMD_MURA_IMAGE);//0405nwh
return TRUE;
@@ -1800,23 +1810,18 @@
void CGlassRawCPJT::SendMessageFTPDownloadDataFile( _grmGlassData* pGlassData )
{
if(pGlassData == NULL) return;
- HWND hWnd = ::FindWindow(NULL, "FTPDownloader");
+ HWND hWnd = ::FindWindow(NULL, "FTPUploader");
if(hWnd == NULL) return;
char strServerFolder[256] = {};
char strServerFile[256] = {};
char strLocalFolder[256] = {};
- char pLocalFile[256] = {};
+ char pLocalFile[256] = {};
+ char strRTMSFile[32] = {};
+ char strServerRawFileSubPath[256] = {};
+ char strServer_SubFileName[256] = {};
- //GetFormatDescription(FTPCMD_DATAFILE, strServerFolder, strServerFile, strLocalFolder, pLocalFile, pGlassData);
- {
- CString strGlassIDOrg = pGlassData->m_strGlassID;
- CString strGlassID = strGlassIDOrg.Left(12);
- sprintf(strServerFolder, "%s", pGlassData->m_strCassetteSequenceNo);
- sprintf(strServerFile, "%s.dat", strGlassID.GetBuffer(0));
- sprintf(strLocalFolder, "D:\\DIT_ResultData\\DownloadData");
- sprintf(pLocalFile, "%s.dat", strGlassID.GetBuffer(0));
- }
+ GetFormatDescription(FTPCMD_RAWMERGE, strServerFolder, strServerFile, strLocalFolder, pLocalFile, strRTMSFile, strServerRawFileSubPath, strServer_SubFileName, pGlassData);
CFTPCopyDataParam upParam;
strcpy(upParam.m_strServer_FolderName, strServerFolder);
@@ -1829,7 +1834,7 @@
upParam.m_nSendResultCode = FALSE;//m_ctrlResultAck.GetCheck();
upParam.m_nProcessType = CFTPCopyDataParam::FTPProcessType_DownFile;
// [C-PRJ] Image Upload Define - KHT (2020/11/19)
- upParam.m_nDataType = CFTPCopyDataParam::FTPDataType_Unknown;
+ upParam.m_nDataType = CFTPCopyDataParam::FTPDataType_Raw;
COPYDATASTRUCT cds;
cds.dwData = CFTPCopyDataParam::FTPCopyDataCmd_RawDownload;
@@ -1971,7 +1976,7 @@
else
sprintf(pServerPath, "\\%s\\%s\\%s\\", strProcessID, strStepID, strGlassIDLevel6th);
- sprintf(pLocalPath, "%s%s", LOCAL_AOI_IMAGE_PATH, strGlassID.GetBuffer(0));
+ sprintf(pLocalPath, "%s%s", NETWORK_AOI_IMAGE_PATH, strGlassID.GetBuffer(0));
strcpy(pServerFile, "*.*");
strcpy(pLocalFile, "*.*");
}
@@ -2129,23 +2134,31 @@
sprintf(pLocalFile, "%s", strGlassID.GetBuffer(0));
}
break;
-
- case FTPCMD_MURA_IMAGE: //0404nwh
- { //
- /*CTime time = m_tmFileCreateTime;
- sprintf(pServerPath, "%s\\%04d%02d%02d\\%s\\%s\\%s\\Image", pGlassData->m_strEquipID, time.GetYear(), time.GetMonth(), time.GetDay(),
- strGlassIDLevel5th.GetBuffer(0),
- strGlassIDLevel8th.GetBuffer(0),
- strGlassID.GetBuffer(0));
-
- sprintf(pLocalPath, "%s%s", LOCAL_MURA_IMAGE_PATH, strGlassID.GetBuffer(0));
- strcpy(pServerFile, "*.*");
- strcpy(pLocalFile, "*.*");*/
-
- if (strGlassID.GetLength() > 6)
- sprintf(pServerPath, "\\%s\\%s\\%s\\%s\\", strProcessID, strStepID, strGlassIDLevel6th, strGlassID);
- else
- sprintf(pServerPath, "\\%s\\%s\\%s\\", strProcessID, strStepID, strGlassIDLevel6th);
+ case FTPCMD_RAWMERGE:
+ {
+ sprintf(pServerPath, "\\%s\\%s\\%s", strProcessID, strStepID,strGlassIDLevel6th.GetBuffer(0)); // �꽌踰� 寃쎈줈 �솗�씤�썑 �닔�젙 kjg
+ sprintf(pServerFile, "%s",strGlassID);
+
+ sprintf(pLocalPath, "%s", m_RawMergeResult.getRawMergeLocalPath());
+ sprintf(pLocalFile, "%s", strGlassID.GetBuffer(0));
+ }
+ break;
+ case FTPCMD_MURA_IMAGE: //0404nwh
+ { //
+ /*CTime time = m_tmFileCreateTime;
+ sprintf(pServerPath, "%s\\%04d%02d%02d\\%s\\%s\\%s\\Image", pGlassData->m_strEquipID, time.GetYear(), time.GetMonth(), time.GetDay(),
+ strGlassIDLevel5th.GetBuffer(0),
+ strGlassIDLevel8th.GetBuffer(0),
+ strGlassID.GetBuffer(0));
+
+ sprintf(pLocalPath, "%s%s", LOCAL_MURA_IMAGE_PATH, strGlassID.GetBuffer(0));
+ strcpy(pServerFile, "*.*");
+ strcpy(pLocalFile, "*.*");*/
+
+ if (strGlassID.GetLength() > 6)
+ sprintf(pServerPath, "\\%s\\%s\\%s\\%s\\", strProcessID, strStepID, strGlassIDLevel6th, strGlassID);
+ else
+ sprintf(pServerPath, "\\%s\\%s\\%s\\", strProcessID, strStepID, strGlassIDLevel6th);
sprintf(pLocalPath, "%s%s", LOCAL_MURA_IMAGE_PATH, strGlassID.GetBuffer(0));
strcpy(pServerFile, "*.*");
--
Gitblit v1.9.3