refactor: Rf_NewFail,Rf_ReSuc → RF_NewFail, RF_ReSuc로 수정
This commit is contained in:
parent
6e22d37b85
commit
cc12d34496
@ -199,10 +199,10 @@ Public Class Main_Form
|
|||||||
HF_NewSuc = 21
|
HF_NewSuc = 21
|
||||||
HF_NEWFail
|
HF_NEWFail
|
||||||
RF_NewSuc
|
RF_NewSuc
|
||||||
Rf_NewFail
|
RF_NewFail
|
||||||
HF_ReSuc
|
HF_ReSuc
|
||||||
HF_ReFail
|
HF_ReFail
|
||||||
Rf_ReSuc
|
RF_ReSuc
|
||||||
RF_ReFail
|
RF_ReFail
|
||||||
End Enum
|
End Enum
|
||||||
Private processNum As Int16
|
Private processNum As Int16
|
||||||
@ -1908,6 +1908,7 @@ Public Class Main_Form
|
|||||||
For i = 0 To tableName.Length - 1
|
For i = 0 To tableName.Length - 1
|
||||||
DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" &
|
DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" &
|
||||||
" AND DATE(TestDate) = CURDATE()"
|
" AND DATE(TestDate) = CURDATE()"
|
||||||
|
|
||||||
Dim DupYn As Int16 = DBQueryScalar(DBCmd)
|
Dim DupYn As Int16 = DBQueryScalar(DBCmd)
|
||||||
|
|
||||||
If DupYn > 0 Then
|
If DupYn > 0 Then
|
||||||
@ -5365,19 +5366,19 @@ ProcessEnd:
|
|||||||
Private Sub RFReCount()
|
Private Sub RFReCount()
|
||||||
If dupDATA = 0 Then
|
If dupDATA = 0 Then
|
||||||
txbDayCount.Text = Val(txbDayCount.Text) + 1
|
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
|
txbOkCount.Text = Val(txbOkCount.Text) + 1
|
||||||
Else
|
Else
|
||||||
txbNgCount.Text = Val(txbNgCount.Text) + 1
|
txbNgCount.Text = Val(txbNgCount.Text) + 1
|
||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
If TDDataSet(TD_Data.TestStep) = TestStepList.Rf_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.RF_ReFail 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
|
If processNum = TestStepList.RF_NewSuc Or processNum = TestStepList.RF_ReSuc Then
|
||||||
txbOkCount.Text = Val(txbOkCount.Text) + 1
|
txbOkCount.Text = Val(txbOkCount.Text) + 1
|
||||||
txbNgCount.Text = Val(txbNgCount.Text) - 1
|
txbNgCount.Text = Val(txbNgCount.Text) - 1
|
||||||
End If
|
End If
|
||||||
Else
|
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
|
txbOkCount.Text = Val(txbOkCount.Text) - 1
|
||||||
txbNgCount.Text = Val(txbNgCount.Text) + 1
|
txbNgCount.Text = Val(txbNgCount.Text) + 1
|
||||||
End If
|
End If
|
||||||
@ -5767,14 +5768,14 @@ dbFail:
|
|||||||
If TestError = False Then
|
If TestError = False Then
|
||||||
processNum = TestStepList.RF_ReFail
|
processNum = TestStepList.RF_ReFail
|
||||||
Else
|
Else
|
||||||
processNum = TestStepList.Rf_ReSuc
|
processNum = TestStepList.RF_ReSuc
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Else
|
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) & "')"
|
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
|
If TestError = False Then
|
||||||
processNum = TestStepList.Rf_NewFail
|
processNum = TestStepList.RF_NewFail
|
||||||
Else
|
Else
|
||||||
processNum = TestStepList.RF_NewSuc
|
processNum = TestStepList.RF_NewSuc
|
||||||
End If
|
End If
|
||||||
|
Loading…
x
Reference in New Issue
Block a user