From 630eb072cca33a7c633f6429a0b5a531d1b83268 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 08 7월 2021 17:09:08 +0900
Subject: [PATCH] Revert "Ongoing60 #3486CF AOI Review Review History 프로그램 테스트 및 적용"
---
ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditorDlg.cpp | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditorDlg.cpp b/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditorDlg.cpp
index cf6d45e..b8f0898 100644
--- a/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditorDlg.cpp
+++ b/ReviewSystem/ReviewRecipeEditor/ReviewRecipeEditorDlg.cpp
@@ -305,6 +305,19 @@
}
else
{
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD START
+ CString strBackupPath = _REVIEW_RECIPE_BACKUP_PATH_CPJT;
+ CreateDirectory(strBackupPath, NULL);
+
+ // set backup file
+ CString strBackupFile = _T("");
+ CString strSource, strDest;
+
+ strSource.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, strNewRecipeName);
+ strDest.Format(_T("%s\\%s.rcp"), strBackupPath, strNewRecipeName);
+ CopyFile(strSource, strDest, TRUE);
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD END
+
// [2017:4:17]-[WEZASW] : CIM(Recipe) 보고 항목 추가.
COPYDATA_RECIPE2REV copyData;
copyData.Message = MsgRecipe2Rev_RecipeCreate;
@@ -360,11 +373,11 @@
CString strRecipeName, strPath, strMessage, strTemp;
CCellID cellID = m_ctrlGridRecipeList.GetFocusCell();
- if(cellID.row > 0 && cellID.col > 0)
+ if (cellID.row > 0 && cellID.col > 0)
{
strRecipeName = m_ctrlGridRecipeList.GetItemText(cellID.row, 1);
- if(m_bReviewSystemPC)
+ if (m_bReviewSystemPC)
{
strPath.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, strRecipeName);
}
@@ -373,7 +386,7 @@
strTemp.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, strRecipeName);
nIdx = strTemp.Find(_T("\\"));
- if(nIdx != -1)
+ if (nIdx != -1)
{
strTemp = strTemp.Mid(nIdx + 1);
strPath.Format(_T("\\\\%s\\C\\%s"), NETIP_A2E_REVIEW_SYSTEM, strTemp);
@@ -398,6 +411,14 @@
}
DeleteFile(strPath);
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD START
+ CString strBackupPath = _REVIEW_RECIPE_BACKUP_PATH_CPJT;
+ CString strDest;
+
+ strDest.Format(_T("%s\\%s.rcp"), strBackupPath, strRecipeName);
+ DeleteFile(strDest);
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD END
+
// [2017:4:17]-[WEZASW] : CIM(Recipe) 보고 항목 추가.
COPYDATA_RECIPE2REV copyData;
@@ -482,7 +503,7 @@
{
CString strMessage;
- if(RecipeName.IsEmpty())
+ if (RecipeName.IsEmpty())
{
AfxMessageBox(_T("Seleted recipe is not exist."));
}
@@ -494,7 +515,7 @@
bRet = SaveRecipeFile(RecipeName);
- if(bRet)
+ if (bRet)
{
// [2017:4:17]-[WEZASW] : CIM(Recipe) 보고 항목 추가.
COPYDATA_RECIPE2REV copyData;
@@ -516,8 +537,17 @@
// strBackupFile = strBackupPath + m_strCurrentRecipeName + strBackupFile;
CString strSource, strDest;
strSource.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, RecipeName);
- strDest.Format(_T("%s\\%s_%s.rcp"),strBackupPath, RecipeName, strBackupFile );
+ strDest.Format(_T("%s\\%s_%s.rcp"), strBackupPath, RecipeName, strBackupFile);
CopyFile(strSource, strDest, TRUE);
+
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD START
+ strBackupPath = _REVIEW_RECIPE_BACKUP_PATH_CPJT;
+ CreateDirectory(strBackupPath, NULL);
+
+ strSource.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, RecipeName);
+ strDest.Format(_T("%s\\%s.rcp"), strBackupPath, RecipeName);
+ CopyFile(strSource, strDest, TRUE);
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD END
strMessage.Format(_T("Complete to save %s recipe!"), RecipeName);
//AfxMessageBox(strMessage);
@@ -540,7 +570,7 @@
// TODO: 여기에 컨트롤 알림 처리기 코드를 추가합니다.
CString strMessage;
- if(m_strCurrentRecipeName.IsEmpty())
+ if (m_strCurrentRecipeName.IsEmpty())
{
AfxMessageBox(_T("Seleted recipe is not exist."));
}
@@ -552,7 +582,7 @@
bRet = SaveRecipeFile(m_strCurrentRecipeName);
- if(bRet)
+ if (bRet)
{
// [2017:4:17]-[WEZASW] : CIM(Recipe) 보고 항목 추가.
COPYDATA_RECIPE2REV copyData;
@@ -574,8 +604,17 @@
// strBackupFile = strBackupPath + m_strCurrentRecipeName + strBackupFile;
CString strSource, strDest;
strSource.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, m_strCurrentRecipeName);
- strDest.Format(_T("%s\\%s_%s.rcp"),strBackupPath, m_strCurrentRecipeName, strBackupFile );
+ strDest.Format(_T("%s\\%s_%s.rcp"), strBackupPath, m_strCurrentRecipeName, strBackupFile);
CopyFile(strSource, strDest, TRUE);
+
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD START
+ strBackupPath = _REVIEW_RECIPE_BACKUP_PATH_CPJT;
+ CreateDirectory(strBackupPath, NULL);
+
+ strSource.Format(_T("%s\\%s.rcp"), _REVIEW_RECIPE_PATH_, m_strCurrentRecipeName);
+ strDest.Format(_T("%s\\%s.rcp"), strBackupPath, m_strCurrentRecipeName);
+ CopyFile(strSource, strDest, FALSE);
+ //LYW_#3344_CF AOI Review Config File 백업 기능 개선 ADD END
strMessage.Format(_T("Complete to save %s recipe!"), m_strCurrentRecipeName);
AfxMessageBox(strMessage);
@@ -589,7 +628,7 @@
RefreshRecipeList();
}
-
+
CRMMInfoWriter rmmInfoWriter;
int nMachineType = m_pDlgReviewFilter->GetMachineType();
if (rmmInfoWriter.WriteRmm(nMachineType) == FALSE)
@@ -597,7 +636,7 @@
strMessage.Format(_T("Fail to save RMM INFO!"));
AfxMessageBox(strMessage);
}
-
+
}
void CReviewRecipeEditorDlg::OnBnClickedButtonReviewrcpEditorExit()
--
Gitblit v1.9.3