From bd7b98805d3340b016f1699ac7a126176e4b1335 Mon Sep 17 00:00:00 2001 From: hyelinjung Date: Tue, 13 Jan 2026 11:02:39 +0900 Subject: [PATCH] =?UTF-8?q?1.=EB=B3=B4=EA=B8=89=ED=98=95=20=EB=AA=A8?= =?UTF-8?q?=EB=8D=B8=20=EA=B2=80=EC=82=AC=20=EB=AA=A8=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(iqc=5Fhfep,=20iqc=5Fep,=20iqc=5Frfepmc=20/=20prd?= =?UTF-8?q?=5FhfLdm,=20prd=5Fep,=20prd=5Frfmc)=202.=EB=B3=B4=EA=B8=89?= =?UTF-8?q?=ED=98=95=20=EB=AA=A8=EB=8D=B8=20=EC=88=98=EC=9E=85=20&=20?= =?UTF-8?q?=EC=83=9D=EC=82=B0=20=EA=B2=80=EC=82=AC=20=ED=9B=84=20DB=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=203.=EB=B3=B4=EA=B8=89=ED=98=95=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EA=B8=B0=EC=A1=B4=20ui=20=EC=9E=AC=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9C=BC=EB=A1=9C=20ui=20=EC=84=A0=ED=83=9D=20?= =?UTF-8?q?=ED=95=A8=EC=88=98=20=EC=83=9D=EC=84=B1=20chooseStatusFunc()=20?= =?UTF-8?q?4.=EB=B2=84=EC=A0=84=202.0.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductFunctionTester/Main_Form.vb | 1302 +++++++++++++++++++++-- ProductFunctionTester/SpectrumModule.vb | 2 +- 2 files changed, 1227 insertions(+), 77 deletions(-) diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index e40e3af..55d843d 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -9,7 +9,7 @@ Imports uPLibrary.Networking.M2Mqtt Public Class Main_Form Public Program_Name As String = "DUALSONIC_Multi_Function_Tester Ver." - Public Program_Version As String = "2.0.6" + Public Program_Version As String = "2.0.9" ''데이터 베이스 테이블 목록 @@ -73,6 +73,12 @@ Public Class Main_Form prdDsHF company iqcHFEP + iqcEP + iqcRFEPMC + prdEP + prdHFLDMEP + prdLowHF + prdRFMC MAX_FORM_TYPE End Enum Private formType As Int16 @@ -87,6 +93,8 @@ Public Class Main_Form Private RfUseYn As Boolean = False Private EpUseYn As Boolean = False Private McUseYn As Boolean = False + Private LdmUseYn As Boolean = False + Private LowPriceUseYn As Boolean = False Private VerificationStep As String Private StartSwitch As Boolean @@ -280,6 +288,7 @@ Public Class Main_Form Public mqttTopic As String = String.Empty Private todayCount As Integer = 1 '' 금일 측정 개수 + Private newTDYnFlag As Boolean = False ''임시 td 생성 여부 Private Sub typeDataSetting() If formType = formTypeList.iqcRFEP Or formType = formTypeList.prdRFEP Then @@ -579,15 +588,14 @@ Public Class Main_Form comboBoxModel.Items.Add(New DictionaryEntry(ModelName, ModelCode)) Next End If - comboBoxModel.Items.Add(New DictionaryEntry("WON", "99")) - comboBoxModel.Text = "MAXIMUM" + 'comboBoxModel.Text = "MAXIMUM" End Sub - Private Function todayCountSet() As Boolean '' + Private Function todayCountSet() As Boolean Dim NotChecked As Boolean = False NowDate = Format(Now, "yyyy-MM-dd") - If formType = formTypeList.iqcHFRFEP = True Or formType = formTypeList.iqcRFEP Or formTypeList.iqcHF Then + If formType = formTypeList.iqcHFRFEP Or formType = formTypeList.iqcRFEP Or formType = formTypeList.iqcHF Or formType = formTypeList.iqcHFEP Or formType = formTypeList.iqcEP Or formType = formTypeList.iqcRFEPMC Then DBCmd = "SELECT COUNT(NUMBER) FROM " & iqcCntTableNow & " WHERE IQC_Date = '" & NowDate & "'" If DBQueryScalar(DBCmd) = 0 Then DBCmd = "INSERT INTO " & iqcCntTableNow & " (IQC_Date) VALUES ('" & NowDate & "')" @@ -617,10 +625,16 @@ Public Class Main_Form DBCmd = "SELECT PD1_DevTotalCnt,PD1_DevOkCnt,PD1_DevNgCnt FROM " & pd1CntTableNow & " WHERE PD1_Date = '" & NowDate & "'" ElseIf formType = formTypeList.iqcHFRFEP Then DBCmd = "SELECT IQC_MAXTotalCnt,IQC_MAXOkCnt,IQC_MAXNgCnt FROM " & iqcCntTableNow & " WHERE IQC_Date = '" & NowDate & "'" - ElseIf formType = formTypeList.iqcRFEP Then + ElseIf formType = formTypeList.iqcRFEP Or formType = formTypeList.iqcEP Or formType = formTypeList.iqcRFEPMC Then DBCmd = "SELECT IQC_ALTOTotalCnt,IQC_ALTOOkCnt,IQC_ALTONgCnt FROM " & iqcCntTableNow & " WHERE IQC_Date = '" & NowDate & "'" - ElseIf formType = formTypeList.iqcHF Then + ElseIf formType = formTypeList.iqcHF Or formType = formTypeList.iqcHFEP Then DBCmd = "SELECT IQC_EFFECTTotalCnt,IQC_EFFECTOkCnt,IQC_EFFECTNgCnt FROM " & iqcCntTableNow & " WHERE IQC_Date = '" & NowDate & "'" + ElseIf formType = formTypeList.prdLowHF Then ''저가형 + DBCmd = "SELECT PD1_LowPriceHFCnt,PD1_LowPriceHFOkCnt,PD1_LowPriceHFNgCnt FROM " & pd1CntTableNow & " WHERE PD1_Date = '" & NowDate & "'" + ElseIf formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Then ''저가형 + DBCmd = "SELECT PD1_LowPriceEPCnt,PD1_LowPriceEPOkCnt,PD1_LowPriceEPNgCnt FROM " & pd1CntTableNow & " WHERE PD1_Date = '" & NowDate & "'" + ElseIf formType = formTypeList.prdRFMC Then ''저가형 + DBCmd = "SELECT PD1_LowPriceRFCnt,PD1_LowPriceRFOKCnt,PD1_LowPriceRFNgCnt FROM " & pd1CntTableNow & " WHERE PD1_Date = '" & NowDate & "'" Else NotChecked = True End If @@ -1937,12 +1951,12 @@ Public Class Main_Form tableName(0) = hfTableNow tableName(1) = rfTableNow - ElseIf formType = formTypeList.prdHF Then + ElseIf formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Then ReDim tableName(0) tableName(0) = hfTableNow - ElseIf formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFEP Then + ElseIf formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdRFEP Or formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Or formType = formTypeList.prdRFMC Then ReDim tableName(0) tableName(0) = rfTableNow @@ -1960,6 +1974,15 @@ Public Class Main_Form Dim DupYn As Int16 = DBQueryScalar(DBCmd) + If formType = formTypeList.prdRFMC Then + DBCmd = "SELECT COUNT(RF_R1Vrms) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()" + + Dim DupRFMCYn As Int16 = DBQueryScalar(DBCmd) + If DupRFMCYn = 0 Then + DupYn = 0 + End If + End If + If DupYn > 0 Then If tableName(i) = hfTableNow Then @@ -2176,7 +2199,7 @@ SettingFail: End Function Private Sub hfTestState(cnt As Int16) - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Then If cnt = HifuTest_Step.Step1 Then txbHFtest1.Text = "측정중" txbHFtest1.BackColor = Color.Yellow @@ -2222,7 +2245,7 @@ SettingFail: End Sub Private Sub hfTestFail(cnt As Int16) - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Then If cnt = HifuTest_Step.Step1 Then txbHFtest1.Text = "FAIL" txbHFtest1.BackColor = Color.Red @@ -2268,7 +2291,7 @@ SettingFail: End Sub Private Sub hfTestSuccess(cnt As Int16) - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Then If cnt = HifuTest_Step.Step1 Then txbHFtest1.Text = "SUCCESS" txbHFtest1.BackColor = Color.Green @@ -2734,8 +2757,22 @@ SettingFail: Public Function EPTestRun() As Boolean Dim ForCnt As Int16 = 0 + Dim chooseStatusFunc As Action(Of Int16) + Dim chooseSuccessFunc As Action(Of Int16) + Dim chooseFailFunc As Action(Of Int16) Try - TestStep = TestList.EP + + If formType = formTypeList.prdHFLDMEP Or formType = formTypeList.iqcEP Or formType = formTypeList.prdEP Then + chooseStatusFunc = AddressOf hfTestState + chooseSuccessFunc = AddressOf hfTestSuccess + chooseFailFunc = AddressOf hfTestFail + TestStep = TestList.HIFU + Else + chooseStatusFunc = AddressOf epTestState + chooseSuccessFunc = AddressOf epTestSuccess + chooseFailFunc = AddressOf epTestFail + TestStep = TestList.EP + End If MeasureTimeFunc(MeasStart) MainTextChange("EP 측정중") @@ -2769,9 +2806,9 @@ SettingFail: For i = 0 To EPTest_Count ForCnt = i - For n = 0 To nudEPRe.Value - epTestState(i) + chooseStatusFunc(i) + DoCommand(":Single") If RunEP(Val(EPFreq(i).Text)) Then @@ -2788,7 +2825,7 @@ SettingFail: If TestData.Test_EPVpp(i) < EPVppMin.Text Or TestData.Test_EPVpp(i) > EPVppMax.Text Then txbWindow.AppendText("Run EP VPP FAIL" & i & " : " & TestData.Test_EPVpp(i) & vbCrLf) - epTestFail(i) + chooseFailFunc(i) ErrorCheck = True 'Exit For Else @@ -2804,7 +2841,7 @@ SettingFail: txbWindow.AppendText("Run EP FREQ FAIL" & i & " : " & TestData.Test_EPNWidth(i) & "/" & TestData.Test_EPPWidth(i) & vbCrLf) If n = nudEPRe.Value Then - epTestFail(i) + chooseFailFunc(i) ErrorCheck = True End If @@ -2831,14 +2868,14 @@ SettingFail: txbWindow.AppendText("Run EP WIDTH FAIL" & i & " : " & TestData.Test_EPNWidth(i) & "/" & TestData.Test_EPPWidth(i) & vbCrLf) If n = nudEPRe.Value Then - epTestFail(i) + chooseFailFunc(i) ErrorCheck = True Exit For End If Else txbWindow.AppendText("Run EP " & i & " : " & TestData.Test_EPVpp(i) & "/" & TestData.Test_EPFreq(i) & "/" & TestData.Test_EPNWidth(i) & "/" & TestData.Test_EPPWidth(i) & vbCrLf) - epTestSuccess(i) + chooseSuccessFunc(i) Exit For End If @@ -2896,6 +2933,7 @@ SettingFail: txbEPtest3.Refresh() End If + ElseIf formType = formTypeList.prdRFEP Or formType = formTypeList.iqcRFEP Or formType = formTypeList.company Then If cnt = 0 Then txbAlIQCEP_1.Text = "진행중" @@ -3370,7 +3408,7 @@ DataFail: End If For i = 1 To nudSaveCk.Value - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Then If prod_reg_data("JOMT", "000000", ProdCode, "82", "0") Then GoTo DataFail End If @@ -3429,24 +3467,25 @@ DataFail: Else txbWindow.AppendText("Product Frequence : " & freqData & "/ Power : " & powerData & vbCrLf) End If + If formType <> formTypeList.prdLowHF Then + For i = 1 To nudSaveCk.Value + sucSwitch = False + If Motor_reg(TDDataSet(TD_Data.motor)) Then + GoTo DataFail + End If - For i = 1 To nudSaveCk.Value - sucSwitch = False - If Motor_reg(TDDataSet(TD_Data.motor)) Then - GoTo DataFail - End If + motorData = Motor_Read() - motorData = Motor_Read() + If motorData = 6 Then + GoTo DataFail + End If - If motorData = 6 Then - GoTo DataFail - End If - - If motorData = TDDataSet(TD_Data.motor) Then - sucSwitch = True - Exit For - End If - Next + If motorData = TDDataSet(TD_Data.motor) Then + sucSwitch = True + Exit For + End If + Next + End If If sucSwitch = False Then GoTo DataFail @@ -3884,8 +3923,22 @@ DataFail: CompanyFunction() Case formTypeList.iqcDsHF, formTypeList.prdDsHF DSTestFunction() + '저가형 Case formTypeList.iqcHFEP iqcHfEpFunction() + Case formTypeList.iqcEP + iqcEpFunction() + Case formTypeList.iqcRFEPMC + iqcRfEpMcFunction() + + Case formTypeList.prdLowHF ''저가형 td 계열 + hfEpFunction() + Case formTypeList.prdHFLDMEP ''저가형 td 계열 -ep + hfLdmEpFunction() + Case formTypeList.prdEP ''저가형 non td 계열 + epfunction() + Case formTypeList.prdRFMC ''저가형 non td 계열 + rfMcfunction() Case Else MsgBox("잘못된 동작 모드가 입력되어 있습니다. 관리자에게 문의해주세요.", vbCritical) End Select @@ -3922,6 +3975,31 @@ DataFail: End Try End Function + Private Function lowEPNumAppoint(PlusCount As Int16) As String + Try + DBCmd = "SELECT PD1_LowPriceEPCnt FROM " & pd1CntTableNow & " WHERE PD1_Date = '" & NowDate & "'" + + Dim altoNum As String = DBQueryScalar(DBCmd) + + If altoNum = "" Then + altoNum = "1" '' 첫 시작일 경우 + Else + altoNum = Val(altoNum) + PlusCount '' 번호 업데이트 + End If + + For i = altoNum.Length To 4 + altoNum = "0" + altoNum + Next + + altoNum = Mid(NowDate, 4, 1) & Mid(NowDate, 6, 2) & Mid(NowDate, 9, 2) & altoNum + Return altoNum + + Catch ex As Exception + MsgBox(ex.Message, vbCritical) + Return "0" + End Try + End Function + Private Function NonTDSerial() As Boolean Dim TDSerial As String = TD_name_load() @@ -3957,8 +4035,15 @@ DataFail: Private Function AltoDataSetting() As Boolean Dim NewSerial As Boolean = False Dim AltoSerial As String = String.Empty + Dim chooseFnc As Func(Of Int16, String) dupDATA = 0 + If formType = formTypeList.prdRFEP Then + chooseFnc = AddressOf altoNumAppoint + Else + chooseFnc = AddressOf lowEPNumAppoint + End If + If NonTDSerial() Then If TestError = False Then MsgBox("제품의 시리얼 번호를 읽는 중 오류가 발생하였습니다.", vbCritical, Program_Name & Program_Version) @@ -3967,10 +4052,12 @@ DataFail: End If NewSerial = True + newTDYnFlag = True Else If NonTDExist() Then NewSerial = True + newTDYnFlag = True Else If StepSearch() Then MsgBox("현 제품의 공정 순서를 확인할 수 없습니다. 데이터가 존재하지 않습니다.", vbCritical, Program_Name & Program_Version) @@ -3989,7 +4076,7 @@ DataFail: While CountWhile - AltoSerial = altoNumAppoint(SerialCount) + AltoSerial = chooseFnc(SerialCount) txbWindow.AppendText("Set Serial Number : " & AltoSerial & vbCrLf) If AltoSerial = "0" Then @@ -4722,6 +4809,117 @@ ErrorEnd: End Function + Private Sub iqcEpFunction() + StartTime = MeasureTimeAll(MeasStart) + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + If txbBarcode.Text = "[START]" Then + For i = 0 To nudOnRe.Value + If JigRun_On() Then + GoTo processEnd + End If + + delay_run(StepDelay) + + If FirmVerCheck() Then + Dim readUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + If readUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo processEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo processEnd + End If + Else + Exit For + End If + + delay_run(StepDelay) + Next + + If BuzzerTestFunc(0) Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If TempTest() Then + TestError = False + GoTo processEnd + End If + + delay_run(StepDelay) + + If EPTestRun() Then + TestError = False + GoTo processEnd + End If + + todayCount += 1 + If saveLocalFile() Then + GoTo processEnd + End If + GoTo SuccessEnd + + Else + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + GoTo ErrorEnd + End If + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ErrorEnd + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ErrorEnd + End If + +SuccessEnd: + Dim csvData As String = "" & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_Temperature(TempData.DivTemp) & "," & 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) & "," & TestError & "" + If Save_Csv(csvData) Then + + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() + Else + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) + If IQC_PostReg() Then + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + + If CountChanage() Then + + txbWindow.AppendText("Run Count Change 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("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() + End If + End If + + + +processEnd: + Jig_End() +ErrorEnd: + myscope.IO.Clear() + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + End Sub + Private Sub iqcHfEpFunction() StartTime = MeasureTimeAll(MeasStart) @@ -4793,6 +4991,11 @@ ErrorEnd: GoTo processEnd End If + todayCount += 1 + If saveLocalFile() Then + GoTo processEnd + End If + GoTo SuccessEnd Else @@ -4811,12 +5014,35 @@ ErrorEnd: SuccessEnd: - If TestError = False Then + Dim csvData As String = "" & 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) & "," & 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) & "," & TestError & "" + + If Save_Csv(csvData) Then + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) FailMain() - txbWindow.AppendText("Total Process Fail" & vbCrLf) Else - SuccessMain() - txbWindow.AppendText("Total Process Success" & vbCrLf) + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) + + If IQC_PostReg() Then + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + + If CountChanage() Then + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + txbWindow.AppendText("Total Process Fail" & vbCrLf) + Else + SuccessMain() + txbWindow.AppendText("Total Process Success" & vbCrLf) + End If + Else + txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) + FailMain() + End If + Else + txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() + End If End If processEnd: @@ -4827,6 +5053,158 @@ ErrorEnd: txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) End Sub + Private Sub iqcRfEpMcFunction() + Try + StartTime = MeasureTimeAll(MeasStart) + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + + If txbBarcode.Text = "[START]" Then + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo ProcessEnd + End If + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + Else + Exit For + End If + delay_run(StepDelay) + Next + + If BuzzerTestFunc(0) Then + TestError = False + GoTo ProcessEnd + End If + + delay_run(StepDelay) + + If TempTest() Then + TestError = False + GoTo ProcessEnd + End If + + + If RFTestRun() Then + FailMain() + GoTo ProcessEnd + End If + + If BuzzerTestFunc(1) Then + TestError = False + GoTo ProcessEnd + End If + + delay_run(StepDelay) + + If MCTestRunSp() Then + FailMain() + GoTo ProcessEnd + End If + + If BuzzerTestFunc(2) Then + TestError = False + GoTo ProcessEnd + End If + + delay_run(StepDelay) + + If EPTestRun() Then + FailMain() + GoTo ProcessEnd + End If + + todayCount += 1 + If saveLocalFile() Then + GoTo ProcessEnd + End If + + GoTo RunSuccess + + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + Else + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + GoTo NormalEnd + End If + + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + + Catch ex As Exception + MsgBox("ERR!! :: " & ex.Message, vbCritical) + GoTo ProcessEnd + End Try + +RunSuccess: + Dim csvData As String = "" & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_Temperature(TempData.DivTemp) & "," & 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) & "," & TestError & "" + If Save_Csv(csvData) Then + + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() + Else + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) + + If IQC_PostReg() Then + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + + If CountChanage() Then + + txbWindow.AppendText("Run Count Change 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("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() + End If + End If + +ProcessEnd: + Jig_End() +NormalEnd: + myscope.IO.Clear() + Try + If TestError = False Then + Jig_End() ' 지그 전원 차단 + TestMode_On(0) ' MFT 모드 초기화 + txbWindow.AppendText("비정상 종료로 인한 전원 차단" & vbCrLf) + End If + Catch normalEx As Exception + txbWindow.AppendText("정상 종료 처리 중 오류: " & normalEx.Message & vbCrLf) + End Try + + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + End Sub Private Sub iqcHfFunction() StartTime = MeasureTimeAll(MeasStart) @@ -5238,6 +5616,60 @@ NormalEnd: End If End Function + Private Function RFMc_PostReg() As Boolean + + If ckbPostgre.Checked = True Then + DBCmd = "select exists(select 1 from prods where td_serial = '" & TestData.Test_Serial & "') AS A;" + 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());" + 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 & "';" + End If + + txbWindow.AppendText(DBCmd & vbCrLf) + + If pgDBCommand(DBCmd) Then + Return True + Else + Return False + End If + Else + Return True + End If + End Function + + Private Function EP_PostReg() As Boolean + + If ckbPostgre.Checked = True Then + DBCmd = "select exists(select 1 from prods where td_serial = '" & TestData.Test_Serial & "') AS A;" + 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_ep1_vpp, p2_ep1_freq, p2_ep1_pwidth, p2_ep1_nwidth, p2_ep2_vpp, p2_ep2_freq, p2_ep2_pwidth, p2_ep2_nwidth, p2_ep3_vpp, p2_ep3_freq, p2_ep3_pwidth, p2_ep3_nwidth, created_at, updated_at) " & + "VALUES('" & TestData.Test_Serial & "', '" & nudJigNum.Value & "', '" & NowDate & "', '" & NowTime & "','" & TestError & "', '" & 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) & "',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_ep1_vpp = '" & TestData.Test_EPVpp(0) & "',p2_ep1_freq = '" & TestData.Test_EPFreq(0) & "',p2_ep1_pwidth = '" & TestData.Test_EPPWidth(0) & "',p2_ep1_nwidth = '" & TestData.Test_EPNWidth(0) & "',p2_ep2_vpp = '" & TestData.Test_EPVpp(1) & "',p2_ep2_freq = '" & TestData.Test_EPFreq(1) & "',p2_ep2_pwidth = '" & TestData.Test_EPNWidth(1) & "',p2_ep2_nwidth = '" & TestData.Test_EPNWidth(1) & "',p2_ep3_vpp = '" & TestData.Test_EPVpp(2) & "',p2_ep3_freq = '" & TestData.Test_EPFreq(2) & "',p2_ep3_pwidth = '" & TestData.Test_EPPWidth(2) & "', p2_ep3_nwidth = '" & TestData.Test_EPNWidth(2) & "', updated_at = NOW() WHERE td_serial = '" & TestData.Test_Serial & "';" + End If + + txbWindow.AppendText(DBCmd & vbCrLf) + + If pgDBCommand(DBCmd) Then + Return True + Else + Return False + End If + Else + Return True + End If + End Function + + Private Sub hfFunction() StartTime = MeasureTimeAll(MeasStart) TestData.Test_Serial = txbBarcode.Text @@ -5406,6 +5838,502 @@ NormalEnd: End If End Function + + + Private Sub hfEpFunction() + StartTime = MeasureTimeAll(MeasStart) + TestData.Test_Serial = txbBarcode.Text + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + If TDDataSearch() Then + FailMain() + GoTo NormalEnd + End If + + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo ProcessEnd + End If + + delay_run(StepDelay) + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + Else + Exit For + End If + + delay_run(StepDelay) + + Next + + If BatteryTest() Then + FailMain() + GoTo ProcessEnd + End If + + If TempTest() Then + FailMain() + GoTo ProcessEnd + End If + + If HFTestRun() Then + FailMain() + GoTo ProcessEnd + End If + + If DataWrite(ModelCode.PadRight(2, "0"c)) Then + FailMain() + GoTo ProcessEnd + End If + + GoTo runSuccess + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + FailMain() + GoTo NormalEnd + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + FailMain() + GoTo NormalEnd + End If +runSuccess: + If HIFU_PostReg() Then + txbWindow.AppendText("PostgreSQL HIFU 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("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + End If + Else + txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) + FailMain() + End If + Else + txbWindow.AppendText("DB HIFU Data Save : FAIL" & vbCrLf) + FailMain() + End If + Else + txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() + End If +ProcessEnd: + Jig_End() + +NormalEnd: + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + + End Sub + + + Private Sub hfLdmEpFunction() + Try + StartTime = MeasureTimeAll(MeasStart) + TestData.Test_Serial = txbBarcode.Text + + InitializeDeviceState() + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + If TDDataSearch() Then + FailMain() + GoTo NormalEnd + End If + + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo ProcessEnd + End If + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + Else + Exit For + End If + + Next + + If TDSetCheck() Then + FailMain() + GoTo ProcessEnd + End If + + If EPTestRun() Then + FailMain() + GoTo ProcessEnd + End If + + GoTo RunSuccess + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + + Catch ex As Exception + MsgBox("ERR!! :: " & ex.Message, vbCritical) + GoTo ProcessEnd + End Try +RunSuccess: + If EP_PostReg() Then + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + If dbEPSave() Then + txbWindow.AppendText("DB Data Save : OK" & vbCrLf) + If CountChanage() Then + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & 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) & "," & TestError & "" + + If Save_Csv(csvData) Then + + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() + + Else + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + + End If + Else + + txbWindow.AppendText("Run Count Change Save : 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 +ProcessEnd: + Jig_End() +NormalEnd: + myscope.IO.Clear() + End Sub + + + Private Sub epfunction() + + Try + StartTime = MeasureTimeAll(MeasStart) + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + + If txbBarcode.Text <> "[START]" Then + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + GoTo startFail + End If + + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo ProcessEnd + End If + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + Else + Exit For + End If + + Next + + If AltoDataSetting() Then + TestError = False + newTDYnFlag = False + GoTo ProcessEnd + End If + + delay_run(StepDelay) + + + If TempTest() Then + TestError = False + GoTo ProcessEnd + End If + + If BatteryTest() Then + TestError = False + GoTo ProcessEnd + End If + + If EPTestRun() Then + FailMain() + GoTo ProcessEnd + End If + + If newTDYnFlag = False Then + If DataWriteAL() Then + TestError = False + newTDYnFlag = False + GoTo ProcessEnd + End If + End If + + GoTo RunSuccess + + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo startFail + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo startFail + End If + + Catch ex As Exception + MsgBox("ERR!! :: " & ex.Message, vbCritical) + GoTo ProcessEnd + End Try +RunSuccess: + newTDYnFlag = False + If EP_PostReg() Then + txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf) + If dbEPSave() Then + txbWindow.AppendText("DB Data Save : OK" & vbCrLf) + If CountChanage() Then + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & 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) & "," & TestError & "" + + If Save_Csv(csvData) Then + + txbWindow.AppendText("CSV Data Save : FAIL" & vbCrLf) + FailMain() + + Else + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + + End If + Else + + txbWindow.AppendText("Run Count Change Save : 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 +ProcessEnd: + Jig_End() +startFail: + myscope.IO.Clear() + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + End Sub + + + Private Sub rfMcfunction() + StartTime = MeasureTimeAll(MeasStart) + + If StartSwitch = True Then + If JigSerial.IsOpen = True Then + + If txbBarcode.Text <> "[START]" Then + MsgBox("잘못된 시작 명령어를 입력하였습니다.", vbExclamation, Program_Name & Program_Version) + GoTo NormalEnd + End If + + For i = 0 To nudOnRe.Value + + If JigRun_On() Then + GoTo ProcessEnd + End If + + If FirmVerCheck() Then + + Dim ReadUni As Byte() = Encoding.Unicode.GetBytes(TestData.Test_Firmware) + + If ReadUni(0) < 57 Then + MsgBox("잘못된 펌웨어 버전입니다. 버전을 확인하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + If i = nudOnRe.Value Then + MsgBox("전원 ON에 실패하였습니다. 다시 시도하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo ProcessEnd + End If + + Else + Exit For + End If + + Next + + If AltoDataSetting() Then + TestError = False + newTDYnFlag = False + GoTo ProcessEnd + End If + + If TempTest() Then + GoTo ProcessEnd + End If + + If BatteryTest() Then + TestError = False + GoTo NormalEnd + End If + + If RFTestRun() Then + GoTo ProcessEnd + End If + + If MCTestRunSp() Then + FailMain() + GoTo ProcessEnd + End If + + If newTDYnFlag = False Then + If DataWriteAL() Then + TestError = False + newTDYnFlag = False + GoTo ProcessEnd + End If + End If + + GoTo SuccessEnd + + Else + MsgBox("지그를 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + Else + MsgBox("스코프와 스펙트럼을 연결한 후 동작하여 주십시오.", vbCritical, Program_Name & Program_Version) + GoTo NormalEnd + End If + +SuccessEnd: + newTDYnFlag = False + 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() + + Else + + txbWindow.AppendText("CSV Data Save : OK" & vbCrLf) + + If CountChanage() Then + + txbWindow.AppendText("Run Count Change Save : OK" & vbCrLf) + + If TestError = False Then + FailMain() + Else + SuccessMain() + End If + + Else + + txbWindow.AppendText("Run Count Change Save : FAIL" & vbCrLf) + FailMain() + + End If + + End If + Else + txbWindow.AppendText("DB Data Save : FAIL" & vbCrLf) + FailMain() + End If + + Else + txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf) + FailMain() + End If + + +ProcessEnd: + Jig_End() + +NormalEnd: + myscope.IO.Clear() + txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf) + End Sub + Private Sub DSTestFunction() StartTime = MeasureTimeAll(MeasStart) @@ -5755,11 +6683,11 @@ ProcessEnd: End If Select Case formType - Case formTypeList.prdHF, formTypeList.iqcDsHF, formTypeList.prdDsHF + Case formTypeList.prdHF, formTypeList.iqcDsHF, formTypeList.prdDsHF, formTypeList.prdLowHF HIFUReCount() - Case formTypeList.prdRFMCEP, formTypeList.prdRFEP + Case formTypeList.prdRFMCEP, formTypeList.prdRFEP, formTypeList.prdEP, formTypeList.prdHFLDMEP, formTypeList.prdRFMC RFReCount() - Case formTypeList.iqcHFRFEP, formTypeList.iqcRFEP, formTypeList.iqcHF + Case formTypeList.iqcHFRFEP, formTypeList.iqcRFEP, formTypeList.iqcHF, formTypeList.iqcHFEP, formTypeList.iqcEP, formTypeList.iqcRFEPMC IQCReCount() End Select @@ -5784,12 +6712,14 @@ ProcessEnd: End If Else 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 + 'If processNum = TestStepList.HF_NewSuc Or processNum = TestStepList.HF_ReSuc 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_NEWFail Or processNum = TestStepList.HF_ReFail Then + 'If processNum = TestStepList.HF_NEWFail Or processNum = TestStepList.HF_ReFail Then + If processNum = TestStepList.HF_ReFail Then txbOkCount.Text = Val(txbOkCount.Text) - 1 txbNgCount.Text = Val(txbNgCount.Text) + 1 End If @@ -5839,10 +6769,14 @@ ProcessEnd: DBCmd = "UPDATE " & pd1CntTableNow & " SET PD1_MaxRFTotalCnt = '" & txbDayCount.Text & "', PD1_MaxRFOkCnt = '" & txbOkCount.Text & "', PD1_MaxRFNgCnt = '" & txbNgCount.Text & "' WHERE PD1_Date = '" & NowDate & "'" ElseIf formType = formTypeList.iqcHFRFEP Then DBCmd = "UPDATE " & iqcCntTableNow & " SET IQC_MAXTotalCnt = '" & txbDayCount.Text & "', IQC_MAXOkCnt = '" & txbOkCount.Text & "', IQC_MAXNgCnt = '" & txbNgCount.Text & "' WHERE IQC_Date = '" & NowDate & "'" - ElseIf formType = formTypeList.iqcRFEP Then + ElseIf formType = formTypeList.iqcRFEP Or formType = formTypeList.iqcEP Or formType = formTypeList.iqcRFEPMC Then DBCmd = "UPDATE " & iqcCntTableNow & " SET IQC_ALTOTotalCnt = '" & txbDayCount.Text & "', IQC_ALTOOkCnt = '" & txbOkCount.Text & "', IQC_ALTONgCnt = '" & txbNgCount.Text & "' WHERE IQC_Date = '" & NowDate & "'" - ElseIf formType = formTypeList.iqcHF Then + ElseIf formType = formTypeList.iqcHF Or formType = formTypeList.iqcHFEP Then DBCmd = "UPDATE " & iqcCntTableNow & " SET IQC_EFFECTTotalCnt = '" & txbDayCount.Text & "', IQC_EFFECTOkCnt = '" & txbOkCount.Text & "', IQC_EFFECTNgCnt = '" & txbNgCount.Text & "' WHERE IQC_Date = '" & NowDate & "'" + ElseIf formType = formTypeList.prdLowHF Then ''저가형 + DBCmd = "UPDATE " & pd1CntTableNow & " SET PD1_LowPriceHFCnt = '" & txbDayCount.Text & "', PD1_LowPriceHFOkCnt = '" & txbOkCount.Text & "', PD1_LowPriceHFNgCnt = '" & txbNgCount.Text & "' WHERE PD1_Date = '" & NowDate & "'" + ElseIf formType = formTypeList.prdHFLDMEP Or formType = formTypeList.prdEP Then ''저가형 + DBCmd = "UPDATE " & pd1CntTableNow & " SET PD1_LowPriceEPCnt = '" & txbDayCount.Text & "', PD1_LowPriceEPOkCnt = '" & txbOkCount.Text & "', PD1_LowPriceEPNgCnt = '" & txbNgCount.Text & "' WHERE PD1_Date = '" & NowDate & "'" End If If DBCommand(DBCmd) Then @@ -5972,7 +6906,7 @@ ProcessEnd: Case TestList.Battey - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdHFLDMEP Then ChangeTxb = txbBat ElseIf formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then @@ -5984,7 +6918,7 @@ ProcessEnd: Case TestList.Temp - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdHFLDMEP Then ChangeTxb = txbTemp ElseIf formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then ChangeTxb = txbDSTemp @@ -5994,9 +6928,9 @@ ProcessEnd: Case TestList.HIFU - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdHFLDMEP Then ChangeTxb = txbHFresult - ElseIf formType = formTypeList.iqcHFRFEP Or formType = formTypeList.iqcHF Then + ElseIf formType = formTypeList.iqcHFRFEP Or formType = formTypeList.iqcHF Or formType = formTypeList.iqcEP Then ChangeTxb = txbIQCHF ElseIf formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then ChangeTxb = txbDSHifu @@ -6043,7 +6977,7 @@ ProcessEnd: End If Case TestList.DataWrite - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Then ChangeTxb = txbTDreg ElseIf formType = formTypeList.iqcDsHF Or formType = formTypeList.prdDsHF Then @@ -6054,7 +6988,7 @@ ProcessEnd: End If Case TestList.DBWrite - If formType = formTypeList.prdHF Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdLowHF Or formType = formTypeList.prdEP Or formType = formTypeList.prdHFLDMEP Then ChangeTxb = txbDBreg Else @@ -6264,6 +7198,177 @@ dbFail: TestRunningState(testRunningList.Success, Color.Green) Return True +dbFail: + txbWindow.AppendText("DataBase Save FAIL" & vbCrLf) + MeasureTimeFunc(MeasEnd) + TestRunningState(testRunningList.Fail, Color.Red) + TestError = False + Return False + + End Function + + Private Function dbRFMCSave() As Boolean + MeasureTimeFunc(MeasStart) + MainTextChange("DB입력중..") + + Dim sucSwitch As Boolean = False + + DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;" + + Dim DupYn As Boolean = DBQueryScalar(DBCmd) + + DBCmd = "SELECT EXISTS(SELECT RF_R1Vrms FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;" + + Dim DupRFMCYn As Boolean = DBQueryScalar(DBCmd) + + 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 & "'" + + If DupRFMCYn = True Then + If TestError = False Then + processNum = TestStepList.RF_ReFail + Else + processNum = TestStepList.RF_ReSuc + End If + Else + If TestError = False Then + processNum = TestStepList.RF_NewFail + Else + processNum = TestStepList.RF_NewSuc + End If + 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) & "')" + + If TestError = False Then + processNum = TestStepList.RF_NewFail + Else + processNum = TestStepList.RF_NewSuc + End If + End If + + If DBCommand(DBCmd) = False Then + GoTo dbFail + End If + + If TDDataSet(TD_Data.TestStep) = "11" 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 & "')" + + If DBCommand(DBCmd) = False Then + txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf) + End If + GoTo dbFail + End If + + For i = 1 To nudSaveCk.Value + sucSwitch = False + DBCmd = "UPDATE " & NonTDTableNow & " SET TestStep='" & processNum & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" + + If DBCommand(DBCmd) = False Then + GoTo dbFail + End If + + DBCmd = "SELECT TestStep FROM " & NonTDTableNow & " WHERE PV_SN = '" & TestData.Test_Serial & "'" + + Dim tdState As Int16 = 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) + Return True + +dbFail: + txbWindow.AppendText("DataBase Save FAIL" & vbCrLf) + MeasureTimeFunc(MeasEnd) + TestError = False + Return False + + End Function + + '저가형 ep + Private Function dbEPSave() As Boolean + MeasureTimeFunc(MeasStart) + MainTextChange("DB입력중..") + TestStep = TestList.DBWrite + TestRunningState(testRunningList.Running, Color.Yellow) + + Dim sucSwitch As Boolean = False + Dim chooseTDTable As String = If(formType = formTypeList.prdHFLDMEP, TDTableNow, NonTDTableNow) + + DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;" + + Dim DupYn As Boolean = DBQueryScalar(DBCmd) + + If DupYn = True Then + DBCmd = "UPDATE " & rfTableNow & " SET TestDate='" & NowDate & "',TestTime='" & NowTime & "',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 & "'" + + If TestError = False Then + processNum = TestStepList.RF_ReFail + Else + processNum = TestStepList.RF_ReSuc + 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) & "')" + + If TestError = False Then + processNum = TestStepList.RF_NewFail + Else + processNum = TestStepList.RF_NewSuc + End If + End If + + If DBCommand(DBCmd) = False Then + GoTo dbFail + End If + + + If TDDataSet(TD_Data.TestStep) = "11" 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 & "')" + + If DBCommand(DBCmd) = False Then + txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf) + End If + GoTo dbFail + End If + + + For i = 1 To nudSaveCk.Value + sucSwitch = False + DBCmd = "UPDATE " & chooseTDTable & " SET TestStep='" & processNum & "' WHERE PV_SN = '" & TestData.Test_Serial & "'" + + If DBCommand(DBCmd) = False Then + GoTo dbFail + End If + + DBCmd = "SELECT TestStep FROM " & chooseTDTable & " WHERE PV_SN = '" & TestData.Test_Serial & "'" + + Dim tdState As Int16 = 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) + TestRunningState(testRunningList.Success, Color.Green) + Return True + dbFail: txbWindow.AppendText("DataBase Save FAIL" & vbCrLf) MeasureTimeFunc(MeasEnd) @@ -6305,7 +7410,7 @@ dbFail: GoTo dbFail End If - If formType = formTypeList.prdHF Or formType = formTypeList.prdRFMCEP Then + If formType = formTypeList.prdHF Or formType = formTypeList.prdRFMCEP Or formType = formTypeList.prdLowHF Then Dim sucSwitch As Boolean = False For i = 1 To nudSaveCk.Value @@ -7482,10 +8587,10 @@ WR_File_Error: Case formTypeList.full ItemList = "TestDate,TestTime,PV_SN,FW_VER,Battery_Level,Div_Temp,Cart_Temp,HIFU_6850,HIFU_Diff1,HIFU_7000,HIFU_Diff2,HIFU_7150,RF_1VRMS,RF_1Freq,RF_2VRMS,RF_2Freq,RF_3VRMS,RF_3Freq,MC_PlusWave,MC_PlusVpp,MC_MinusWave,MC_MinusVpp,EP_1Vpp,EP_1Freq,EP_1PWidth,EP_1NWidth,EP_2Vpp,EP_2Freq,EP_2PWidth,EP_2NWidth,EP_3Vpp,EP_3Freq,EP_3PWidth,EP_3NWidth,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_ALL.csv" - Case formTypeList.prdHF + Case formTypeList.prdHF, formType = formTypeList.prdLowHF ItemList = "PV_SN,TestDate,TestTime,FW_Ver,BatteryLv,DivTemp,CtTemp,HF_R1Value,HF_R2Value,HF_R3Value,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_HF.csv" - Case formTypeList.prdRFMCEP + Case formTypeList.prdRFMCEP, formType = formTypeList.prdHFLDMEP, formType = formTypeList.prdEP, formType = 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,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) & "_RF.csv" Case formTypeList.iqcRFEP @@ -7494,7 +8599,7 @@ WR_File_Error: Case formTypeList.prdRFEP 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,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) & "_ALTOPD.csv" - Case formTypeList.iqcHFRFEP + Case formTypeList.iqcHFRFEP, formTypeList.iqcHFEP, formTypeList.iqcRFEPMC ItemList = "TestDate,TestTime,FW_Ver,Div_Temp,HF_R1Value,HF_R2Value,HF_R3Value,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,Test_Result" FileName = FilePath & "\" & DateAndTime.Year(Now) & "_" & DateAndTime.Month(Now) & "_" & DateAndTime.Day(Now) & "_IQC.csv" Case formTypeList.iqcHF @@ -7737,25 +8842,14 @@ WR_File_Error: RfUseYn = False EpUseYn = False McUseYn = False + LdmUseYn = False + LowPriceUseYn = False checkBoxHfUse.Checked = False checkBoxRfUse.Checked = False checkBoxEpUse.Checked = False checkBoxMcUse.Checked = False - If ModelCode.Equals("99") Then - comboBoxVerificationStep.DisplayMember = "Key" - comboBoxVerificationStep.ValueMember = "Value" - comboBoxVerificationStep.Items.Clear() - comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(HF/EP)", "iqcHFEP")) - checkBoxHfUse.Checked = True - checkBoxEpUse.Checked = True - If comboBoxVerificationStep.Items.Count > 0 Then - comboBoxVerificationStep.SelectedIndex = 0 - End If - Return - End If - - DBCmd = "SELECT DeviceTypeCode, CartTypeName, TDUseYn, HifuUseYn, RfUseYn, EpUseYn, McUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" + DBCmd = "SELECT DeviceTypeCode, CartTypeName, TDUseYn, HifuUseYn, RfUseYn, EpUseYn, McUseYn, LdmUseYn, LowPriceUseYn FROM " & ApplyModelInfoDB & " WHERE ModelCode = '" & ModelCode & "' LIMIT 1" If DBQueryReader(DBCmd) Then DeviceTypeCode = sqlDataQuery(0) CartTypeName = sqlDataQuery(1) @@ -7778,6 +8872,14 @@ WR_File_Error: McUseYn = True checkBoxMcUse.Checked = True End If + If sqlDataQuery(7) = "Y" Then + LdmUseYn = True + checkBoxHfUse.Checked = True + End If + If sqlDataQuery(8) = "Y" Then + LowPriceUseYn = True + End If + End If comboBoxVerificationStep.DisplayMember = "Key" @@ -7791,14 +8893,34 @@ WR_File_Error: If HifuUseYn = True And RfUseYn = False And EpUseYn = False Then comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(HF)", "iqcHF")) End If - If HifuUseYn = False And RfUseYn = True And EpUseYn = True Then + If HifuUseYn = False And RfUseYn = True And EpUseYn = True And LowPriceUseYn = False Then comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(RF/EP)", "iqcRFEP")) End If - If HifuUseYn = True Then + '저가형 모델 + If LowPriceUseYn = True Then + If EpUseYn = True And HifuUseYn = False And RfUseYn = False And LdmUseYn = False Then + comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(EP)", "iqcEP")) + End If + If HifuUseYn = True Or LdmUseYn = True Then + comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(HF or LDM)/EP)", "iqcHFLDMEP")) ''맥시멈 수입화면 + comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산2(HF or LDM)", "prdHFLDM")) ''맥시멈 hf 생산 화면 + comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산1(EP)", "prdHFLDMEP")) ''맥시멈 hf 생산 화면 + End If + If McUseYn = True And HifuUseYn = False Then + comboBoxVerificationStep.Items.Add(New DictionaryEntry("수입검사(RF/EP/MC)", "iqcRFEPMC")) ''맥시멈 생산 화면 + comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산2(RF/MC)", "prdRFMC")) ''맥시멈 생산 화면 + End If + If EpUseYn = True And (HifuUseYn = False And LdmUseYn = False) Then + comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산1(EP)", "prdEP")) ''맥시멈 hf 생산 화면 + End If + End If + + + If HifuUseYn = True And LowPriceUseYn = False Then comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산1(HF측정/정보입력)", "prdHF")) End If - If RfUseYn = True And EpUseYn = True And McUseYn = True Then + If RfUseYn = True And EpUseYn = True And McUseYn = True And LowPriceUseYn = False Then comboBoxVerificationStep.Items.Add(New DictionaryEntry("생산2(RF/MC/EP)", "prdRFMCEP")) End If If RfUseYn = True And EpUseYn = True And McUseYn = False Then @@ -7814,7 +8936,7 @@ WR_File_Error: End If End If - If RfUseYn = True And EpUseYn = True Then + If RfUseYn = True And EpUseYn = True And LowPriceUseYn = False Then comboBoxVerificationStep.Items.Add(New DictionaryEntry("업체전용(RF/EP)", "company")) End If @@ -7835,6 +8957,9 @@ WR_File_Error: gbHFTest.Visible = False gbRFMCEP.Visible = False gbStep.Visible = False + If lbIQCHF.Text.Equals("3. Cos-Up") Then + lbIQCHF.Text = "1. HIFU" + End If Select Case VerificationStep Case "iqcHFRFEP" @@ -7872,13 +8997,38 @@ WR_File_Error: Case "company" gbAltoIQC.Visible = True formType = formTypeList.company - Case "iqcHFEP" + + '저가형 모델 + Case "iqcHFLDMEP" gbIQC.Visible = True pnIQCRF.Visible = True pnIQCRun2.Visible = True pnIQCEP.Visible = True pnIQCRun3.Visible = True formType = formTypeList.iqcHFEP + Case "iqcEP" + gbIQC.Visible = True + pnIQCRF.Visible = False + pnIQCRun2.Visible = False + pnIQCEP.Visible = False + pnIQCRun3.Visible = False + lbIQCHF.Text = "3. Cos-Up" + formType = formTypeList.iqcEP + Case "iqcRFEPMC" + gbRFMCEP.Visible = True + formType = formTypeList.iqcRFEPMC + Case "prdHFLDM" + gbHFTest.Visible = True + formType = formTypeList.prdLowHF + Case "prdHFLDMEP" + gbHFTest.Visible = True + formType = formTypeList.prdHFLDMEP + Case "prdEP" + gbHFTest.Visible = True + formType = formTypeList.prdEP + Case "prdRFMC" + gbRFMCEP.Visible = True + formType = formTypeList.prdRFMC End Select changeMode() diff --git a/ProductFunctionTester/SpectrumModule.vb b/ProductFunctionTester/SpectrumModule.vb index 2f4d2a8..e87c483 100644 --- a/ProductFunctionTester/SpectrumModule.vb +++ b/ProductFunctionTester/SpectrumModule.vb @@ -10,7 +10,7 @@ mySpec = New Ivi.Visa.Interop.FormattedIO488 mySpec.IO = myMgr.Open(SpecID) - 'mySpec.IO.Clear() + mySpec.IO.Clear() mySpec.IO.Timeout = ToCount strQueryRes = SpecQueryStr("*IDN?")