From 5f12658f37fed156e67b3318542c98f359341ffd Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 05 8월 2022 17:24:00 +0900
Subject: [PATCH] 업로드 실패알람 조건 변경

---
 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index 267abef..3638823 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/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)
 	{
@@ -945,7 +946,7 @@
 	SetLastPointCheck(FALSE);
 
 	SetReviewComplete(FALSE);
-	SetUploadResultFailCount(0);
+	//SetUploadResultFailCount(0);
 
 	bFileFind = FALSE;
 
@@ -1707,6 +1708,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 +1810,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);
@@ -8392,13 +8396,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;
 	}
 }
 

--
Gitblit v1.9.3