1. 마름모 검사 EP, RF 개별 금일 검사 수량으로 적용

2. RF 검사 PREQ 값 변수 타입 int16 -> double 변경해 오버플로우 해결

ProductFunctionTester/MySqlMoudule.vb

@@ -1,4 +1,4 @@
-Imports MySql.Data.MySqlClient
+Imports MySql.Data.MySqlClient
 Module MySqlMoudule
 
     Private Const LocalHostIP As String = "192.168.0.250"
@@ -68,25 +68,24 @@ Module MySqlMoudule
             DBClose()
             Return False
         End Try
-        End
     End Function
 
     Public Function DBQueryScalar(cmdStr As String) As String
-        Dim result As String
-
         Try
             Database_Use()
             sqlCmd.CommandText = cmdStr
             sqlCmd.Connection = sqlCon
-            result = sqlCmd.ExecuteScalar()    'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형
+            Dim objResult As Object = sqlCmd.ExecuteScalar()    'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형
 
-            Return result
+            If objResult Is Nothing OrElse IsDBNull(objResult) Then
+                Return "False"
+            End If
+            Return objResult.ToString()
 
         Catch ex As Exception
             MsgBox("MySQL Command Error:" + vbCrLf + Err.Description)
             Return "False"
         End Try
-        End
     End Function
 
     Public Function DBQueryReader(cmdStr As String) As Integer

ProductFunctionTester/PostgreSQLMoudule.vb

@@ -1,4 +1,4 @@
-Imports Npgsql
+Imports Npgsql
 
 Module PostgreSQLModule
     Private pgSqlCon As NpgsqlConnection = New NpgsqlConnection("Host=mes-db.postgres.database.azure.com;Username=jionmt@mes-db;Password=jmtdb6919!!pg;Database=mes-jion-data")
@@ -51,25 +51,25 @@ Module PostgreSQLModule
     End Function
 
     Public Function pgDBQueryScalar(cmdStr As String) As String
-        Dim result As String
-
         Try
             If pgDBOpen() Then
                 MsgBox("DB 연결을 진행할 수 없습니다.", vbCritical)
-                Return 0
+                Return "False"
             End If
 
             sqlCmd.CommandText = cmdStr
             sqlCmd.Connection = pgSqlCon
-            result = sqlCmd.ExecuteScalar()    'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형
+            Dim objResult As Object = sqlCmd.ExecuteScalar()    'SQL 명령을 실행하고, Query 가 리턴하는 첫번째 행의 첫번째 열을 리턴한다. 결과가 딱 1개인 집계함수(count, sum, avg 등)에 사용한다. 반환값은 object 형
 
-            Return result
+            If objResult Is Nothing OrElse IsDBNull(objResult) Then
+                Return "False"
+            End If
+            Return objResult.ToString()
 
         Catch ex As Exception
             MsgBox("MySQL Command Error:" + vbCrLf + Err.Description)
             Return "False"
         End Try
-        End
     End Function
 
     Public Function pgDBQueryReader(cmdStr As String) As Integer

ProductFunctionTester/ProductFunctionTester.vbproj

@@ -116,14 +116,10 @@
     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="Interop.bpac">
+    <Reference Include="Ivi.Visa.Interop, Version=8.0.0.0, Culture=neutral, PublicKeyToken=a128c98f1d7717c1, processorArchitecture=AMD64">
-      <HintPath>C:\Program Files\Brother bPAC3 SDK\Samples\VBNET\NamePlt\bin\x64\Release\Interop.bpac.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Ivi.Visa.Interop, Version=5.11.0.0, Culture=neutral, PublicKeyToken=a128c98f1d7717c1, processorArchitecture=AMD64">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>C:\Windows\assembly\GAC_64\Ivi.Visa.Interop\5.11.0.0__a128c98f1d7717c1\Ivi.Visa.Interop.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\Windows\assembly\GAC_64\Ivi.Visa.Interop\8.0.0.0__a128c98f1d7717c1\Ivi.Visa.Interop.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.1.11.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll</HintPath>

ProductFunctionTester/ScopeMoudule.vb

@@ -1,4 +1,4 @@
-Module ScopeMoudule
+Module ScopeMoudule
     Public myMgr As Ivi.Visa.Interop.ResourceManager
     Public myscope As Ivi.Visa.Interop.FormattedIO488
 
@@ -7,34 +7,47 @@
     Public Function ScopeOpen(ScopeID As String, timeoutNum As Integer) As String
 
         Try
+            ScopeClear()
+
+            If ScopeID = "" Then
+                Return "FAIL"
+            End If
             myMgr = New Ivi.Visa.Interop.ResourceManager
             myscope = New Ivi.Visa.Interop.FormattedIO488
-
             myscope.IO = myMgr.Open(ScopeID)
-            myscope.IO.Clear()
             myscope.IO.Timeout = timeoutNum
-
+            DrainDeviceOutput()
             strQueryResult = DoQueryString("*IDN?")
             Debug.Print("Identification string: " + strQueryResult)
 
             Return strQueryResult
+        Catch ex As System.Runtime.InteropServices.COMException
+            Debug.Print("ErrorCode 값: " & ex.ErrorCode)
+            Debug.Print("ErroMassage 값: " & ex.Message.ToString)
+            Debug.Print("HResult 값: " & ex.HResult)
+            Return "FAIL"
         Catch ex As Exception
             Return "FAIL"
         End Try
     End Function
 
-    Public Function ScopeRunCk() As Boolean
+    ''계측기 쪽 버퍼 비우기
+    Public Sub DrainDeviceOutput(Optional readTimeoutMs As Integer = 200)
+        Dim prevTimeout As Integer = myscope.IO.Timeout
         Try
-            strQueryResult = DoQueryString("*IDN?")
+            myscope.IO.Timeout = readTimeoutMs
-            If InStr(strQueryResult, "KEYSIGHT") > 0 Then
+            Dim s As String = myscope.ReadString
-                Return False
+            Debug.Print("남아있는 데이터: " + s)
-            Else
+            Do While Not String.IsNullOrWhiteSpace(s)
-                Return True
+                s = myscope.ReadString
-            End If
+            Loop
-        Catch ex As Exception
+        Catch
-            Return True
+            checkError()
+        Finally
+            myscope.IO.Timeout = prevTimeout
         End Try
-    End Function
+    End Sub
+
 
     Public Function DoCommand(command As String) As String
         Dim errStr As String
@@ -53,15 +66,6 @@
 
     End Function
 
-    '    Public Sub DoCommand(command As String)
-    '        On Error GoTo VisaComError
-    '        myscope.WriteString(command)
-    '        CheckInstrumentErrors()
-    '        Exit Sub
-
-    'VisaComError:
-    '        MsgBox("VISA COM Error: " + vbCrLf + CStr(Err.Number) + ", " + Err.Source + "," + Err.Description, vbExclamation, "VISA COM Error")
-    '    End Sub
 
     Public Function DoQueryString(query As String) As String
         Dim errStr As String
@@ -76,28 +80,20 @@
             Return DoQueryString
 
         Catch ex As Exception
+            Try
+                DrainDeviceOutput()
+            Catch
+            End Try
             Return "VISA COM Error: " + vbCrLf + CStr(Err.Number) + ", " + Err.Source + "," + Err.Description
         End Try
 
     End Function
 
-    '    Public Function DoQueryString(query As String) As String
-    '        Dim errStr As String
-    '        On Error GoTo VisaComError
-    '        myscope.WriteString(query)
-    '        DoQueryString = myscope.ReadString
-    '        CheckInstrumentErrors()
-    '        Return DoQueryString
-    'VisaComError:
-    '        MsgBox("VISA COM Error: " + vbCrLf + CStr(Err.Number) + ", " + Err.Source + "," + Err.Description, vbExclamation, "VISA COM Error")
-    '        Return "FAIL"
-    '    End Function
-
     Private Function CheckInstrumentErrors() As String
         Dim strerrval As String
         Dim strout As String = ""
-
+        Try
-        myscope.WriteString(":SYSTem:ERRor?")
+            myscope.WriteString(":SYSTem:ERRor?")
         strerrval = myscope.ReadString
         While Val(strerrval) <> 0
             strout = "INST Error: " + strerrval
@@ -112,26 +108,39 @@
             Return strout
         End If
 
-        Return ""
+            Return ""
+
+        Catch ex As Exception
+            Main_Form.txbWindow.AppendText("Error check Message Error:" & ex.Message & vbCrLf)
+            Return ex.Message
+        End Try
+
     End Function
 
-    'Private Sub CheckInstrumentErrors()
+    Private Sub checkError()
-    '    Dim strerrval As String
+        Dim strerrval As String
-    '    Dim strout As String = ""
+        Try
+            myscope.WriteString(":SYSTem:ERRor?")
+            strerrval = myscope.ReadString
+            While Val(strerrval) <> 0
+                myscope.WriteString(":SYSTem:ERRor?")
+                strerrval = myscope.ReadString
+            End While
+        Catch ex As Exception
+            Main_Form.txbWindow.AppendText("VISA BUFFER CLEAR ERROR:" & ex.Message & vbCrLf)
+        End Try
+    End Sub
 
-    '    myscope.WriteString(":SYSTem:ERRor?")
-    '    strerrval = myscope.ReadString
-    '    While Val(strerrval) <> 0
-    '        strout = "INST Error: " + strerrval
-    '        myscope.WriteString(":SYSTem:ERRor?")
-    '        strerrval = myscope.ReadString
-    '    End While
 
-    '    If Not strout = "" Then
+    ''' <summary>스코프 버퍼 초기화. 연결된 경우에만 동작.</summary>
-    '        MsgBox(strout, vbExclamation, "INST Error Messages")
+    Public Sub ScopeClear()
-    '        myscope.FlushWrite(False)
+        Try
-    '        myscope.FlushRead()
+            If myscope IsNot Nothing AndAlso myscope.IO IsNot Nothing Then
-    '    End If
+                myscope.IO.Clear()
-    'End Sub
+            End If
+        Catch
+            ' 연결 해제 등으로 접근 불가 시 무시
+        End Try
+    End Sub
 
 End Module

ProductFunctionTester/SpectrumModule.vb

@@ -1,4 +1,4 @@
-Module SpectrumModule
+Module SpectrumModule
     Private myMgr As Ivi.Visa.Interop.ResourceManager
     Private mySpec As Ivi.Visa.Interop.FormattedIO488
 
@@ -6,25 +6,47 @@
 
     Public Function SpecOpen(SpecID As String, ToCount As Integer) As String
         Try
+            SpecClear()
             myMgr = New Ivi.Visa.Interop.ResourceManager
             mySpec = New Ivi.Visa.Interop.FormattedIO488
 
             mySpec.IO = myMgr.Open(SpecID)
-            'mySpec.IO.Clear()
             mySpec.IO.Timeout = ToCount
+            SpecDrainDeviceOutput(200)
 
             strQueryRes = SpecQueryStr("*IDN?")
 
             Return strQueryRes
-
+        Catch ex As System.Runtime.InteropServices.COMException
+            Debug.Print("ErrorCode 값: " & ex.ErrorCode)
+            Debug.Print("ErroMassage 값: " & ex.Message)
+            Debug.Print("HResult 값: " & ex.HResult)
+            Return "FAIL"
         Catch ex As Exception
             Return "FAIL"
         End Try
     End Function
 
+    Public Sub SpecDrainDeviceOutput(Optional readTimeoutMs As Integer = 200)
+        Dim prevTimeout As Integer = mySpec.IO.Timeout
+        Try
+            mySpec.IO.Timeout = readTimeoutMs
+            Dim s As String = mySpec.ReadString
+            Do While Not String.IsNullOrWhiteSpace(s)
+                s = mySpec.ReadString
+            Loop
+        Catch
+            ' 타임아웃/에러 시 그만 둠
+        Finally
+            mySpec.IO.Timeout = prevTimeout
+        End Try
+    End Sub
+
     Public Function RunCommand(command As String) As String
         Dim errStr As String
         Try
+            mySpec.IO.Clear()
+            SpecDrainDeviceOutput(200)
             mySpec.WriteString(command)
             errStr = CheckError()
             If errStr.Replace(" ", "") <> "" Then
@@ -41,6 +63,8 @@
     Public Function SpecQueryStr(query As String) As String
         Dim errStr As String
         Try
+            mySpec.IO.Clear()
+            SpecDrainDeviceOutput(200)
             mySpec.WriteString(query)
             SpecQueryStr = mySpec.ReadString
             errStr = CheckError()
@@ -58,8 +82,8 @@
     Private Function CheckError() As String
         Dim strerrval As String
         Dim strout As String = ""
-
+        Try
-        mySpec.WriteString(":SYSTem:ERRor?")
+            mySpec.WriteString(":SYSTem:ERRor?")
         strerrval = mySpec.ReadString
         While Val(strerrval) <> 0
             strout = "INST Error: " + strerrval
@@ -74,7 +98,23 @@
             Return strout
         End If
 
-        Return ""
+            Return ""
+
+        Catch ex As Exception
+            Main_Form.txbWindow.AppendText("Error check Message Error:" & ex.Message & vbCrLf)
+            Return ex.Message
+        End Try
     End Function
 
+    ''' <summary>스펙트럼 분석기 버퍼 초기화. 연결된 경우에만 동작.</summary>
+    Public Sub SpecClear()
+        Try
+            If mySpec IsNot Nothing AndAlso mySpec.IO IsNot Nothing Then
+                mySpec.IO.Clear()
+            End If
+        Catch
+            ' 연결 해제 등으로 접근 불가 시 무시
+        End Try
+    End Sub
+
 End Module