1.보급형인 경우 hf & ep 검사에서 ep 먼저 수행 -> 기존 ep 검사에서 pcb td 번호와 검사하는 td 번호 비교하는 로직 주석처리
2.버전 2.1.2 3. ep 검사일 때 td 생성 시(step =11) NonTD 데이터 생성 ->won 모델인 경우 제외 4.보급형 모델 rf,ep 검사 nas db 저장 시 성공해도 실패 로직으로 진행되는 부분 정상 수정
This commit is contained in:
parent
6f68fa71c0
commit
ddb6c6220a
@ -9,7 +9,7 @@ Imports uPLibrary.Networking.M2Mqtt
|
|||||||
|
|
||||||
Public Class Main_Form
|
Public Class Main_Form
|
||||||
Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver."
|
Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver."
|
||||||
Public Program_Version As String = "2.1.0"
|
Public Program_Version As String = "2.1.2"
|
||||||
|
|
||||||
''데이터 베이스 테이블 목록
|
''데이터 베이스 테이블 목록
|
||||||
|
|
||||||
@ -5994,10 +5994,10 @@ NormalEnd:
|
|||||||
|
|
||||||
Next
|
Next
|
||||||
|
|
||||||
If TDSetCheck() Then
|
'If TDSetCheck() Then
|
||||||
FailMain()
|
' FailMain()
|
||||||
GoTo ProcessEnd
|
' GoTo ProcessEnd
|
||||||
End If
|
'End If
|
||||||
|
|
||||||
If EPTestRun() Then
|
If EPTestRun() Then
|
||||||
FailMain()
|
FailMain()
|
||||||
@ -7258,8 +7258,9 @@ dbFail:
|
|||||||
|
|
||||||
If DBCommand(DBCmd) = False Then
|
If DBCommand(DBCmd) = False Then
|
||||||
txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
|
txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
|
||||||
|
GoTo dbFail
|
||||||
End If
|
End If
|
||||||
GoTo dbFail
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
For i = 1 To nudSaveCk.Value
|
For i = 1 To nudSaveCk.Value
|
||||||
@ -7303,7 +7304,7 @@ dbFail:
|
|||||||
TestRunningState(testRunningList.Running, Color.Yellow)
|
TestRunningState(testRunningList.Running, Color.Yellow)
|
||||||
|
|
||||||
Dim sucSwitch As Boolean = False
|
Dim sucSwitch As Boolean = False
|
||||||
Dim chooseTDTable As String = If(formType = formTypeList.prdHFLDMEP, TDTableNow, NonTDTableNow)
|
Dim chooseTDTable As String = TDTableNow
|
||||||
|
|
||||||
DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;"
|
DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;"
|
||||||
|
|
||||||
@ -7332,17 +7333,20 @@ dbFail:
|
|||||||
GoTo dbFail
|
GoTo dbFail
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
If Not formType = formTypeList.prdHFLDMEP Then
|
||||||
|
chooseTDTable = NonTDTableNow
|
||||||
|
If TDDataSet(TD_Data.TestStep) = "11" Then
|
||||||
|
DBCmd = "INSERT INTO " & chooseTDTable & "(TestStep,PV_SN,P1_DateTime,Fw_Ver,DivTemp,CtTemp,BatteryLv) VALUES('" & processNum & "','" & TestData.Test_Serial & "','" & NowDate & " " & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_Battery & "')"
|
||||||
|
|
||||||
If TDDataSet(TD_Data.TestStep) = "11" Then
|
If DBCommand(DBCmd) = False Then
|
||||||
DBCmd = "INSERT INTO " & NonTDTableNow & "(TestStep,PV_SN,P1_DateTime,Fw_Ver,DivTemp,CtTemp,BatteryLv) VALUES('" & processNum & "','" & TestData.Test_Serial & "','" & NowDate & " " & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_Battery & "')"
|
txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
|
||||||
|
GoTo dbFail
|
||||||
If DBCommand(DBCmd) = False Then
|
End If
|
||||||
txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
|
|
||||||
End If
|
End If
|
||||||
GoTo dbFail
|
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
For i = 1 To nudSaveCk.Value
|
For i = 1 To nudSaveCk.Value
|
||||||
sucSwitch = False
|
sucSwitch = False
|
||||||
DBCmd = "UPDATE " & chooseTDTable & " SET TestStep='" & processNum & "' WHERE PV_SN = '" & TestData.Test_Serial & "'"
|
DBCmd = "UPDATE " & chooseTDTable & " SET TestStep='" & processNum & "' WHERE PV_SN = '" & TestData.Test_Serial & "'"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user