From d00c7a1a2fb1f4179bf3280d5b66d6645ea2e744 Mon Sep 17 00:00:00 2001
From: kje97 <kje97@jionmeditech.com>
Date: Tue, 24 Jun 2025 17:38:28 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20txbNgCount=EA=B0=80=20=EC=A6=9D=EA=B0=80?=
 =?UTF-8?q?=ED=95=98=EB=8D=98=20=EB=A1=9C=EC=A7=81=EC=9D=84=20=EA=B0=90?=
 =?UTF-8?q?=EC=86=8C=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(?=
 =?UTF-8?q?=EB=B6=88=EB=9F=89=20=EC=88=98=EB=9F=89=20=EA=B0=90=EC=86=8C=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProductFunctionTester/Main_Form.vb | 56 +++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb
index 433525c..0fddab3 100644
--- a/ProductFunctionTester/Main_Form.vb
+++ b/ProductFunctionTester/Main_Form.vb
@@ -78,7 +78,7 @@ Public Class Main_Form
     Private StartSwitch As Boolean
 
     Private TDSNHead1 As String = "DIT"
-    Private TDSNHead2 As String = "J3"
+    Private TDSNHead2 As String = "J"
 
     Private Const TestType As String = "SET"
     Private Const TestModel As String = "MAXIMUM"
@@ -5260,6 +5260,29 @@ ProcessEnd:
         txbOkCount.Text = Val(txbOkCount.Text) + 1
     End Sub
 
+    'Private Sub RFReCount()
+    '    If dupDATA = 0 Then
+    '        txbDayCount.Text = Val(txbDayCount.Text) + 1
+    '        If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then
+    '            txbOkCount.Text = Val(txbOkCount.Text) + 1
+    '        Else
+    '            txbNgCount.Text = Val(txbNgCount.Text) + 1
+    '        End If
+    '    Else
+    '        If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+    '            If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
+    '                txbOkCount.Text = Val(txbOkCount.Text) + 1
+    '                txbNgCount.Text = Val(txbNgCount.Text) - 1
+    '            End If
+    '        Else
+    '            If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
+    '                txbOkCount.Text = Val(txbOkCount.Text) - 1
+    '                txbNgCount.Text = Val(txbNgCount.Text) + 1
+    '            End If
+    '        End If
+    '    End If
+    'End Sub
+
     Private Sub RFReCount()
         If dupDATA = 0 Then
             txbDayCount.Text = Val(txbDayCount.Text) + 1
@@ -5269,15 +5292,32 @@ ProcessEnd:
                 txbNgCount.Text = Val(txbNgCount.Text) + 1
             End If
         Else
-            If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
-                If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
-                    txbOkCount.Text = Val(txbOkCount.Text) + 1
-                    txbNgCount.Text = Val(txbNgCount.Text) - 1
+            ' formType에 따라 다른 로직 적용
+            If formType = formTypeList.altoPD Then
+                ' Alto PD의 경우 Alto 관련 TestStep 사용
+                If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+                    If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then
+                        txbOkCount.Text = Val(txbOkCount.Text) + 1
+                        txbNgCount.Text = Val(txbNgCount.Text) - 1
+                    End If
+                Else
+                    If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
+                        txbOkCount.Text = Val(txbOkCount.Text) - 1
+                        txbNgCount.Text = Val(txbNgCount.Text) + 1
+                    End If
                 End If
             Else
-                If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then
-                    txbOkCount.Text = Val(txbOkCount.Text) - 1
-                    txbNgCount.Text = Val(txbNgCount.Text) + 1
+                ' 일반 RF의 경우 RF 관련 TestStep 사용
+                If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail Then
+                    If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then
+                        txbOkCount.Text = Val(txbOkCount.Text) + 1
+                        txbNgCount.Text = Val(txbNgCount.Text) - 1
+                    End If
+                Else
+                    If processNum = TestStepList.Rf_NewFail Or processNum = TestStepList.RF_ReFail Then
+                        txbOkCount.Text = Val(txbOkCount.Text) - 1
+                        txbNgCount.Text = Val(txbNgCount.Text) + 1
+                    End If
                 End If
             End If
         End If