From fff41f2ad1977b8bf4968a1851f47c491d3d0e63 Mon Sep 17 00:00:00 2001 From: hyelinjung Date: Thu, 12 Feb 2026 14:46:50 +0900 Subject: [PATCH] =?UTF-8?q?1.=EA=B8=B0=EC=A1=B4=20=EB=AA=A8=EB=8D=B8(?= =?UTF-8?q?=EC=8A=A4=ED=8E=99=ED=8A=B8=EB=9F=BC->=20=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=ED=94=84),=20=EB=B3=B4=EA=B8=89=ED=98=95=20=EB=AA=A8=EB=8D=B8(?= =?UTF-8?q?=EC=8A=A4=EC=BD=94=ED=94=84=20->=20=EC=8A=A4=ED=8E=99=ED=8A=B8?= =?UTF-8?q?=EB=9F=BC)=20=20=EC=83=9D=EC=82=B0=EA=B2=80=EC=82=AC1=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20pcb=20write=20->=20=EA=B2=80=EC=82=AC2=20?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=99=95=EC=9D=B8=202.=20=EB=A7=88?= =?UTF-8?q?=EB=A6=84=EB=AA=A8=20=EA=B2=80=EC=82=AC=20=EC=8B=9C=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=B3=80=EA=B2=BD=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=88=98=EC=A0=95=203.=202.2.2=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductFunctionTester/Main_Form.Designer.vb | 2 +- ProductFunctionTester/Main_Form.vb | 486 +++++++++++--------- ProductFunctionTester/MySqlMoudule.vb | 13 +- ProductFunctionTester/PostgreSQLMoudule.vb | 14 +- 4 files changed, 278 insertions(+), 237 deletions(-) diff --git a/ProductFunctionTester/Main_Form.Designer.vb b/ProductFunctionTester/Main_Form.Designer.vb index 808d45d..602028e 100644 --- a/ProductFunctionTester/Main_Form.Designer.vb +++ b/ProductFunctionTester/Main_Form.Designer.vb @@ -8588,7 +8588,7 @@ Partial Class Main_Form Me.gbLEDYellow1.Size = New System.Drawing.Size(314, 362) Me.gbLEDYellow1.TabIndex = 109 Me.gbLEDYellow1.TabStop = False - Me.gbLEDYellow1.Text = "LDM attW TEST" + Me.gbLEDYellow1.Text = "LDM Watt TEST" ' 'gbYBgt1 ' diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index 057167a..e320854 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -1,15 +1,16 @@ -Imports System.Diagnostics.Metrics +Imports System.Diagnostics.Metrics Imports System.IO Imports System.IO.Ports Imports System.Math Imports System.Text Imports AForge.Video.DirectShow +Imports Mysqlx.XDevAPI.Common Imports OpenCvSharp Imports uPLibrary.Networking.M2Mqtt Public Class Main_Form Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver." - Public Program_Version As String = "2.1.7" + Public Program_Version As String = "2.2.2" ''데이터 베이스 테이블 목록 @@ -318,7 +319,8 @@ Public Class Main_Form Private todayCount As Integer = 1 '' 금일 측정 개수 Private newTDYnFlag As Boolean = False ''임시 td 생성 여부 - Private ResponseErrorCheck As Boolean = False + Private ResponseErrorCheck As Boolean = False ''ep 검사 계측기 오류 여부 + Private writeTDSNFlag As Boolean = False ''TD 계열 PCB 작성 여부 Private Sub typeDataSetting() If formType = formTypeList.iqcRFEP Or formType = formTypeList.prdRFEP Then @@ -403,13 +405,13 @@ Public Class Main_Form LDMt_WMin(1) = txbHFLDMMin2 LDMt_WMin(2) = txbHFLDMMin3 - LDMt_VRMSMax(0) = txbLDMVRmax3 + LDMt_VRMSMax(0) = txbLDMVRmax1 LDMt_VRMSMax(1) = txbLDMVRmax2 - LDMt_VRMSMax(2) = txbLDMVRmax1 + LDMt_VRMSMax(2) = txbLDMVRmax3 - LDMt_VRMSmin(0) = txbLDMVRmin3 + LDMt_VRMSmin(0) = txbLDMVRmin1 LDMt_VRMSmin(1) = txbLDMVRmin2 - LDMt_VRMSmin(2) = txbLDMVRmin1 + LDMt_VRMSmin(2) = txbLDMVRmin3 FWVerNow = txbFirmVer @@ -1024,22 +1026,23 @@ Public Class Main_Form Private Function SpecFreq_Set(cnt As Integer) As Boolean Dim specData As String - If formType = formTypeList.iqcLDM Or formType = formTypeList.prdLDM Then - Dim flag As Int16 - If cnt = 0 Then - flag = 3000 - ElseIf cnt = 1 Then - flag = 10000 - Else - flag = 15000 - End If - specData = RunCommand(":FREQuency:CENTer " & flag & "kHz") - If specData <> "PASS" Then - Return False - Else - Return True - End If - End If + 'If formType = formTypeList.iqcLDM Or formType = formTypeList.prdLDM Then + ' Dim flag As Int16 + ' If cnt = 0 Then + ' flag = 3000 + ' ElseIf cnt = 1 Then + ' flag = 10000 + ' Else + ' 'flag = 15000 + ' flag = 10000 + ' End If + ' specData = RunCommand(":FREQuency:CENTer " & flag & "kHz") + ' If specData <> "PASS" Then + ' Return False + ' Else + ' Return True + ' End If + 'End If specData = RunCommand(":FREQuency:CENTer " & HifuStep(cnt) & "kHz") If specData <> "PASS" Then @@ -1717,8 +1720,8 @@ Public Class Main_Form Private Function FirmVerCheck() As Boolean - 'MeasureTimeFunc(MeasStart) - 'MainTextChange("펌웨어 측정중") + MeasureTimeFunc(MeasStart) + MainTextChange("펌웨어 측정중") TestStep = TestList.Firmware TestData.Test_Firmware = String.Empty @@ -1738,12 +1741,12 @@ Public Class Main_Form If TestData.Test_Firmware = FWVerNow.Text Then txbVer.ForeColor = Color.Blue TestRunningState(testRunningList.Success, Color.Green) - txbWindow.AppendText("Firmware Time(ms) : " & MeasureTimeFunc(MeasEnd) & vbCrLf) + txbWindow.AppendText("Success Firmware version: " & TestData.Test_Firmware & "/Time(ms) : " & MeasureTimeFunc(MeasEnd) & vbCrLf) Return False Else txbVer.ForeColor = Color.Red TestRunningState(testRunningList.Fail, Color.Red) - txbWindow.AppendText("Firmware Time(ms) : " & MeasureTimeFunc(MeasEnd) & vbCrLf) + txbWindow.AppendText("Fail Firmware version: " & TestData.Test_Firmware & "/Time(ms) : " & MeasureTimeFunc(MeasEnd) & vbCrLf) Return True End If End Function @@ -1787,19 +1790,20 @@ Public Class Main_Form End Function Private Function RunLDM(count As Int16) As Boolean Dim retVal As String - Dim ldmMhzNum As Int16 - If count = 0 Then - ldmMhzNum = 3000 - ElseIf count = 1 Then - ldmMhzNum = 10000 - Else - ldmMhzNum = 15000 - End If + 'Dim ldmMhzNum As Int16 + 'If count = 0 Then + ' ldmMhzNum = 3000 + 'ElseIf count = 1 Then + ' ldmMhzNum = 10000 + 'Else + ' 'ldmMhzNum = 15000 + ' ldmMhzNum = 10000 + 'End If 'tmpCmdMessage = "runldm" tmpCmdMessage = "runhifu" 'cmdMessage = "[" & tmpCmdMessage & " " & ldmMhzNum & "," & nudRFRun.Value & "]" - cmdMessage = "[" & tmpCmdMessage & " " & 0 & "," & ldmMhzNum & "," & nudRFRun.Value & "]" + cmdMessage = "[" & tmpCmdMessage & " " & 0 & "," & HifuStep(count) & "," & nudRFRun.Value & "]" If SendData(cmdMessage) Then Return True @@ -1931,6 +1935,7 @@ Public Class Main_Form End If retVal = PollingReceiveData(JIGDT_Timeout) + txbWindow.AppendText("TD WRITE DATA :" & retVal & "" & vbCrLf) If retVal.ToLower = TDSN.ToLower Then Return False @@ -1969,6 +1974,7 @@ Public Class Main_Form End If retVal = PollingReceiveData(JIGDT_Timeout) + txbWindow.AppendText("TD FREQ & POWER WRITE DATA :" & retVal & vbCrLf) If retVal = Freq & "," & Power Then Return False @@ -1988,8 +1994,9 @@ Public Class Main_Form End If retVal = PollingReceiveData(JIGDT_Timeout) + Dim compareString = Freq1 & "," & Freq2 & "," & Freq3 & "," & Power1 & "," & Power2 & "," & Power3 - If retVal = Freq1 & "," & Freq2 & "," & Freq3 & "," & Power1 & "," & Power2 & "," & Power3 Then + If retVal.Equals(compareString) Then Return False End If @@ -2009,6 +2016,7 @@ Public Class Main_Form End If retVal = PollingReceiveData(JIGDT_Timeout) + txbWindow.AppendText("PCB RESET RESPONSE :" & retVal & vbCrLf) If retVal = "ok" Then Return False @@ -2308,26 +2316,28 @@ Public Class Main_Form TestData.Test_HFData(cnt) = Round(Convert.ToDouble(SpecQueryStr(":CALCulate:MARKer1:Y?")), 3) + delay_run(nudHFwait.Value) + If formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then If cnt Mod 2 = 0 Then If TestData.Test_HFData(cnt) < Convert.ToDouble(Val(txbDSSub_Min.Text)) Or TestData.Test_HFData(cnt) > Convert.ToDouble(Val(txbDSSub_Max.Text)) Then - txbWindow.AppendText("Hifu MEASURE Fail " & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE Fail " & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestFail(cnt) ErrorCheck = True Else - txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestSuccess(cnt) End If Else If TestData.Test_HFData(cnt) < Convert.ToDouble(Val(txbDShfOut_stMin.Text)) Or TestData.Test_HFData(cnt) > Convert.ToDouble(Val(txbDShfOut_stMax.Text)) Then - txbWindow.AppendText("Hifu MEASURE Fail " & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE Fail " & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestFail(cnt) ErrorCheck = True Else - txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestSuccess(cnt) End If @@ -2337,23 +2347,21 @@ Public Class Main_Form If formType = formTypeList.iqcLDM Or formType = formTypeList.prdLDM Then - txbWindow.AppendText("LDM MEASURE VALUE : " & TestData.Test_HFData(cnt) & vbCrLf) If TestData.Test_HFData(cnt) < Convert.ToDouble(Val(LDMt_WMin(cnt).Text)) Or TestData.Test_HFData(cnt) > Convert.ToDouble(Val(LDMt_WMax(cnt).Text)) Then - txbWindow.AppendText("LDM MEASURE Fail " & cnt & vbCrLf) + txbWindow.AppendText("LDM MEASURE Fail " & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestFail(cnt) ErrorCheck = True Else - txbWindow.AppendText("LDM MEASURE SUCCESS " & cnt & vbCrLf) + txbWindow.AppendText("LDM MEASURE SUCCESS " & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestSuccess(cnt) End If Else - txbWindow.AppendText("LDM MEASURE VALUE : " & TestData.Test_HFData(cnt) & vbCrLf) If TestData.Test_HFData(cnt) < Convert.ToDouble(Val(HF_OutMIN.Text)) Or TestData.Test_HFData(cnt) > Convert.ToDouble(Val(HF_OutMax.Text)) Then - txbWindow.AppendText("Hifu MEASURE Fail " & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE Fail " & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestFail(cnt) ErrorCheck = True Else - txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & " : " & TestData.Test_HFData(cnt) & vbCrLf) + txbWindow.AppendText("Hifu MEASURE SUCCESS" & cnt & ": 반환값: " & TestData.Test_HFData(cnt) & vbCrLf) hfTestSuccess(cnt) End If @@ -2363,7 +2371,7 @@ Public Class Main_Form Next - If Not formType = formTypeList.iqcLDM Then + If Not (formType = formTypeList.iqcLDM Or formType = formTypeList.prdLDM) Then If formType = formTypeList.prdDsHF Or formType = formTypeList.iqcDsHF Then If TestData.Test_HFData(HifuTest_Step.Step1) > TestData.Test_HFData(HifuTest_Step.step3) Then @@ -2408,6 +2416,17 @@ Public Class Main_Form txbWindow.AppendText("Hifu Test Full Time : " & MeasureTimeFunc(MeasEnd) & vbCrLf) Return False + 'ForSettingSucess: + ' If TestData.Test_HFData(1) < Convert.ToDouble(Val(LDMt_WMin(2).Text)) Or TestData.Test_HFData(1) > Convert.ToDouble(Val(LDMt_WMax(2).Text)) Then + ' txbWindow.AppendText("LDM MEASURE Fail " & 2 & ": 반환값: " & TestData.Test_HFData(1) & vbCrLf) + ' hfTestFail(2) + ' ErrorCheck = True + ' Else + ' txbWindow.AppendText("LDM MEASURE SUCCESS " & 2 & ": 반환값: " & TestData.Test_HFData(1) & vbCrLf) + ' hfTestSuccess(2) + ' End If + ' Return False + ForSettingFail: hfTestFail(ForCnt) txbWindow.AppendText("measuring instrument response error!" & vbCrLf) @@ -2698,21 +2717,21 @@ SettingFail: If formType = formTypeList.prdVRLDM Then If (TestData.Test_RFVRMS(i) < CSng(LDMt_VRMSmin(i).Text) Or TestData.Test_RFVRMS(i) > CSng(LDMt_VRMSMax(i).Text)) Or Round(TestData.Test_RFFreq(i), 0) <> i + 1 Then - txbWindow.AppendText("Run LDM(RF) MEASURE FAIL" & LdmCnt & " : " & TestData.Test_RFVRMS(i) & "/" & TestData.Test_RFFreq(i) & vbCrLf) + txbWindow.AppendText("Run LDM(RF) MEASURE FAIL" & LdmCnt & " : " & TestData.Test_RFVRMS(i) & vbCrLf) chooseFailFunc(LdmCnt) ErrorCheck = True Else - txbWindow.AppendText("Run LDM(RF) MEASURE SUCCESS" & LdmCnt & " : " & TestData.Test_RFVRMS(i) & "/" & TestData.Test_RFFreq(i) & vbCrLf) + txbWindow.AppendText("Run LDM(RF) MEASURE SUCCESS" & LdmCnt & " : " & TestData.Test_RFVRMS(i) & vbCrLf) chooseSuccessFunc(LdmCnt) End If Else If (TestData.Test_RFVRMS(i) < CSng(RF_VRMSMin(i).Text) Or TestData.Test_RFVRMS(i) > CSng(RF_VRMSMax(i).Text)) Or Round(TestData.Test_RFFreq(i), 0) <> i + 1 Then - txbWindow.AppendText("Run RF MEASURE FAIL" & i & " : " & TestData.Test_RFVRMS(i) & "/" & TestData.Test_RFFreq(i) & vbCrLf) + txbWindow.AppendText("Run RF MEASURE FAIL" & i & " : " & TestData.Test_RFVRMS(i) & vbCrLf) chooseFailFunc(i) ErrorCheck = True Else - txbWindow.AppendText("Run RF MEASURE SUCCESS" & i & " : " & TestData.Test_RFVRMS(i) & "/" & TestData.Test_RFFreq(i) & vbCrLf) + txbWindow.AppendText("Run RF MEASURE SUCCESS" & i & " : " & TestData.Test_RFVRMS(i) & vbCrLf) chooseSuccessFunc(i) End If End If @@ -2752,7 +2771,7 @@ SettingFail: End Function Private Sub rfTestState(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFMC Or formType = formTypeList.iqcRFEPMC Then If cnt = 2 Then txbRFtest1.Text = "측정중" txbRFtest1.BackColor = Color.Yellow @@ -2800,7 +2819,7 @@ SettingFail: End Sub Private Sub rfTestFail(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFMC Or formType = formTypeList.iqcRFEPMC Then If cnt = 2 Then txbRFtest1.Text = "FAIL" txbRFtest1.BackColor = Color.Red @@ -2848,7 +2867,7 @@ SettingFail: End Sub Private Sub rfTestSuccess(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFMC Or formType = formTypeList.iqcRFEPMC Then If cnt = 2 Then txbRFtest1.Text = "SUCCESS" txbRFtest1.BackColor = Color.Green @@ -3085,7 +3104,7 @@ SettingFail: ResponseErrorCheck = False Try - If formType = formTypeList.prdHFLDMEP Or formType = formTypeList.iqcEP Or formType = formTypeList.prdEP Then + If formType = formTypeList.prdHFLDMEP Or formType = formTypeList.iqcEP Or formType = formTypeList.prdEP Then ''원/ 네모 / 마름모 chooseStatusFunc = AddressOf hfTestState chooseSuccessFunc = AddressOf hfTestSuccess chooseFailFunc = AddressOf hfTestFail @@ -3127,6 +3146,7 @@ SettingFail: GoTo ForSettingFail End If + If TestMode_On(ModCnt) Then ResponseErrorCheck = True txbWindow.AppendText("TestMode_EP Entrance Fail: " & ModCnt & vbCrLf) @@ -3149,7 +3169,6 @@ SettingFail: ElseIf n = nudEPRe.Value Then ResponseErrorCheck = True chooseRetryFunc(i) - End If Continue For End If @@ -3237,7 +3256,7 @@ SettingFail: ElseIf n = nudEPRe.Value Then ResponseErrorCheck = True chooseRetryFunc(i) - + End If Continue For End If @@ -3283,6 +3302,7 @@ SettingFail: End Try ForSettingFail: + TestError = False txbWindow.AppendText("measuring instrument response error!" & vbCrLf) txbWindow.AppendText("Run EP FAIL" & vbCrLf) TestRunningState(testRunningList.Retry, Color.Gray) @@ -3292,7 +3312,7 @@ ForSettingFail: End Function Private Sub epTestState(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then If cnt = 0 Then txbEPtest1.Text = "진행중" txbEPtest1.BackColor = Color.Yellow @@ -3340,7 +3360,7 @@ ForSettingFail: End Sub Private Sub epTestFail(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then If cnt = 0 Then txbEPtest1.Text = "FAIL" txbEPtest1.BackColor = Color.Red @@ -3388,7 +3408,7 @@ ForSettingFail: End Sub Private Sub epTestSuccess(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then If cnt = 0 Then txbEPtest1.Text = "SUCCESS" txbEPtest1.BackColor = Color.Green @@ -3435,7 +3455,7 @@ ForSettingFail: End If End Sub Private Sub epTestRetry(cnt As Int16) - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then If cnt = 0 Then txbEPtest1.Text = "보 류" txbEPtest1.BackColor = Color.Gray @@ -3830,10 +3850,8 @@ DataFail: End If For i = 1 To nudSaveCk.Value - If formType = formTypeList.prdHF Or formType = formTypeList.prdHFLDMEP Then - If prod_reg_data("JOMT", "000000", ProdCode, "82", "0") Then - GoTo DataFail - End If + If prod_reg_data("JOMT", "000000", ProdCode, "82", "0") Then + GoTo DataFail End If Next @@ -3927,7 +3945,7 @@ DataFail: Return True End Function - Private Function LDMDataWrite() As Boolean + Private Function LDMDataWrite(ProdCode As String) As Boolean MeasureTimeFunc(MeasStart) MainTextChange("정보입력중..") TestStep = TestList.DataWrite @@ -3943,6 +3961,12 @@ DataFail: GoTo DataFail End If + For i = 1 To nudSaveCk.Value + If prod_reg_data("JOMT", "000000", ProdCode, "82", "0") Then + GoTo DataFail + End If + Next + For i = 1 To nudSaveCk.Value If ldm_reg_data() Then txbWindow.AppendText("LDM PCB WRITE ERROR" & vbCrLf) @@ -3982,26 +4006,26 @@ DataFail: Dim loopFlag As Int16 = 2 sucSwitch = False If LDMFreqWrite(LDM_DataSet(LDM_Data.freq_1), LDM_DataSet(LDM_Data.power_1), LDM_DataSet(LDM_Data.freq_2), LDM_DataSet(LDM_Data.power_2), LDM_DataSet(LDM_Data.freq_3), LDM_DataSet(LDM_Data.power_3)) Then - txbWindow.AppendText("LDM PCB PREQ & POWER WRITE ERROR" & vbCrLf) + txbWindow.AppendText("LDM PCB FREQ & POWER WRITE ERROR" & vbCrLf) GoTo DataFail End If freqData = LDM_load_data() If freqData = "0" Then - txbWindow.AppendText("LDM PCB PREQ & POWER READ ERROR" & vbCrLf) + txbWindow.AppendText("LDM PCB FREQ & POWER READ ERROR" & vbCrLf) GoTo DataFail End If returnData = Split(freqData, ",") If returnData.Length <> 6 Then - txbWindow.AppendText("LDM PCB PREQ & POWER READ ERROR" & vbCrLf) + txbWindow.AppendText("LDM PCB FREQ & POWER READ ERROR" & vbCrLf) GoTo DataFail End If For Each temp In returnData - If LDM_DataSet(loopFlag) = temp Then + If String.Equals(LDM_DataSet(loopFlag), temp, StringComparison.OrdinalIgnoreCase) Then sucSwitch = True Else sucSwitch = False @@ -4018,7 +4042,7 @@ DataFail: If sucSwitch = False Then GoTo DataFail Else - txbWindow.AppendText("Product Frequence Success" & vbCrLf) + txbWindow.AppendText("Product Frequency Success" & vbCrLf) End If End If @@ -4081,7 +4105,7 @@ DataFail: retVal = PollingReceiveData(1000) Dim compareData As String = TestData.Test_Serial & "," & LDM_DataSet(LDM_Data.freq_1) & "," & LDM_DataSet(LDM_Data.freq_2) & "," & LDM_DataSet(LDM_Data.freq_3) & "," & LDM_DataSet(LDM_Data.power_1) & "," & LDM_DataSet(LDM_Data.power_2) & "," & LDM_DataSet(LDM_Data.power_3) - If Not retVal.Equals(compareData) Then + If Not String.Equals(retVal, compareData, StringComparison.OrdinalIgnoreCase) Then Return True End If @@ -4097,6 +4121,7 @@ DataFail: End If retVal = PollingReceiveData(500) + txbWindow.AppendText("TD READ DATA: " & retVal & "" & vbCrLf) If retVal.Length > td_name_size Then Return retVal @@ -4114,6 +4139,7 @@ DataFail: End If retVal = PollingReceiveData(500) + txbWindow.AppendText("LDM RESPONSE DATA: " & retVal & "" & vbCrLf) If retVal.Length > td_name_size Then Return retVal @@ -4134,6 +4160,7 @@ DataFail: End If retval = PollingReceiveData(1000) + txbWindow.AppendText("TD MOTER READ DATA :" & retval & vbCrLf) If UBound(Split(retval, ",")) = 4 Then Return Mid(retval, 1, InStr(1, retval, ",") - 1) @@ -4152,6 +4179,7 @@ DataFail: End If retval = PollingReceiveData(500) + txbWindow.AppendText("TD FREQ & POWER READ DATA :" & retval & vbCrLf) If InStr(1, retval, ",") > 0 Then Return retval @@ -4172,6 +4200,7 @@ DataFail: End If retval = PollingReceiveData(500) + txbWindow.AppendText("LDM FREQ & POWER READ DATA :" & retval & vbCrLf) If InStr(1, retval, ",") > 0 Then Return retval @@ -4192,6 +4221,7 @@ DataFail: End If retval = PollingReceiveData(1000) + txbWindow.AppendText("TD MOTER WRITE DATA :" & retval & vbCrLf) If retval = pulse & ",0,0,0,0" Then Return False @@ -4516,10 +4546,12 @@ DataFail: Case formTypeList.iqcLDM ''SEMO iqcHfFunction() + ''보급형 생산검사는 스코프 -> 스펙트럼 + Case formTypeList.prdLDM ''ldm spectrum ldmFunction() Case formTypeList.prdVRLDM ''ldm scope - ldmVrmsFunction() + 'ldmVrmsFunction() Case formTypeList.prdLowHF ''WON(HIFU) hfEpFunction() Case formTypeList.prdHFLDMEP ''WON(EP) @@ -4597,7 +4629,7 @@ DataFail: If TDSerial = "1" Then TestError = False - txbWindow.AppendText("Non TD SN READ FAIL : " & vbCrLf) + txbWindow.AppendText("Non TD SN PORT READ FAIL : " & vbCrLf) Return True End If @@ -4918,6 +4950,9 @@ NormalEnd: End If processEnd: + If ResponseErrorCheck Then + RetryMain() + End If Jig_End() startFail: @@ -5300,6 +5335,9 @@ SuccessEnd: End If processEnd: + If TestError = False Then + FailMain() + End If Jig_End() ErrorEnd: @@ -5638,6 +5676,9 @@ SuccessEnd: End If processEnd: + If ResponseErrorCheck Then + RetryMain() + End If Jig_End() ErrorEnd: @@ -5728,11 +5769,11 @@ ErrorEnd: GoTo RunSuccess Else - MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) GoTo NormalEnd End If Else - MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) GoTo NormalEnd End If @@ -5936,6 +5977,7 @@ processEnd: Jig_End() ErrorEnd: + myscope.IO.Clear() txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) End Sub @@ -6037,17 +6079,6 @@ ErrorEnd: Next - 'If JigRun_On() Then - ' FailMain() - ' GoTo ProcessEnd - 'End If - - 'If FirmVerCheck() Then - ' FailMain() - ' MsgBox("최신 펌웨어로 동작하고 있지 않습니다. 펌웨어 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) - ' GoTo ProcessEnd - 'End If - If TDSetCheck() Then FailMain() GoTo ProcessEnd @@ -6067,6 +6098,11 @@ ErrorEnd: GoTo ProcessEnd End If + If writeTDSNFlag Then + TestStep = TestList.DataWritten + TestRunningState(testRunningList.TDWritten, Color.Green) + End If + GoTo RunSuccess Else @@ -6206,10 +6242,10 @@ NormalEnd: GoTo ProcessEnd End If - If LDMDataWrite() Then - FailMain() - GoTo ProcessEnd - End If + 'If LDMDataWrite() Then + ' FailMain() + ' GoTo ProcessEnd + 'End If GoTo RunSuccess @@ -6294,6 +6330,7 @@ NormalEnd: Private Function TDSetCheck() As Boolean Dim TDResult As String + writeTDSNFlag = False If formType = formTypeList.prdLDM Then TDResult = LDM_name_load() Else @@ -6301,14 +6338,13 @@ NormalEnd: End If If TDResult = "1" Then - MsgBox("Send 중 오류가 발생하였습니다.", vbCritical) + txbWindow.AppendText("Send 중 오류가 발생하였습니다." & "" & vbCrLf) txbTDSN.ForeColor = Color.Red Return True End If If TDResult = "0" Then - MsgBox("Receive 중 오류가 발생하였습니다.", vbCritical) - txbTDSN.ForeColor = Color.Red + txbWindow.AppendText("작성된 TD 정보 없음" & "" & vbCrLf) Return True End If @@ -6321,6 +6357,7 @@ NormalEnd: If TestData.Test_Serial.ToUpper = TDResult.ToUpper Then txbWindow.AppendText("TD INPUT : " & TestData.Test_Serial & ", TD WRITTEN : " & TDResult & "" & vbCrLf) txbTDSN.ForeColor = Color.Blue + writeTDSNFlag = True Return False Else txbWindow.AppendText("TD INPUT : " & TestData.Test_Serial & ", TD WRITTEN : " & TDResult & "" & vbCrLf) @@ -6364,12 +6401,12 @@ NormalEnd: Dim TDExistBol As Boolean = pgDBQueryScalar(DBCmd) If TDExistBol = False Then - DBCmd = "INSERT INTO prods(td_serial, p2_jignum, p2_testdate, p2_testtime, p2_result, p2_rf1_vrms, p2_rf1_freq, p2_rf2_vrms, p2_rf2_freq, p2_rf3_vrms, p2_rf3_freq, p2_mc1_vpp, p2_mc1_freq,p2_mc1_width, p2_mc2_vpp, p2_mc2_freq, p2_mc2_width, created_at, updated_at) " & - "VALUES('" & TestData.Test_Serial & "', '" & nudJigNum.Value & "', '" & NowDate & "', '" & NowTime & "','" & TestError & "', '" & 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_MCVpp(0) & "', '" & TestData.Test_MCFreq(0) & "', '" & TestData.Test_MCWidth(0) & "','" & TestData.Test_MCVpp(1) & "', '" & TestData.Test_MCFreq(1) & "', '" & TestData.Test_MCWidth(1) & "','" & "',NOW(),NOW());" + DBCmd = "INSERT INTO prods(td_serial, p2_jignum, p2_testdate, p2_testtime, p2_result, p2_rf1_vrms, p2_rf1_freq, p2_rf2_vrms, p2_rf2_freq, p2_rf3_vrms, p2_rf3_freq, created_at, updated_at) " & + "VALUES('" & TestData.Test_Serial & "', '" & nudJigNum.Value & "', '" & NowDate & "', '" & NowTime & "','" & TestError & "', '" & TestData.Test_RFVRMS(0) & "', '" & TestData.Test_RFFreq(0) & "', '" & TestData.Test_RFVRMS(1) & "', '" & TestData.Test_RFFreq(1) & "', '" & TestData.Test_RFVRMS(2) & "', '" & TestData.Test_RFFreq(2) & "', NOW(), NOW());" Else DBCmd = "UPDATE prods SET td_serial = '" & TestData.Test_Serial & "', p2_jignum = '" & nudJigNum.Value & "', p2_testdate = '" & NowDate & "', p2_testtime = '" & NowTime & "', " & "p2_result = '" & TestError & "', p2_rf1_vrms = '" & TestData.Test_RFVRMS(0) & "', p2_rf1_freq = '" & TestData.Test_RFFreq(0) & "', p2_rf2_vrms = '" & TestData.Test_RFVRMS(1) & "', " & - "p2_rf2_freq = '" & TestData.Test_RFFreq(1) & "', p2_rf3_vrms = '" & TestData.Test_RFVRMS(2) & "', p2_rf3_freq = '" & TestData.Test_RFFreq(2) & "', p2_mc1_vpp = '" & TestData.Test_MCVpp(0) & "', p2_mc1_freq = '" & TestData.Test_MCFreq(0) & "',p2_mc1_width = '" & TestData.Test_MCWidth(0) & "',p2_mc2_vpp = '" & TestData.Test_MCVpp(1) & "', p2_mc2_freq = '" & TestData.Test_MCFreq(1) & "',p2_mc2_width = '" & TestData.Test_MCWidth(1) & "', updated_at = NOW() WHERE td_serial = '" & TestData.Test_Serial & "';" + "p2_rf2_freq = '" & TestData.Test_RFFreq(1) & "', p2_rf3_vrms = '" & TestData.Test_RFVRMS(2) & "', p2_rf3_freq = '" & TestData.Test_RFFreq(2) & "',updated_at = NOW() WHERE td_serial = '" & TestData.Test_Serial & "';" End If txbWindow.AppendText(DBCmd & vbCrLf) @@ -6453,17 +6490,11 @@ NormalEnd: Next - 'If JigRun_On() Then + 'If TDSetCheck() Then ' FailMain() ' GoTo ProcessEnd 'End If - 'If FirmVerCheck() Then - ' FailMain() - ' MsgBox("최신 펌웨어로 동작하고 있지 않습니다. 펌웨어 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) - ' GoTo ProcessEnd - 'End If - If BatteryTest() Then FailMain() GoTo ProcessEnd @@ -6479,12 +6510,12 @@ NormalEnd: GoTo ProcessEnd End If + If DataWrite(ModelCode.PadRight(2, "0"c)) Then FailMain() GoTo ProcessEnd End If - GoTo RunSuccess Else @@ -6585,10 +6616,10 @@ NormalEnd: If StartSwitch = True Then If JigSerial.IsOpen = True Then - If LDMTestStepCheck() Then - MsgBox("공정 순서 오류, LDM 생산1을 먼저 진행해 주십시오.", vbExclamation, Program_Name & Program_Version) - GoTo NormalEnd - End If + 'If LDMTestStepCheck() Then + ' MsgBox("공정 순서 오류, LDM 생산1을 먼저 진행해 주십시오.", vbExclamation, Program_Name & Program_Version) + ' GoTo NormalEnd + 'End If If LDMDataSearch() Then FailMain() @@ -6634,13 +6665,17 @@ NormalEnd: GoTo ProcessEnd End If - If TDSetCheck() Then + 'If TDSetCheck() Then + ' FailMain() + ' GoTo ProcessEnd + 'End If + + If HFTestRun() Then FailMain() GoTo ProcessEnd End If - - If HFTestRun() Then + If LDMDataWrite(ModelCode.PadRight(2, "0"c)) Then FailMain() GoTo ProcessEnd End If @@ -6658,59 +6693,70 @@ NormalEnd: GoTo NormalEnd End If RunSuccess: - If HIFU_PostReg() Then + Try + If HIFU_PostReg() Then - txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) - If dbLDMSave() Then - txbWindow.AppendText("DB Data Save : OK" & vbCrLf) + If dbLDMSave() Then + txbWindow.AppendText("DB Data Save : OK" & vbCrLf) - If CountChanage() Then + 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 & "" + txbWindow.AppendText("Run Count Change : OK" & vbCrLf) + Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_Temperature(TempData.DivTemp) & "," & TestData.Test_HFData(HifuTest_Step.Step1) & "," & TestData.Test_HFData(HifuTest_Step.Step2) & "," & TestData.Test_HFData(HifuTest_Step.step3) & "," & TestError & "" + If Save_Csv(csvData) Then - If Save_Csv(csvData) Then + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() - txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) - FailMain() + Else + + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + + End If Else - txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) - - If TestError = False Then - FailMain() - Else - SuccessMain() - End If + txbWindow.AppendText("Run Count Change : FAIL" & vbCrLf) + FailMain() End If Else - - txbWindow.AppendText("Run Count Change : FAIL" & vbCrLf) + txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) FailMain() - End If Else - txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) + + txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) FailMain() + + End If + Catch ex As TypeInitializationException + txbWindow.AppendText("DB 초기화 오류: " & ex.Message & vbCrLf) + If ex.InnerException IsNot Nothing Then + txbWindow.AppendText(" 내부: " & ex.InnerException.Message & vbCrLf) End If - - Else - - txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) FailMain() - - End If + Catch ex As Exception + txbWindow.AppendText("PostgreSQL/DB 저장 중 오류: " & ex.Message & vbCrLf) + FailMain() + End Try ProcessEnd: Jig_End() NormalEnd: txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + myscope.IO.Clear() End Sub @@ -6728,12 +6774,6 @@ NormalEnd: Return True End If - 'If TDDataSet(TD_Data.TestStep) = 1 Then - ' MsgBox("전류측정을 진행하지 않은 TD 시리얼 번호입니다. 전류측정을 진행하여 주십시오.", vbCritical, Program_Name & Program_Version) - ' MeasureTimeFunc(MeasEnd) - ' Return True - 'End If - txbTDSN.Text = TestData.Test_Serial txbTDSN.Refresh() txbDate.Text = LDM_DataSet(LDM_Data.pvDate) @@ -6813,10 +6853,11 @@ NormalEnd: GoTo ProcessEnd End If - 'If DataWrite(ModelCode.PadRight(2, "0"c)) Then - ' FailMain() - ' GoTo ProcessEnd - 'End If + If writeTDSNFlag Then + TestStep = TestList.DataWritten + TestRunningState(testRunningList.TDWritten, Color.Green) + End If + GoTo runSuccess Else @@ -6912,11 +6953,11 @@ NormalEnd: Next - If EPTestRun() Then GoTo ProcessEnd End If + If DataWrite(ModelCode.PadRight(2, "0"c)) Then FailMain() GoTo ProcessEnd @@ -6983,6 +7024,7 @@ ProcessEnd: Jig_End() NormalEnd: myscope.IO.Clear() + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) End Sub @@ -7048,7 +7090,7 @@ NormalEnd: GoTo ProcessEnd End If - If newTDYnFlag = True Then + If newTDYnFlag Then If DataWriteAL() Then TestError = False newTDYnFlag = False @@ -7056,7 +7098,7 @@ NormalEnd: End If Else TestStep = TestList.DataWritten - TestRunningState(testRunningList.TDWritten, Color.Beige) + TestRunningState(testRunningList.TDWritten, Color.Green) End If GoTo RunSuccess @@ -7169,6 +7211,7 @@ startFail: End If If TempTest() Then + TestError = False GoTo ProcessEnd End If @@ -7178,15 +7221,16 @@ startFail: End If If RFTestRun() Then + TestError = False GoTo ProcessEnd End If - If MCTestRunSp() Then - FailMain() - GoTo ProcessEnd - End If + 'If MCTestRunSp() Then + ' FailMain() + ' GoTo ProcessEnd + 'End If - If newTDYnFlag = True Then + If newTDYnFlag Then If DataWriteAL() Then TestError = False newTDYnFlag = False @@ -7194,9 +7238,10 @@ startFail: End If Else TestStep = TestList.DataWritten - TestRunningState(testRunningList.TDWritten, Color.Beige) + TestRunningState(testRunningList.TDWritten, Color.Green) End If + GoTo SuccessEnd Else @@ -7212,36 +7257,32 @@ SuccessEnd: If RFMc_PostReg() Then txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) - Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & 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) & "," & TestError & "" + If dbRFMCSave() Then txbWindow.AppendText("DB Data Save : OK" & vbCrLf) - If Save_Csv(csvData) Then - txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) - FailMain() + If CountChanage() Then + txbWindow.AppendText("Run Count Change : OK" & vbCrLf) + Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_RFVRMS(0) & "," & TestData.Test_RFFreq(0) & "," & TestData.Test_RFVRMS(1) & "," & TestData.Test_RFFreq(1) & "," & TestData.Test_RFVRMS(2) & "," & TestData.Test_RFFreq(2) & "," & TestError & "" - Else - - txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) - - If CountChanage() Then - - txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + If Save_Csv(csvData) Then + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() + Else + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) If TestError = False Then FailMain() Else SuccessMain() End If - - Else - - txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) - FailMain() - End If + Else + txbWindow.AppendText("Run Count Change : FAIL" & vbCrLf) + FailMain() End If + Else txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) FailMain() @@ -7661,19 +7702,19 @@ ProcessEnd: Private Sub LDMReCount() If dupDATA = 0 Then txbDayCount.Text = Val(txbDayCount.Text) + 1 - If processNum = TestStepList.HF_NewSuc Then + If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc Then txbOkCount.Text = Val(txbOkCount.Text) + 1 Else txbNgCount.Text = Val(txbNgCount.Text) + 1 End If Else - If LDM_DataSet(LDM_Data.TestStep) <> TestStepList.HF_NewSuc Then - If processNum = TestStepList.HF_NewSuc Then + If LDM_DataSet(LDM_Data.TestStep) = TestStepList.HF_NEWFail Or LDM_DataSet(LDM_Data.TestStep) = TestStepList.HF_ReFail Then + If processNum = TestStepList.HF_ReSuc Then txbOkCount.Text = Val(txbOkCount.Text) + 1 txbNgCount.Text = Val(txbNgCount.Text) - 1 End If Else - If processNum <> TestStepList.HF_NewSuc Then + If processNum = TestStepList.HF_ReFail Then txbOkCount.Text = Val(txbOkCount.Text) - 1 txbNgCount.Text = Val(txbNgCount.Text) + 1 End If @@ -7924,7 +7965,7 @@ ProcessEnd: Case TestList.RF - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFMC Or formType = formTypeList.iqcRFEPMC Then ChangeTxb = txbRFresult ElseIf formType = formTypeList.prdRFEP Or formType = formTypeList.iqcRFEP Or formType = formTypeList.company Then @@ -7939,7 +7980,7 @@ ProcessEnd: Case TestList.MC - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then ChangeTxb = txbMCresult Else @@ -7947,7 +7988,7 @@ ProcessEnd: End If Case TestList.EP - If formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdRFMCEP Or formType = formTypeList.iqcRFEPMC Then ChangeTxb = txbEPresult ElseIf formType = formTypeList.prdRFEP Or formType = formTypeList.iqcRFEP Or formType = formTypeList.company Then @@ -7961,7 +8002,7 @@ ProcessEnd: End If Case TestList.DataWrite - If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdVRLDM Or formType = formTypeList.prdRFMC Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdVRLDM Or formType = formTypeList.prdRFMC Or formType = formTypeList.prdLDM Or formType = formTypeList.prdHFLDMEP Then ChangeTxb = txbTDreg ElseIf formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then @@ -8058,7 +8099,7 @@ ProcessEnd: End If Else - DBCmd = "INSERT INTO " & rfTableNow & "(PV_SN,TestDate,TestTime,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq,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_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,EP_R1Vpp,EP_R1Freq,EP_R1PWidth,EP_R1NWidth,EP_R2Vpp,EP_R2Freq,EP_R2PWidth,EP_R2NWidth,EP_R3Vpp,EP_R3Freq,EP_R3PWidth,EP_R3NWidth) VALUES ('" & 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_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 @@ -8151,7 +8192,7 @@ dbFail: 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) & "')" + 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) VALUES ('" & 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 @@ -8220,7 +8261,7 @@ dbFail: End If Else - DBCmd = "INSERT INTO " & ldmRfTestTableNow & "(PV_SN,TestDate,TestTime,TestResult,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq) VALUE ('" & TestData.Test_Serial & "','" & NowDate & "','" & NowTime & "','" & TestError & "','" & TestData.Test_RFVRMS(0) & "','" & TestData.Test_RFFreq(0) & "','" & TestData.Test_RFVRMS(1) & "','" & TestData.Test_RFFreq(1) & "','" & TestData.Test_RFVRMS(2) & "','" & TestData.Test_RFFreq(2) & "')" + DBCmd = "INSERT INTO " & ldmRfTestTableNow & "(PV_SN,TestDate,TestTime,TestResult,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq) VALUES ('" & TestData.Test_Serial & "','" & NowDate & "','" & NowTime & "','" & TestError & "','" & TestData.Test_RFVRMS(0) & "','" & TestData.Test_RFFreq(0) & "','" & TestData.Test_RFVRMS(1) & "','" & TestData.Test_RFFreq(1) & "','" & TestData.Test_RFVRMS(2) & "','" & TestData.Test_RFFreq(2) & "')" If TestError = False Then processNum = TestStepList.RF_NewFail @@ -8280,7 +8321,7 @@ dbFail: If DupYn = True Then - DBCmd = "UPDATE " & rfTableNow & " SET TestDate='" & NowDate & "',TestTime='" & NowTime & "',RF_R1Vrms='" & TestData.Test_RFVRMS(0) & "',RF_R1Freq='" & TestData.Test_RFFreq(0) & "',RF_R2Vrms='" & TestData.Test_RFVRMS(1) & "',RF_R2Freq='" & TestData.Test_RFFreq(1) & "',RF_R3Vrms='" & TestData.Test_RFVRMS(2) & "',RF_R3Freq='" & TestData.Test_RFFreq(2) & "',MC_R1Wave='" & TestData.Test_MCWidth(0) & "',MC_R1Vpp='" & TestData.Test_MCVpp(0) & "',MC_R1Freq='" & TestData.Test_MCFreq(0) & "',MC_R2Wave='" & TestData.Test_MCWidth(1) & "',MC_R2Vpp='" & TestData.Test_MCVpp(0) & "',MC_R2Freq='" & TestData.Test_MCFreq(0) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" + DBCmd = "UPDATE " & rfTableNow & " SET TestDate='" & NowDate & "',TestTime='" & NowTime & "',RF_R1Vrms='" & TestData.Test_RFVRMS(0) & "',RF_R1Freq='" & TestData.Test_RFFreq(0) & "',RF_R2Vrms='" & TestData.Test_RFVRMS(1) & "',RF_R2Freq='" & TestData.Test_RFFreq(1) & "',RF_R3Vrms='" & TestData.Test_RFVRMS(2) & "',RF_R3Freq='" & TestData.Test_RFFreq(2) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" If TestError = False Then processNum = TestStepList.RF_ReFail @@ -8288,7 +8329,7 @@ dbFail: 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) 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) & "')" + DBCmd = "INSERT INTO " & rfTableNow & "(PV_SN,TestDate,TestTime,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq) VALUES ('" & 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) & "')" If TestError = False Then processNum = TestStepList.RF_NewFail @@ -8368,7 +8409,7 @@ dbFail: End If Else - DBCmd = "INSERT INTO " & rfTableNow & "(PV_SN,TestDate,TestTime,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_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,EP_R1Vpp,EP_R1Freq,EP_R1PWidth,EP_R1NWidth,EP_R2Vpp,EP_R2Freq,EP_R2PWidth,EP_R2NWidth,EP_R3Vpp,EP_R3Freq,EP_R3PWidth,EP_R3NWidth) VALUES ('" & TestData.Test_Serial & "','" & NowDate & "','" & NowTime & "','" & 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 @@ -8449,7 +8490,7 @@ dbFail: processNum = TestStepList.HF_ReSuc End If Else - 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) & "')" + DBCmd = "INSERT INTO " & hfTableNow & "(PV_SN,TestDate,TestTime,FW_Ver,BatteryLv,DivTemp,CtTemp,HF_R1Value,HF_R2Value,HF_R3Value) VALUES ('" & 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 @@ -8462,30 +8503,28 @@ dbFail: GoTo dbFail End If - If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Then - Dim sucSwitch As Boolean = False - For i = 1 To nudSaveCk.Value - sucSwitch = False - DBCmd = "UPDATE " & TDTableNow & " SET TestStep='" & processNum & "', Ct_Model='" & ModelName & "', Ct_Type='" & CartTypeName & "',Ct_Frequency='" & TDDataSet(TD_Data.Freq) & "',P1_Date='" & NowDate & "',P1_Time='" & NowTime & "',P1_Model='" & ModelName & "',P1_CartType='" & CartTypeName & "',P1_Frequency='" & TDDataSet(TD_Data.Freq) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" - If DBCommand(DBCmd) = False Then - GoTo dbFail - End If + Dim sucSwitch As Boolean = False - DBCmd = "SELECT TestStep FROM " & TDTableNow & " WHERE PV_SN = '" & TestData.Test_Serial & "'" - - Dim tdState As String = DBQueryScalar(DBCmd) - - If tdState = processNum Then - sucSwitch = True - Exit For - End If - Next - - If sucSwitch = False Then + For i = 1 To nudSaveCk.Value + sucSwitch = False + DBCmd = "UPDATE " & TDTableNow & " SET TestStep='" & processNum & "', Ct_Model='" & ModelName & "', Ct_Type='" & CartTypeName & "',Ct_Frequency='" & TDDataSet(TD_Data.Freq) & "',P1_Date='" & NowDate & "',P1_Time='" & NowTime & "',P1_Model='" & ModelName & "',P1_CartType='" & CartTypeName & "',P1_Frequency='" & TDDataSet(TD_Data.Freq) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" + If DBCommand(DBCmd) = False Then GoTo dbFail End If + DBCmd = "SELECT TestStep FROM " & TDTableNow & " WHERE PV_SN = '" & TestData.Test_Serial & "'" + + Dim tdState As String = DBQueryScalar(DBCmd) + + If tdState = processNum Then + sucSwitch = True + Exit For + End If + Next + + If sucSwitch = False Then + GoTo dbFail End If txbWindow.AppendText("DataBase Save Full Time : " & MeasureTimeFunc(MeasEnd) & vbCrLf) @@ -8514,21 +8553,17 @@ dbFail: Dim DupYn As Boolean = DBQueryScalar(DBCmd) If DupYn = True Then - DBCmd = "UPDATE " & ldmTestTableNow & " 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) & "', TestResult ='" & TestError & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" + DBCmd = "UPDATE " & ldmTestTableNow & " 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) & "', LDM_R1Value = '" & TestData.Test_HFData(HifuTest_Step.Step1) & "', LDM_R2Value = '" & TestData.Test_HFData(HifuTest_Step.Step2) & "', LDM_R3Value = '" & TestData.Test_HFData(HifuTest_Step.step3) & "', TestResult ='" & TestError & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" If TestError = False Then - If LDM_DataSet(LDM_Data.TestStep) = TestStepList.HF_NewSuc Then ''합격 후 재검진행 시 불합격인 경우 - processNum = 23 ''강제로 이전 단계로 초기화 - Else - processNum = LDM_DataSet(LDM_Data.TestStep) - End If + processNum = TestStepList.HF_ReFail Else - processNum = TestStepList.HF_NewSuc + processNum = TestStepList.HF_ReSuc End If Else - DBCmd = "INSERT INTO " & ldmTestTableNow & "(PV_SN,TestDate,TestTime,FW_Ver,BatteryLv,DivTemp,CtTemp,HF_R1Value,HF_R2Value,HF_R3Value,TestResult) 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) & "','" & TestError & "')" + DBCmd = "INSERT INTO " & ldmTestTableNow & "(PV_SN,TestDate,TestTime,FW_Ver,BatteryLv,DivTemp,CtTemp,LDM_R1Value,LDM_R2Value,LDM_R3Value,TestResult) VALUES ('" & 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 TestError = False Then - processNum = LDM_DataSet(LDM_Data.TestStep) + processNum = TestStepList.HF_NEWFail Else processNum = TestStepList.HF_NewSuc End If @@ -8599,7 +8634,7 @@ dbFail: If DupYn = True Then DBCmd = "UPDATE " & rfTableNow & " SET TestDate='" & NowDate & "',TestTime='" & NowTime & "',RF_R1Vrms='" & TestData.Test_RFVRMS(0) & "',RF_R1Freq='" & TestData.Test_RFFreq(0) & "',RF_R2Vrms='" & TestData.Test_RFVRMS(1) & "',RF_R2Freq='" & TestData.Test_RFFreq(1) & "',RF_R3Vrms='" & TestData.Test_RFVRMS(2) & "',RF_R3Freq='" & TestData.Test_RFFreq(2) & "',MC_R1Wave='" & TestData.Test_MCWidth(0) & "',MC_R1Vpp='" & TestData.Test_MCVpp(0) & "',MC_R1Freq='" & TestData.Test_MCFreq(0) & "',MC_R2Wave='" & TestData.Test_MCWidth(1) & "',MC_R2Vpp='" & TestData.Test_MCVpp(0) & "',MC_R2Freq='" & TestData.Test_MCFreq(0) & "',EP_R1Vpp='" & TestData.Test_EPVpp(0) & "',EP_R1Freq='" & TestData.Test_EPFreq(0) & "',EP_R1PWidth='" & TestData.Test_EPPWidth(0) & "',EP_R1NWidth='" & TestData.Test_EPNWidth(0) & "',EP_R2Vpp='" & TestData.Test_EPVpp(1) & "',EP_R2Freq='" & TestData.Test_EPFreq(1) & "',EP_R2PWidth='" & TestData.Test_EPPWidth(1) & "',EP_R2NWidth='" & TestData.Test_EPNWidth(1) & "',EP_R3Vpp='" & TestData.Test_EPVpp(2) & "',EP_R3Freq='" & TestData.Test_EPFreq(2) & "',EP_R3PWidth='" & TestData.Test_EPPWidth(2) & "',EP_R3NWidth='" & TestData.Test_EPNWidth(2) & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" 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) VALUES ('" & 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) & "')" End If For i = 0 To nudSaveCk.Value - 1 @@ -9743,7 +9778,7 @@ WR_File_Error: ItemList = "TestDate,TestTime,FW_Ver,Div_Temp,LDM_R1Value,LDM_R2Value,LDM_R3Value,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_LDMIQC.csv" Case formType = formTypeList.prdLDM - ItemList = "TestDate,TestTime,FW_Ver,Div_Temp,LDM_R1Value,LDM_R2Value,LDM_R3Value,Test_Result" + ItemList = "PV_SN,TestDate,TestTime,FW_Ver,Div_Temp,LDM_R1Value,LDM_R2Value,LDM_R3Value,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_LDM.csv" Case formType = formTypeList.prdVRLDM ItemList = "PV_SN,TestDate,TestTime,FW_Ver,Div_Temp,Cart_Temp,Battery_Level,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq,Test_Result" @@ -9758,7 +9793,7 @@ WR_File_Error: ItemList = "PV_SN,TestDate,TestTime,FW_Ver,EP_R1Vpp,EP_R1Freq,EP_R1PWidth,EP_R1NWidth,EP_R2Vpp,EP_R2Freq,EP_R2PWidth,EP_R2NWidth,EP_R3Vpp,EP_R3Freq,EP_R3PWidth,EP_R3NWidth,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_lowPriceEPPD.csv" Case formTypeList.prdRFMC - ItemList = "PV_SN,TestDate,TestTime,FW_Ver,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq,MC_R1Wave,MC_R1Vpp,MC_R1Freq,MC_R2Wave,MC_R2Vpp,MC_R2Freq,Test_Result" + ItemList = "PV_SN,TestDate,TestTime,FW_Ver,RF_R1Vrms,RF_R1Freq,RF_R2Vrms,RF_R2Freq,RF_R3Vrms,RF_R3Freq,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_lowPriceRFMCPD.csv" Case Else FileName = "Null" @@ -10137,6 +10172,13 @@ WR_File_Error: Case "iqcDsHF" gbDSForm.Visible = True formType = formTypeList.iqcDsHF + Case "iqcHF" + gbIQC.Visible = True + pnIQCRF.Visible = False + pnIQCRun2.Visible = False + pnIQCEP.Visible = False + pnIQCRun3.Visible = False + formType = formTypeList.iqcHF Case "prdHF" gbHFTest.Visible = True formType = formTypeList.prdHF diff --git a/ProductFunctionTester/MySqlMoudule.vb b/ProductFunctionTester/MySqlMoudule.vb index 614be71..6b4b4d0 100644 --- a/ProductFunctionTester/MySqlMoudule.vb +++ b/ProductFunctionTester/MySqlMoudule.vb @@ -1,4 +1,4 @@ -Imports MySql.Data.MySqlClient +Imports MySql.Data.MySqlClient Module MySqlMoudule Private Const LocalHostIP As String = "192.168.0.250" @@ -68,25 +68,24 @@ Module MySqlMoudule DBClose() Return False End Try - End End Function Public Function DBQueryScalar(cmdStr As String) As String - Dim result As String - Try Database_Use() sqlCmd.CommandText = cmdStr sqlCmd.Connection = sqlCon - result = sqlCmd.ExecuteScalar() 'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형 + Dim objResult As Object = sqlCmd.ExecuteScalar() 'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형 - Return result + If objResult Is Nothing OrElse IsDBNull(objResult) Then + Return "False" + End If + Return objResult.ToString() Catch ex As Exception MsgBox("MySQL Command Error:" + vbCrLf + Err.Description) Return "False" End Try - End End Function Public Function DBQueryReader(cmdStr As String) As Integer diff --git a/ProductFunctionTester/PostgreSQLMoudule.vb b/ProductFunctionTester/PostgreSQLMoudule.vb index d9df79a..bd7a0ab 100644 --- a/ProductFunctionTester/PostgreSQLMoudule.vb +++ b/ProductFunctionTester/PostgreSQLMoudule.vb @@ -1,4 +1,4 @@ -Imports Npgsql +Imports Npgsql Module PostgreSQLModule Private pgSqlCon As NpgsqlConnection = New NpgsqlConnection("Host=mes-db.postgres.database.azure.com;Username=jionmt@mes-db;Password=jmtdb6919!!pg;Database=mes-jion-data") @@ -51,25 +51,25 @@ Module PostgreSQLModule End Function Public Function pgDBQueryScalar(cmdStr As String) As String - Dim result As String - Try If pgDBOpen() Then MsgBox("DB 연결을 진행할 수 없습니다.", vbCritical) - Return 0 + Return "False" End If sqlCmd.CommandText = cmdStr sqlCmd.Connection = pgSqlCon - result = sqlCmd.ExecuteScalar() 'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형 + Dim objResult As Object = sqlCmd.ExecuteScalar() 'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형 - Return result + If objResult Is Nothing OrElse IsDBNull(objResult) Then + Return "False" + End If + Return objResult.ToString() Catch ex As Exception MsgBox("MySQL Command Error:" + vbCrLf + Err.Description) Return "False" End Try - End End Function Public Function pgDBQueryReader(cmdStr As String) As Integer