From a1b1852a91be067246494ae528da59bfd0bd7f48 Mon Sep 17 00:00:00 2001 From: hyelinjung Date: Mon, 30 Mar 2026 11:33:49 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=A7=88=EB=A6=84=EB=AA=A8=20=EA=B2=80?= =?UTF-8?q?=EC=82=AC=20EP,=20RF=20=EA=B0=9C=EB=B3=84=20=EA=B8=88=EC=9D=BC?= =?UTF-8?q?=20=EA=B2=80=EC=82=AC=20=EC=88=98=EB=9F=89=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=202.=20RF=20=EA=B2=80=EC=82=AC=20PREQ=20?= =?UTF-8?q?=EA=B0=92=20=EB=B3=80=EC=88=98=20=ED=83=80=EC=9E=85=20int16=20-?= =?UTF-8?q?>=20double=20=EB=B3=80=EA=B2=BD=ED=95=B4=20=EC=98=A4=EB=B2=84?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductFunctionTester/Main_Form.vb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index f69ac73..9f69884 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -229,7 +229,7 @@ Public Class Main_Form Public Test_HFData() As Double Public Test_HFInterval() As Single Public Test_RFVRMS() As Single - Public Test_RFFreq() As Int16 + Public Test_RFFreq() As Double Public Test_RFPWidth() As Single Public Test_RFNWidth() As Single Public Test_MCVpp() As Single @@ -2209,20 +2209,19 @@ Public Class Main_Form End If For i = 0 To tableName.Length - 1 - DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & - " AND DATE(TestDate) = CURDATE()" - - 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()" + DBCmd = "SELECT IFNULL(RF_R1Vrms,0) 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 + ElseIf formType = formTypeList.prdEP Then + DBCmd = "SELECT IFNULL(EP_R1Vpp,0) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()" + Else + DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & + " AND DATE(TestDate) = CURDATE()" End If + Dim DupYn As Int16 = DBQueryScalar(DBCmd) + If DupYn > 0 Then If tableName(i) = hfTableNow Then @@ -2850,7 +2849,7 @@ SettingFailLDM: GoTo forSettingFail End If - TestData.Test_RFFreq(i) = Convert.ToDouble(ScopeData).ToString("f12") / 1000000 + TestData.Test_RFFreq(i) = Convert.ToDouble(ScopeData) / 1000000 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