From 506b0a241baaf935eec649c9fd72229d02c84944 Mon Sep 17 00:00:00 2001 From: kje97 Date: Fri, 18 Jul 2025 10:08:11 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20RF=EA=B3=B5=EC=A0=95=20DB=20insert=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProductFunctionTester/Main_Form.vb | 50 ++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb index c2bed39..20098e0 100644 --- a/ProductFunctionTester/Main_Form.vb +++ b/ProductFunctionTester/Main_Form.vb @@ -5947,8 +5947,45 @@ dbFail: Dim sucSwitch As Boolean = False - If dupDATA = 2 Or dupDATA = 3 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 & "'" + 'If dupDATA = 2 Or dupDATA = 3 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 & "'" + + ' If TestError = False Then + ' processNum = TestStepList.RF_ReFail + ' Else + ' 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,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) & "')" + + ' If TestError = False Then + ' processNum = TestStepList.RF_NewFail + ' Else + ' processNum = TestStepList.RF_NewSuc + ' End If + 'End If + + ' PV_SN 존재 여부 쿼리 + Dim checkQuery As String = "SELECT COUNT(*) FROM " & rfTableNow & " WHERE PV_SN = '" & TestData.Test_Serial & "'" + Dim exists As Integer = DBQueryScalar(checkQuery) + + If exists > 0 Then + ' UPDATE 쿼리 + 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(1) & "', MC_R2Freq='" & TestData.Test_MCFreq(1) & + "', 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 @@ -5957,7 +5994,14 @@ 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) & "')" + ' INSERT 쿼리 + 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