From cc12d34496dc22aed4fb95cd3b838066fc56e691 Mon Sep 17 00:00:00 2001 From: kje97 Date: Wed, 2 Jul 2025 11:46:12 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Rf=5FNewFail,Rf=5FReSuc=20=E2=86=92?= =?UTF-8?q?=20RF=5FNewFail,=20RF=5FReSuc=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductFunctionTester/Main_Form.vb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index accdb84..e446448 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -199,10 +199,10 @@ Public Class Main_Form HF_NewSuc = 21 HF_NEWFail RF_NewSuc - Rf_NewFail + RF_NewFail HF_ReSuc HF_ReFail - Rf_ReSuc + RF_ReSuc RF_ReFail End Enum Private processNum As Int16 @@ -1908,6 +1908,7 @@ Public Class Main_Form For i = 0 To tableName.Length - 1 DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()" + Dim DupYn As Int16 = DBQueryScalar(DBCmd) If DupYn > 0 Then @@ -5365,19 +5366,19 @@ ProcessEnd: Private Sub RFReCount() If dupDATA = 0 Then txbDayCount.Text = Val(txbDayCount.Text) + 1 - If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then + 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.RF_NewSuc Or processNum = TestStepList.Rf_ReSuc Then + 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 + 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 @@ -5767,14 +5768,14 @@ dbFail: If TestError = False Then processNum = TestStepList.RF_ReFail Else - processNum = TestStepList.Rf_ReSuc + processNum = TestStepList.RF_ReSuc End If Else DBCmd = "INSERT INTO " & rfTableNow & "(PV_SN,TestDate,TestTime,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq,MC_R1Wave,MC_R1Vpp,MC_R1Freq,MC_R2Wave,MC_R2Vpp,MC_R2Freq,EP_R1Vpp,EP_R1Freq,EP_R1PWidth,EP_R1NWidth,EP_R2Vpp,EP_R2Freq,EP_R2PWidth,EP_R2NWidth,EP_R3Vpp,EP_R3Freq,EP_R3PWidth,EP_R3NWidth) VALUE ('" & TestData.Test_Serial & "','" & NowDate & "','" & NowTime & "','" & TestData.Test_RFVRMS(0) & "','" & TestData.Test_RFFreq(0) & "','" & TestData.Test_RFVRMS(1) & "','" & TestData.Test_RFFreq(1) & "','" & TestData.Test_RFVRMS(2) & "','" & TestData.Test_RFFreq(2) & "','" & TestData.Test_MCWidth(0) & "','" & TestData.Test_MCVpp(0) & "','" & TestData.Test_MCFreq(0) & "','" & TestData.Test_MCWidth(1) & "','" & TestData.Test_MCVpp(1) & "','" & TestData.Test_MCFreq(1) & "','" & TestData.Test_EPVpp(0) & "','" & TestData.Test_EPFreq(0) & "','" & TestData.Test_EPPWidth(0) & "','" & TestData.Test_EPNWidth(0) & "','" & TestData.Test_EPVpp(1) & "','" & TestData.Test_EPFreq(1) & "','" & TestData.Test_EPPWidth(1) & "','" & TestData.Test_EPNWidth(1) & "','" & TestData.Test_EPVpp(2) & "','" & TestData.Test_EPFreq(2) & "','" & TestData.Test_EPPWidth(2) & "','" & TestData.Test_EPNWidth(2) & "')" If TestError = False Then - processNum = TestStepList.Rf_NewFail + processNum = TestStepList.RF_NewFail Else processNum = TestStepList.RF_NewSuc End If