TD 시리얼번호 체크 오류 수정

1] 시리얼번호가 J3로 시작하는 TD 분류 시 EYE로 분류될수 있도록 수정
2] 생산1(캐패시티 값 확인 및 C/T 주파수입력 공정) 화면 표시되지 않는 문제 수정
3] TD 수입검사 시 측정값이 숫자가 아닌 스트링으로 리턴되는 경우 예외 처리

frmTD_JIG.vb

@@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices.ComTypes
 Imports System.Text
 
 Public Class frmTD_JIG
-    Public Const TESTER_VER As String = "2.4.2"
+    Public Const TESTER_VER As String = "3.0.0"
     Public ShowDetailLog As Boolean = False
     Public RunDemoMode As Boolean = False
     Public EnableSetup As Boolean = False
@@ -844,7 +844,7 @@ WR_File_Error:
                 If cmdSerialPort.IsOpen = False Then
                     With cmdSerialPort
                         .PortName = ParaComport
-                        .BaudRate = 115200
+                        .BaudRate = 230400
                         .DataBits = 8
                         .Parity = IO.Ports.Parity.None
                         .StopBits = IO.Ports.StopBits.One
@@ -2427,7 +2427,7 @@ VisaComError:
                     DelayMs(Val(txbOntime.Text) + 50)
 
                     RetStr = RunMeasure()
-                    If RetStr = "Fail" Then
+                    If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
                         StatusFail = True
                         txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
                         txbRun.BackColor = Color.Red
@@ -2489,7 +2489,7 @@ VisaComError:
                     DelayMs(Val(txbOntime.Text) + 50)
 
                     RetStr = RunMeasure()
-                    If RetStr = "Fail" Then
+                    If IsNumeric(RetStr) = False Or RetStr = "Fail" Then
                         StatusFail = True
                         txbRun.Text = "Scope Error 03" 'cmdDisplay("Trigger failure")
                         txbRun.BackColor = Color.Red
@@ -2544,17 +2544,31 @@ MEASURE_END:
                 Else
                     RegMeasure.MeasureValue(0) = 0
 
-                    For Cnt = 1 To RelayCnt.Length - 1
+                    If Mid(RegMeasure.MeasurePV_SN, 1, 2) = "J3" Then
-                        If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
+                        For Cnt = 1 To RelayCnt.Length - 1
+                            If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= EyeMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
 
-                        If RegMeasure.MeasureValue(0) Then
+                            If RegMeasure.MeasureValue(0) Then
-                            If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
+                                If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
-                                If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX Then
+                                    If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= EyeMAX Then
-                                    RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
+                                        RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
+                                    End If
                                 End If
                             End If
-                        End If
+                        Next
-                    Next
+                    Else
+                        For Cnt = 1 To RelayCnt.Length - 1
+                            If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX And RegMeasure.MeasureValue(0) = 0 Then RegMeasure.MeasureValue(0) = Cnt
+
+                            If RegMeasure.MeasureValue(0) Then
+                                If RegMeasure.MeasureValue(RegMeasure.MeasureValue(0)) < RegMeasure.MeasureValue(RelayCnt(Cnt)) Then
+                                    If RegMeasure.MeasureValue(RelayCnt(Cnt)) <= ProMAX Then
+                                        RegMeasure.MeasureValue(0) = RelayCnt(Cnt)
+                                    End If
+                                End If
+                            End If
+                        Next
+                    End If
 
                     If RegMeasure.MeasureValue(0) = 0 Then
                         RegMeasure.MeasureOkNg = "NG"
@@ -5917,7 +5931,7 @@ MEASURE_END:
     Private Sub btnCal_Click(sender As Object, e As EventArgs) Handles btnCal.Click
         If CalModeOn = False Then
             CalModeOn = True
-            txbCmdWindow.Clear()
+            'txbCmdWindow.Clear() 'Commenting out to check logs
             txbCmdWindow.Visible = True
             gbTestWindow.Visible = False
             btnRunIQC.Enabled = True
@@ -5932,10 +5946,7 @@ MEASURE_END:
         btnRunIQC.Enabled = True
         txbPV_Freq.Text = "N/A"
 
-        txbCmdWindow.Width = 505
+        resizeCmdWindow(505, 380, 513, 21)
-        txbCmdWindow.Height = 380
-        txbCmdWindow.Left = 513
-        txbCmdWindow.Top = 21
     End Sub
 
     Private Sub btPrintref_Click(sender As Object, e As EventArgs) Handles btPrintref.Click
@@ -6109,20 +6120,15 @@ MEASURE_END:
         End If
     End Sub
 
-    'Private Sub showCmdWindow()
+    Private Sub resizeCmdWindow(width As Int32, height As Int32, left As Int32, top As Int32)
-    '    txbCmdWindow.Width = 505
+        txbCmdWindow.Width = width
-    '    txbCmdWindow.Height = 80
+        txbCmdWindow.Height = height
-    '    txbCmdWindow.Left = 513
+        txbCmdWindow.Left = left
-    '    txbCmdWindow.Top = 300
+        txbCmdWindow.Top = top
-    '    txbCmdWindow.BringToFront()
+    End Sub
-    '    txbCmdWindow.Visible = True
-    'End Sub
 
     Private Sub showCmdWindow()
-        txbCmdWindow.Width = 505
+        resizeCmdWindow(505, 200, 513, 200)
-        txbCmdWindow.Height = 200
-        txbCmdWindow.Left = 513
-        txbCmdWindow.Top = 200
         txbCmdWindow.BringToFront()
         txbCmdWindow.Visible = True
     End Sub