From ddb6c6220a7fe2d1b754aa5d9c73124c66f169da Mon Sep 17 00:00:00 2001
From: hyelinjung <gkdldu4@naver.com>
Date: Wed, 21 Jan 2026 11:12:24 +0900
Subject: [PATCH] =?UTF-8?q?1.=EB=B3=B4=EA=B8=89=ED=98=95=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20hf=20&=20ep=20=EA=B2=80=EC=82=AC=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20ep=20=EB=A8=BC=EC=A0=80=20=EC=88=98=ED=96=89=20->?=
 =?UTF-8?q?=20=EA=B8=B0=EC=A1=B4=20ep=20=EA=B2=80=EC=82=AC=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20pcb=20td=20=EB=B2=88=ED=98=B8=EC=99=80=20=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=ED=95=98=EB=8A=94=20td=20=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EB=B9=84=EA=B5=90=ED=95=98=EB=8A=94=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC=202.=EB=B2=84=EC=A0=84=202?=
 =?UTF-8?q?.1.2=203.=20ep=20=EA=B2=80=EC=82=AC=EC=9D=BC=20=EB=95=8C=20td?=
 =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EC=8B=9C(step=20=3D11)=20NonTD=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=83=9D=EC=84=B1=20->won=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EC=A0=9C?=
 =?UTF-8?q?=EC=99=B8=204.=EB=B3=B4=EA=B8=89=ED=98=95=20=EB=AA=A8=EB=8D=B8?=
 =?UTF-8?q?=20rf,ep=20=EA=B2=80=EC=82=AC=20nas=20db=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=20=EC=8B=9C=20=EC=84=B1=EA=B3=B5=ED=95=B4=EB=8F=84=20=EC=8B=A4?=
 =?UTF-8?q?=ED=8C=A8=20=EB=A1=9C=EC=A7=81=EC=9C=BC=EB=A1=9C=20=EC=A7=84?=
 =?UTF-8?q?=ED=96=89=EB=90=98=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=A0=95?=
 =?UTF-8?q?=EC=83=81=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 | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb
index 72a2757..ecf7d7c 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.1.0"
+    Public Program_Version As String = "2.1.2"
 
     ''데이터 베이스 테이블 목록
 
@@ -5994,10 +5994,10 @@ NormalEnd:
 
                     Next
 
-                    If TDSetCheck() Then
-                        FailMain()
-                        GoTo ProcessEnd
-                    End If
+                    'If TDSetCheck() Then
+                    '    FailMain()
+                    '    GoTo ProcessEnd
+                    'End If
 
                     If EPTestRun() Then
                         FailMain()
@@ -7258,8 +7258,9 @@ dbFail:
 
             If DBCommand(DBCmd) = False Then
                 txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
+                GoTo dbFail
             End If
-            GoTo dbFail
+
         End If
 
         For i = 1 To nudSaveCk.Value
@@ -7303,7 +7304,7 @@ dbFail:
         TestRunningState(testRunningList.Running, Color.Yellow)
 
         Dim sucSwitch As Boolean = False
-        Dim chooseTDTable As String = If(formType = formTypeList.prdHFLDMEP, TDTableNow, NonTDTableNow)
+        Dim chooseTDTable As String = TDTableNow
 
         DBCmd = "SELECT EXISTS(SELECT 1 FROM " & rfTableNow & " WHERE PV_SN='" & TestData.Test_Serial & "') AS A;"
 
@@ -7332,17 +7333,20 @@ dbFail:
             GoTo dbFail
         End If
 
+        If Not formType = formTypeList.prdHFLDMEP Then
+            chooseTDTable = NonTDTableNow
+            If TDDataSet(TD_Data.TestStep) = "11" Then
+                DBCmd = "INSERT INTO " & chooseTDTable & "(TestStep,PV_SN,P1_DateTime,Fw_Ver,DivTemp,CtTemp,BatteryLv) VALUES('" & processNum & "','" & TestData.Test_Serial & "','" & NowDate & " " & NowTime & "','" & TestData.Test_Firmware & "','" & TestData.Test_Temperature(TempData.DivTemp) & "','" & TestData.Test_Temperature(TempData.CartTemp) & "','" & TestData.Test_Battery & "')"
 
-        If TDDataSet(TD_Data.TestStep) = "11" Then
-            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)
+                If DBCommand(DBCmd) = False Then
+                    txbWindow.AppendText("DataBase Save FAIL" & DBCmd & vbCrLf)
+                    GoTo dbFail
+                End If
             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 & "'"