From f77e8008cac062596058fca2aeddda62b80bedbf Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 14 7월 2023 17:03:10 +0900
Subject: [PATCH] Merge branch 'feature/#4517_CF_AOI_Review_결과_파일_찾기_실패_개선' into develop
---
DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
index a43c626..766afaf 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.h
@@ -36,7 +36,11 @@
virtual BOOL SequenceFtpUpload(char* pRawFileName);
virtual void NotifyUpdateOptionInfo(){/*m_StackResult.readOptionFile();*/};
-
+ /* <LJC 20211122 : #3820 ADD Start> */
+ virtual void DownLoadMergeFile(CgrmGlassRawData* pData);
+ virtual void SearchFIle(CgrmGlassRawData* pData);
+ /* <LJC 20211122 : #3820 ADD End> */
+\
protected:
@@ -55,7 +59,10 @@
CString GetRawFilePath() { return m_strRawFilePath; }
void makeDataHeader(CString& strLine, _grmGlassData* pGlassData);
- void makeDataGlass(CString& strLine, _grmGlassData* pGlassData);
+ /*< KJG 20211229 - #3846 MOD Start >*/
+ //void makeDataGlass(CString& strLine, _grmGlassData* pGlassData);
+ void makeDataGlass(CString& strLine, CgrmGlassRawData* pData, _grmGlassData* pGlassData);
+ /*< KJG 20211229 - #3846 MOD End >*/
void makeDataCell(CString& strLine, CgrmGlassRawData* pData, _grmCellData* pCellData);
BOOL makeDataDefect(CString& strLine, CgrmGlassRawData* pData, _grmDefectData* pDefectData);
@@ -80,8 +87,10 @@
BOOL m_bReviewEndCheck; // InspectEnd 시에 Raw_im 폴더에 SubFile 생성 안하기 위해 사용 [ 21-03-18 KJG ]
CTime m_tmReviewStart;
CTime m_tmReviewEnd;
-
+ /* <LJC 20211122 : #3820 ADD Start> */
+ int m_nRawMergeIdx=0;
int m_nWriteRawDefectIdx;
+ /* <LJC 20211122 : #3820 ADD End> */
};
struct stCellData
--
Gitblit v1.9.3