1] 신규 시리얼번호 16자리 적용

2] 제품확인,제품입력,주파수입력수동,TD재사용 옵션 숨김처리
   제품확인,주파수입력수동 > Product Manager에서 기능 제공
   제품입력,TD재사용 > Product Program에서 기능 제공
3] 버전 2.0.0 업데이트

MySqlModule.vb

@@ -1,5 +1,6 @@
 
 Imports MySql.Data.MySqlClient
+Imports MySqlConnector
 
 Module MySQLModule
 

frm_Freq_Reg.vb

@@ -1,8 +1,11 @@
-Imports System.IO
-Imports System.IO.Ports
-Imports System.Threading
+Imports System.ComponentModel.Design
+Imports System.Diagnostics.Metrics
 Imports System.Drawing.Printing
+Imports System.IO
+Imports System.IO.Ports
 Imports System.Management
+Imports System.Reflection
+Imports System.Threading
 
 Public Class frm_Freq_Reg
 
@@ -12,8 +15,12 @@ Public Class frm_Freq_Reg
     Private MainNonTDDB As String = "jomtTesterDB.jomtNonTDTbl"
     Private TestNonTDDB As String = "jomtTesterServerDB.jomtNonTDTbl"
 
+    Private Const mainModelInfoDB As String = "jomtTesterDB.jomtModelInfoTbl"
+    Private Const testModelInfoDB As String = "jomtTesterServerDB.jomtModelInfoTbl"
+
     Private cartridge_table As String = cartridge
     Private NonCartridge_table As String = MainNonTDDB
+    Private ApplyModelInfoDB As String = mainModelInfoDB
 
     Public Enum PD1_ENUM
         STANDBY = 0
@@ -137,6 +144,7 @@ Public Class frm_Freq_Reg
 
     ''도트 관련
     Private dotSerial As String
+    Private ModelCode As String
 
     Private Sub frm_Freq_Reg_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         TH_thread = New Thread(AddressOf thread_func)
@@ -161,6 +169,8 @@ Public Class frm_Freq_Reg
         printOptionData()
         mainOptionCkb()
         control_page()
+
+        ComboBoxSetting()
     End Sub
 
     Private Sub frm_Freq_Reg_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed
@@ -173,6 +183,33 @@ Public Class frm_Freq_Reg
         End If
     End Sub
 
+    Private Sub ComboBoxSetting()
+        comboBoxModel.Items.Clear()
+        comboBoxModel.DisplayMember = "Key"
+        comboBoxModel.ValueMember = "Value"
+
+        DBCmd = "SELECT ModelName, ModelCode FROM " & ApplyModelInfoDB & " GROUP BY ModelCode"
+        If DBQueryReader(DBCmd) Then
+            Dim RowCount As Int16 = (sqlDataQuery.Length / 2) - 1
+            Dim dataSetCount As Int32 = 0
+            Dim ModelName As String
+            Dim ModelCode As String
+
+            For row = 0 To RowCount
+                For col = 0 To 1
+                    If col = 0 Then
+                        ModelName = sqlDataQuery(dataSetCount)
+                    ElseIf col = 1 Then
+                        ModelCode = sqlDataQuery(dataSetCount)
+                    End If
+                    dataSetCount += 1
+                Next
+                comboBoxModel.Items.Add(New DictionaryEntry(ModelName, ModelCode))
+            Next
+        End If
+        comboBoxModel.Text = "MAXIMUM"
+    End Sub
+
     Private Sub thread_func()
         Do While thread_type
             thread_play()
@@ -972,7 +1009,7 @@ Public Class frm_Freq_Reg
 
     Private Function ParsingData(CmdInclude As Boolean) As String
         Dim cmdStr As String
-        Dim cmdVal(0 To 6) As String
+        Dim cmdVal(0 To 8) As String
         Dim ReturnStr As String
         Dim i As Integer
 
@@ -988,7 +1025,7 @@ Public Class frm_Freq_Reg
                     cmdStr = Mid(cmdMessage, 1, (InStr(rxMessage, " ") - 2))
                     cmdMessage = Mid(rxMessage, InStr(rxMessage, " ") + 1, Len(cmdMessage))
 
-                    For i = 1 To 5
+                    For i = 1 To 7
                         If InStr(cmdMessage, ",") <> 0 Then
                             cmdVal(i) = Mid(cmdMessage, 1, InStr(cmdMessage, ",") - 1)
                             cmdMessage = Mid(cmdMessage, InStr(cmdMessage, ",") + 1, Len(cmdMessage))
@@ -1018,7 +1055,11 @@ Public Class frm_Freq_Reg
                             cmdStr = (cmdVal(1) & "," & cmdVal(2))
                             Return cmdStr
                         Case "wrsconf1"
+                            If ModelCode.Length = 2 Then    '16자리 시리얼번호
+                                cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5) & "," & cmdVal(6) & "," & cmdVal(7)
+                            Else                            '12자리 시리얼번호
                                 cmdStr = cmdVal(1) & "," & cmdVal(2) & "," & cmdVal(3) & "," & cmdVal(4) & "," & cmdVal(5)
+                            End If
                             Return cmdStr
                         Case "settdsn"
                             cmdStr = cmdVal(1)
@@ -2260,7 +2301,7 @@ WR_File_Error:
         retval = PollingReceiveData(1500)
         CsvRegData = CsvRegData & retval.Replace(",", "/").Replace(vbCrLf, "") & ","
 
-        If retval <> td_reg_serial.ToLower Then
+        If retval <> td_reg_serial Then
             Return False
         End If
 
@@ -2271,6 +2312,26 @@ WR_File_Error:
     Private Function prod_reg_data(factory As String, prod_serial As String, prod_code As String, area As String, abroad As String) As Boolean
         Dim retVal As String
         tmpCmdMessage = "wrsconf1"
+        ModelCode = comboBoxModel.SelectedItem.Value.ToString
+
+        If ModelCode.Length = 2 Then    '16자리 시리얼번호
+            Dim Model As String = "70"
+            Dim ModelOpt As String = "0"
+            Dim QcOpt As String = "150"
+
+            cmdMessage = "[" & tmpCmdMessage & " " & factory & "," & prod_serial & "," & ModelCode & "," & ModelOpt & "," & QcOpt & "," & area & "," & abroad & "]" + vbCrLf
+
+            If SendData(cmdMessage) Then
+                Return False
+            End If
+
+            retVal = PollingReceiveData(2000)
+
+            If retVal <> factory & "," & prod_serial & "," & Model & "," & ModelOpt & "," & QcOpt & "," & area & "," & abroad Then
+                Return False
+            End If
+        Else                            '12자리 시리얼번호
+            prod_code = ModelCode.PadRight(2, "0"c)
             cmdMessage = "[" & tmpCmdMessage & " " & factory & "," & prod_serial & "," & prod_code & "," & area & "," & abroad & "]" + vbCrLf
             CsvRegData = CsvRegData & cmdMessage.Replace(",", "/").Replace(vbCrLf, "") & ","
             If SendData(cmdMessage) Then
@@ -2283,6 +2344,7 @@ WR_File_Error:
             If retVal <> factory.ToLower & "," & prod_serial & "," & prod_code & "," & area & "," & abroad Then
                 Return False
             End If
+        End If
 
         Return True
     End Function