Revert "Ongoing50 #4517 CF AOI Review 결과 파일 찾기 실패 개선"

kojingeun

2023-06-07 b4a18bfef6cb9f5d48a12b455dfa78f9ef67e348

 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp

@@ -168,6 +168,7 @@
   m_nGlassCount = 0;
   m_nStackZeroReviewCondition = 0;
   m_nUploadResultFailCount = 0;
   m_nStackUploadFailGlassCount = 0;
   CDitGlassRawClient* pDitGlassRaw = CDitGlassRawClient::GetInstance();
   if(pDitGlassRaw->ConnectServer() == FALSE)
   {
@@ -549,10 +550,16 @@
      m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!"));
   }

   AlignCamera_CameraControl(CameraControlStop);  // 210805 Align Camera Sequence 변경

   /*< SWK 20221226 - #4403 MOD Start >*/
//    AlignCamera_CameraControl(CameraControlStop);  // 210805 Align Camera Sequence 변경
// 
//    SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
//    m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));
   SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT);
   m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!"));

   AlignCamera_CameraControl(CameraControlStop);
   /*< SWK 20221226 - #4403 MOD End >*/

   // LJY-20180905
   m_pSP2P->ISP2P_UpdateAlignResultStatus(0, pGlassResult);
@@ -945,7 +952,7 @@
   SetLastPointCheck(FALSE);

   SetReviewComplete(FALSE);
   SetUploadResultFailCount(0);
   //SetUploadResultFailCount(0);

   bFileFind = FALSE;

@@ -1069,7 +1076,6 @@
         // #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;
         CString strGlassStepIdTemp = NULL;
@@ -1077,7 +1083,6 @@

         strGlassIDTemp = pTransferData->strGlassID;
         strGlassStepIdTemp = pTransferData->strStepID;
			

         strGlassIDTemp = pTransferData->strGlassID;
         strcpy(pDitRawClient->GetGlassData()->m_strGlassID, strGlassIDTemp);
@@ -1102,7 +1107,8 @@
         /*bFileFind = FindRawBinFile(strFileName);*/

         pDitRawClient->SetReviewStart();
         Sleep(1000);
         //< SWK 20221226 - #4403 DEL >
//         Sleep(1000);

          m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Transfer Data Read Success!"));
 
@@ -1319,7 +1325,8 @@
   }
   //#3561 210908 LYW ADD End

   Sleep(300);
   //< SWK 20221226 - #4403 MOD >
   Sleep(100);

   //original
//    if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT))
@@ -1441,7 +1448,9 @@
   
   //pDitRawClient->SetReviewStart();

   Sleep(500);
   //< SWK 20221226 - #4403 DEL >
//   Sleep(500);

   //CString strJudgeData;
   m_pSP2P->ISP2P_GetSignalControl()->WriteData(_T("17110"), sizeof(pDitRawClient->GetGlassData()->m_strGlassJudge), pDitRawClient->GetGlassData()->m_strGlassJudge);
   m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] ReadRawFile!"));
@@ -1502,7 +1511,8 @@
      int nTotalPlanCount = CalculatePlanData(pGlassResult);
      m_pSP2P->ISP2P_DisplayMessage(_T("[Read Raw File] Review All Plan Total Count : %d"), nTotalPlanCount);

      Sleep(1000);
      //< SWK 20221226 - #4403 DEL >
//      Sleep(1000);
      // send review ready
      //#3584 210817 LYW CF AOI Review 시뮬레이션 기능 정상화 MOD START
      if (GetSimulationMode() == FALSE)
@@ -1707,6 +1717,8 @@
         m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] Send Review End Ack!"));
   }

   SetUploadResultFailCount(0);

   CGlassResult* pGlassResult = m_pSP2P->ISP2P_GetCurrentGlassResult();
   if (pGlassResult == NULL) return;

@@ -1807,6 +1819,7 @@
      if (pTransferData->strProdType != m_pSP2P->ISP2P_System_GetNetworkInfo()->m_strZeroReviewAlarmExcept)
      {
         m_nStackZeroReviewCondition++;
         m_pSP2P->ISP2P_DisplayMessage(_T("Zero Review Condition ProdType = %s, ConditionStack = %d, AlarmExcept = %s, AlarmCondition = %d"), pTransferData->strProdType, m_nStackZeroReviewCondition, m_pSP2P->ISP2P_System_GetNetworkInfo()->m_strZeroReviewAlarmExcept, m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nZeroReviewAlarm);
         if (m_nStackZeroReviewCondition >= m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nZeroReviewAlarm)
         {
            m_pSP2P->ISP2P_DisplayMessage(_T("Zero Review Alarm! %d ea Glass Is Zero Review!"), m_nStackZeroReviewCondition);
@@ -3672,7 +3685,9 @@
         tmServerLoadingTime = CTime::GetCurrentTime();
         m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] access Shared Memory Fail"));
         strPath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), pNetworkInfo->m_strUploadImagePath, strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
         strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
         //< SWK 20221226 - #4403 MOD >
//         strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
         strImagePath.Format(_T("%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond());
         CreateDirectory(strPath, NULL);
         pReviewProcessor->SetUploadImagePath(strPath);
         pReviewProcessor->SetReviewImagePath(strImagePath);
@@ -8392,13 +8407,29 @@
   if (UploadResult == FALSE)
   {
      UploadResultFailCount++;
      if (UploadResultFailCount >= 2)
      m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is False"));
      if (UploadResultFailCount >= 3)
      {
         m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail!"));
         SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
         //SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
         m_nStackUploadFailGlassCount++;
         m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Glass Count = %d"),m_nStackUploadFailGlassCount);
         if (m_nStackUploadFailGlassCount >= m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nResultFileUploadFailAlarmCondition)
         {
            SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
            m_nStackUploadFailGlassCount = 0;
            m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Alarm!"));
         }
         SetUploadResultFailCount(-1);
      }
      SetUploadResultFailCount(UploadResultFailCount);
      else
      {
         SetUploadResultFailCount(UploadResultFailCount);
      }
   }
   else
   {
      m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is True"));
      m_nStackUploadFailGlassCount = 0;
   }
}