jionmt-sw/prod-ProductFunctionTester
5
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: HIFU 검사 NgEnd 순서 수정

Browse Source
This commit is contained in:
kje97 2025-07-07 16:42:52 +09:00
parent 5bc2a13c72
commit 471b9f69fb
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ProductFunctionTester/Main_Form.vb
View File

@ -198,7 +198,7 @@ Public Class Main_Form
Private Enum TestStepList
HF_NewSuc = 21
HF_NEWFail
HF_NewFail
RF_NewSuc
RF_NewFail
HF_ReSuc
@ -5059,49 +5059,48 @@ RunSuccess:
End If
txbWindow.AppendText("=== 합격 데이터 저장 완료 ===" & vbCrLf)
ProcessEnd:
Jig_End()
GoTo NormalEnd
NgEnd:
txbWindow.AppendText("=== 불합격 데이터 저장 시작 ===" & vbCrLf)
' 불합격 데이터 저장을 위해 TestError를 False로 설정
Dim originalTestError As Boolean = TestError
TestError = False
If HIFU_PostReg() Then
txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf)
If dbHFSave() Then
txbWindow.AppendText("DB Data Save : OK" & vbCrLf)
If CountChanage() Then
txbWindow.AppendText("Run Count Change : OK" & vbCrLf)
Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_Battery & "," & TestData.Test_Temperature(TempData.DivTemp) & "," & TestData.Test_Temperature(TempData.CartTemp) & "," & TestData.Test_HFData(HifuTest_Step.Step1) & "," & TestData.Test_HFData(HifuTest_Step.Step2) & "," & TestData.Test_HFData(HifuTest_Step.step3) & "," & TestError & ""
If Save_Csv(csvData) Then
txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf)
FailMain()
Else
txbWindow.AppendText("CSV Data Save : OK" & vbCrLf)
FailMain()
FailMain() ' 불합격 데이터이므로 항상 FailMain() 호출
End If
Else
txbWindow.AppendText("Run Count Change : FAIL" & vbCrLf)
FailMain()
End If
Else
txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf)
FailMain()
End If
Else
txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf)
FailMain()
End If
' 원래 TestError 값으로 복원 (필요시)
TestError = originalTestError
txbWindow.AppendText("=== 불합격 데이터 저장 완료 ===" & vbCrLf)
ProcessEnd:
Jig_End()
NormalEnd:
txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf)
@ -5533,13 +5532,13 @@ ProcessEnd:
txbNgCount.Text = Val(txbNgCount.Text) + 1
End If
Else
If TDDataSet(TD_Data.TestStep) = TestStepList.HF_NEWFail Or TDDataSet(TD_Data.TestStep) = TestStepList.HF_ReFail Then
If TDDataSet(TD_Data.TestStep) = TestStepList.HF_NewFail Or TDDataSet(TD_Data.TestStep) = TestStepList.HF_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
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
@ -6036,6 +6035,7 @@ dbFail:
Dim checkQuery As String = "SELECT COUNT(*) FROM " & hfTableNow & " WHERE PV_SN = '" & TestData.Test_Serial & "'"
Dim exists As Integer = DBQueryScalar(checkQuery)
If exists > 0 Then
DBCmd = "UPDATE " & hfTableNow & " SET TestDate = '" & NowDate & "', TestTime = '" & NowTime & "', FW_Ver = '" & TestData.Test_Firmware & "', BatteryLv = '" & TestData.Test_Battery & "', DivTemp = '" & TestData.Test_Temperature(TempData.DivTemp) & "', CtTemp = '" & TestData.Test_Temperature(TempData.CartTemp) & "', HF_R1Value = '" & TestData.Test_HFData(HifuTest_Step.Step1) & "', HF_R2Value = '" & TestData.Test_HFData(HifuTest_Step.Step2) & "', HF_R3Value = '" & TestData.Test_HFData(HifuTest_Step.step3) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'"
@ -6048,7 +6048,7 @@ dbFail:
DBCmd = "INSERT INTO " & hfTableNow & "(PV_SN,TestDate,TestTime,FW_Ver,BatteryLv,DivTemp,CtTemp,HF_R1Value,HF_R2Value,HF_R3Value) VALUE('" & TestData.Test_Serial & "','" & NowDate & "','" & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Battery & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_HFData(HifuTest_Step.Step1) & "','" & TestData.Test_HFData(HifuTest_Step.Step2) & "','" & TestData.Test_HFData(HifuTest_Step.step3) & "')"
If TestError = False Then
processNum = TestStepList.HF_NEWFail
processNum = TestStepList.HF_NewFail
Else
processNum = TestStepList.HF_NewSuc
End If