From b507d11e363cd4cca82fa3210beeaefc0301f68b Mon Sep 17 00:00:00 2001
From: hyelinjung <gkdldu4@naver.com>
Date: Fri, 13 Feb 2026 11:07:55 +0900
Subject: [PATCH] =?UTF-8?q?1.=20=EB=B3=B4=EA=B8=89=ED=98=95=20td=20?=
 =?UTF-8?q?=EA=B3=84=EC=97=98(=EC=84=B8=EB=AA=A8,=EC=9B=90)=20ckbopV1?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EC=A0=81=EC=9A=A9=202.=20ckbo?=
 =?UTF-8?q?pV1=20=EA=B2=80=EC=82=AC=EC=97=90=EC=84=9C=20=EB=84=A4=EB=AA=A8?=
 =?UTF-8?q?,=20=EB=A7=88=EB=A6=84=EB=AA=A8=20=EC=A0=81=EC=9A=A9=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MAXIMUM_FUNCTION_PROGRAM/mainForm.vb | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/MAXIMUM_FUNCTION_PROGRAM/mainForm.vb b/MAXIMUM_FUNCTION_PROGRAM/mainForm.vb
index 1d512a6..fe841f8 100644
--- a/MAXIMUM_FUNCTION_PROGRAM/mainForm.vb
+++ b/MAXIMUM_FUNCTION_PROGRAM/mainForm.vb
@@ -3,6 +3,7 @@ Imports System.IO
 Imports System.IO.Ports
 Imports System.Math
 Imports System.Threading
+Imports Mysqlx.XDevAPI.Relational
 
 Public Class mainForm
     Private Enum formModList
@@ -571,7 +572,7 @@ Public Class mainForm
             Return False
         End If
 
-        If ckbopV1.Checked = True And modelCompare() <> "ALTO" Then
+        If ckbopV1.Checked = True And modelCompare() <> "ALTO" And modelCompare() <> "NEMO" And modelCompare() <> "MAREUMMO" Then
             If v1BeforeHifu() Then
                 Return False
             End If
@@ -837,7 +838,13 @@ Public Class mainForm
     End Function
 
     Private Function v1BeforeRF() As Boolean
-        DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR) FROM " & applyCartDB & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
+        Dim table As String
+        If LDMUseCompare Then
+            table = ApplyLdmDB
+        Else
+            table = applyCartDB
+        End If
+        DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR) FROM " & table & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
         If DBQueryReader(DBCmd) Then
             txbRDate_M1.Text = sqlDataQuery(0)
             txbRTime_M1.Text = sqlDataQuery(1)
@@ -1229,7 +1236,14 @@ FailData:
     End Function
 
     Private Function v1BeforeHifu()
-        DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR),P1_Frequency FROM " & applyCartDB & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
+        Dim table As String
+        If LDMUseCompare Then
+            table = ApplyLdmDB
+        Else
+            table = applyCartDB
+        End If
+
+        DBCmd = "SELECT CONVERT(P1_Date,CHAR),CONVERT(P1_Time,CHAR),P1_Frequency FROM " & table & " WHERE PV_SN = '" & tdReadData(tdDataList.TDSN) & "'"
         If DBQueryReader(DBCmd) Then
             txbHDate_M1.Text = sqlDataQuery(0)
             txbHTime_M1.Text = sqlDataQuery(1)
@@ -1677,6 +1691,7 @@ DataFail:
             Else
                 RfEpOnlyCompare = True
             End If
+
         End If
 
         If typeCompare() <> "FACE" And typeCompare() <> "EYE" And typeCompare() <> "BODY" Then
@@ -2434,7 +2449,7 @@ finishFunc:
                                 psData = Mid(readData, 1, InStr(readData, "^") - 1)
                                 readData = Mid(readData, InStr(readData, "^") + 1, readData.Length)
                             Else
-                                MsgBox("불량 데이터가 존재합니다.", vbCritical)
+                                MsgBox("불량 데이터가 존재합니다." & vbCrLf & "합격기준 데이터 개수가 맞지 않습니다. 초기화 후 저장을 진행하여 주십시오.", vbCritical)
                                 optionAllReset()
                                 Exit For
                             End If
@@ -2445,7 +2460,7 @@ finishFunc:
                         dbCheckSetting(readData)
 
                     Else
-                        MsgBox("불량 데이터가 존재합니다.", vbCritical)
+                        MsgBox("불량 데이터가 존재합니다." & vbCrLf & "합격기준 데이터 개수가 맞지 않습니다. 초기화 후 저장을 진행하여 주십시오.", vbCritical)
                         optionAllReset()
                     End If
                 End If