Index: TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb
===================================================================
diff -u -r1607 -r1609
--- TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb	(.../HoofdAansturingRework.vb)	(revision 1607)
+++ TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb	(.../HoofdAansturingRework.vb)	(revision 1609)
@@ -202,7 +202,7 @@
                 barcodes = ArdisMapper.geefBarcodes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL, linksOfRechts)
             Else
                 'Als het een speciale zijkant is moeten we het corresponderende plankje vinden, aka A of B
-                barcodes = ArdisMapper.geefBarcodeGegenereerdePlankjes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL)
+                barcodes = ArdisMapper.GeefBarcodesGegenereerdePlankjes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL)
             End If
 
             'Lijst van barcodes controleren.
Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormGrid.vb
===================================================================
diff -u -r1608 -r1609
--- TAOR-rework-bugfixing/TAOR rework/formulieren/FormGrid.vb	(.../FormGrid.vb)	(revision 1608)
+++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormGrid.vb	(.../FormGrid.vb)	(revision 1609)
@@ -95,7 +95,7 @@
                     DataGridViewCache.DataSource = CacheMapper.GeefDataTable(_tabel, _waarde)
                 Else
                     'Ophalen bij Ardis.
-                    DataGridViewCache.DataSource = ArdisMapper.geefDataReader(_waarde)
+                    DataGridViewCache.DataSource = ArdisMapper.GeefDataTable(_waarde)
                 End If
             End If
 
Index: TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb
===================================================================
diff -u -r1599 -r1609
--- TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb	(.../ArdisMapper.vb)	(revision 1599)
+++ TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb	(.../ArdisMapper.vb)	(revision 1609)
@@ -1,180 +1,223 @@
 Imports System.Data.SqlClient
-Imports System.Data.Odbc
 
 Public Module ArdisMapper
-    Public SQLConnection As New SqlConnection With {.ConnectionString = "Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3"}
-    Public command As SqlCommand
+    Private ReadOnly SqlConnection As New SqlConnection With {.ConnectionString = "Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3"}
+    Private _command As SqlCommand
 
-    Private Sub connectToArdis()
-        If Not SQLConnection.State = ConnectionState.Open Then
-            testConnection()
-            SQLConnection.Open()
+    ''' <summary>
+    ''' Hulpfunctie voor te connecteren met Ardis.
+    ''' </summary>
+    Private Sub ConnectToArdis()
+        If Not SqlConnection.State = ConnectionState.Open Then
+            Try
+                SqlConnection.Open()
+            Catch ex As Exception
+                Throw New Exception($"De Ardis databank kan niet bereikt worden {vbNewLine}{ex.Message}")
+            End Try
         End If
     End Sub
 
-    Private Sub testConnection()
+    ''' <summary>
+    ''' Uitvoeren van een query naar een data reader.
+    ''' </summary>
+    ''' <param name="query">De query</param>
+    ''' <returns>De ODBC data reader</returns>
+    Private Function ExecuteIntoDataReader(query As String) As SqlDataReader
         Try
-            SQLConnection.Open()
-            SQLConnection.Close()
+            ConnectToArdis()
+            Return New SqlCommand(query, SqlConnection).ExecuteReader()
         Catch ex As Exception
-            Throw New Exception("De Ardis databank kan niet bereikt worden " & vbNewLine & vbNewLine & ex.Message)
+            Throw New Exception($"Kon datareader niet opvragen uit Ardis datatabank.{vbNewLine}{ex.Message}")
         End Try
-    End Sub
+    End Function
 
-    Private Function getList(Query As String) As List(Of String)
-        Dim result As New List(Of String)
-        Dim dr As SqlDataReader = Nothing
+    ''' <summary>
+    ''' Commando uitvoeren en eerste items per record retourneren als lijst van strings.
+    ''' </summary>
+    ''' <param name="query">De query</param>
+    ''' <returns>De eerste items van de records.</returns>
+    Private Function ExecuteIntoListOfString(query As String) As List(Of String)
         Try
-            connectToArdis()
-            command = New SqlCommand(Query, SQLConnection)
-            dr = command.ExecuteReader
-            While dr.Read
-                result.Add(dr(0))
+            'Initialisatie van de lijst.
+            Dim data As New List(Of String)
+
+            'Opvragen van de data reader.
+            Dim dr = ExecuteIntoDataReader(query)
+
+            'Overlopen van de resultaten en toevoegen aan de lijst.
+            While (dr.Read())
+                'Eerste veld van een record toevoegen aan de lijst.
+                data.Add(dr.GetValue(0).ToString)
             End While
+
+            'De lijst retourneren.
+            Return data
         Catch ex As Exception
-            Throw New Exception("De Ardis databank kan niet bereikt worden " + ex.Message)
-        Finally
-            If Not (dr Is Nothing OrElse dr.IsClosed) Then
-                dr.Close()
-            End If
+            Throw New Exception($"Er is een fout opgetreden bij het opvragen van een lijst van data uit de Ardis databank {vbNewLine}{ex.Message}")
         End Try
-        Return result
     End Function
 
-    Private Function executeIntoResultset(Query As String) As ArdisData
+    ''' <summary>
+    ''' Hulpfunctie voor een query uit te voeren en het resultaat 
+    ''' </summary>
+    ''' <param name="query"></param>te converteren naar 'ArdisData'.
+    ''' <returns>De gevulde ArdisData</returns>
+    Private Function ExecuteIntoResultset(query As String) As ArdisData
         Dim ardisData As ArdisData = Nothing
-        Dim dr As SqlDataReader = Nothing
-        Try
-            connectToArdis()
-            command = New SqlCommand(Query, SQLConnection)
-            dr = command.ExecuteReader
-            While dr.Read()
-                ardisData = New ArdisData
-                ardisData.PartId = CStr(dr.Item("PartId"))
-                ardisData.OrderId = CStr(dr.Item("OrderId"))
-                ardisData.PartRef = CStr(dr.Item("PartRef"))
-                ardisData.PartQty = CStr(dr.Item("PartQty"))
-                ardisData.PartMat = CStr(dr.Item("PartMat"))
-                ardisData.PartL = CStr(dr.Item("PartL"))
-                ardisData.PartW = CStr(dr.Item("PartW"))
-                ardisData.PartCalc = CStr(dr.Item("PartCalc"))
-                ardisData.PartRemark = CStr(dr.Item("PartRemark"))
-                ardisData.PartRemark2 = CStr(dr.Item("PartRemark2"))
-                ardisData.PartRemark3 = CStr(dr.Item("PartRemark3"))
-                ardisData.PartGroup = CStr(dr.Item("PartGroup"))
-                ardisData.PartLevel = CStr(dr.Item("PartLevel"))
-                ardisData.PartExt01 = CStr(dr.Item("PartExt01"))
-                ardisData.PartExt02 = CStr(dr.Item("PartExt02"))
-                ardisData.PartExt03 = CStr(dr.Item("PartExt03"))
-                ardisData.PartExt04 = CStr(dr.Item("PartExt04"))
-                ardisData.PartExt05 = If(IsDBNull(dr.Item("PartExt05")), Nothing, CStr(dr.Item("PartExt05")))
-                ardisData.PartExt06 = CStr(dr.Item("PartExt06"))
-                ardisData.PartExt07 = CStr(dr.Item("PartExt07"))
-                ardisData.PartExt08 = CStr(dr.Item("PartExt08"))
-                ardisData.PartExt09 = CStr(dr.Item("PartExt09"))
-                ardisData.PartD = CStr(dr.Item("PartD"))
-                ardisData.PartProd = CStr(dr.Item("PartProd"))
-                ardisData.GroupCode = If(IsDBNull(dr.Item("GroupCode")), Nothing, CStr(dr.Item("GroupCode")))
-                ardisData.Status = CStr(dr.Item("Status"))
-                ardisData.Inserted = CStr(dr.Item("Inserted"))
-                ardisData.LastChanged = CStr(dr.Item("LastChanged"))
-                ardisData.PartQtyCut = If(IsDBNull(dr.Item("PartQtyCut")), Nothing, CStr(dr.Item("PartQtyCut")))
-                ardisData.PartExt10 = If(IsDBNull(dr.Item("PartExt10")), Nothing, CStr(dr.Item("PartExt10")))
-                ardisData.PartExt11 = If(IsDBNull(dr.Item("PartExt11")), Nothing, CStr(dr.Item("PartExt11")))
-            End While
-        Catch ex As Exception
-            Throw New Exception("Er is een fout opgetreden bij het ophalen van data uit de Ardis databank " + ex.Message)
-        Finally
-            If Not (dr Is Nothing OrElse dr.IsClosed) Then
-                dr.Close()
-            End If
-        End Try
+        'Data reader opvragen.
+        Dim dr = ExecuteIntoDataReader(query)
+        'Datareader lezen, eerste record ophalen en retourneren als Ardis data.
+        dr.Read()
+        ardisData = New ArdisData With {
+            .PartId = CStr(dr.Item("PartId")),
+            .OrderId = CStr(dr.Item("OrderId")),
+            .PartRef = CStr(dr.Item("PartRef")),
+            .PartQty = CStr(dr.Item("PartQty")),
+            .PartMat = CStr(dr.Item("PartMat")),
+            .PartL = CStr(dr.Item("PartL")),
+            .PartW = CStr(dr.Item("PartW")),
+            .PartCalc = CStr(dr.Item("PartCalc")),
+            .PartRemark = CStr(dr.Item("PartRemark")),
+            .PartRemark2 = CStr(dr.Item("PartRemark2")),
+            .PartRemark3 = CStr(dr.Item("PartRemark3")),
+            .PartGroup = CStr(dr.Item("PartGroup")),
+            .PartLevel = CStr(dr.Item("PartLevel")),
+            .PartExt01 = CStr(dr.Item("PartExt01")),
+            .PartExt02 = CStr(dr.Item("PartExt02")),
+            .PartExt03 = CStr(dr.Item("PartExt03")),
+            .PartExt04 = CStr(dr.Item("PartExt04")),
+            .PartExt05 = If(IsDBNull(dr.Item("PartExt05")), Nothing, CStr(dr.Item("PartExt05"))),
+            .PartExt06 = CStr(dr.Item("PartExt06")),
+            .PartExt07 = CStr(dr.Item("PartExt07")),
+            .PartExt08 = CStr(dr.Item("PartExt08")),
+            .PartExt09 = CStr(dr.Item("PartExt09")),
+            .PartD = CStr(dr.Item("PartD")),
+            .PartProd = CStr(dr.Item("PartProd")),
+            .GroupCode = If(IsDBNull(dr.Item("GroupCode")), Nothing, CStr(dr.Item("GroupCode"))),
+            .Status = CStr(dr.Item("Status")),
+            .Inserted = CStr(dr.Item("Inserted")),
+            .LastChanged = CStr(dr.Item("LastChanged")),
+            .PartQtyCut = If(IsDBNull(dr.Item("PartQtyCut")), Nothing, CStr(dr.Item("PartQtyCut"))),
+            .PartExt10 = If(IsDBNull(dr.Item("PartExt10")), Nothing, CStr(dr.Item("PartExt10"))),
+            .PartExt11 = If(IsDBNull(dr.Item("PartExt11")), Nothing, CStr(dr.Item("PartExt11")))
+        }
         Return ardisData
     End Function
 
-    Public Function OphalenData(BarcodeID As String) As ArdisData
+    ''' <summary>
+    ''' Ophalen van ArdisData aan de hand van een barcodeId.
+    ''' </summary>
+    ''' <param name="barcodeId">Het barcodeId</param>
+    ''' <returns>De ArdisData</returns>
+    Public Function OphalenData(barcodeId As String) As ArdisData
         Try
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van Ardisdata met barcode " & BarcodeID)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van Ardisdata met barcode '{barcodeId}'")
 
-            Dim result As ArdisData
-
-            Dim lijstKolommen As String = "PartId, OrderId, PartRef, PartQty, PartMat, PartL, PartW, PartCalc, PartRemark, PartRemark2, PartRemark3, PartGroup, PartLevel, PartExt01, PartExt02, PartExt03, PartExt04, PartExt05, PartExt06, PartExt07, PartExt08, PartExt09, PartD, PartProd, GroupCode, Status, Inserted, LastChanged, PartQtyCut, PartExt10, PartExt11"
-            Dim query As String = "Select top 1 " & lijstKolommen & " From [VH_Ardis_TST].[dbo].[Parts] where PartCalc= " & "'" & BarcodeID & "'"
-            result = executeIntoResultset(query)
-
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van Ardisdata met barcode " & BarcodeID, True)
-            Return result
+            'Opbouwen query.
+            Const lijstKolommen = "PartId, OrderId, PartRef, PartQty, PartMat, PartL, PartW, PartCalc, PartRemark, PartRemark2, PartRemark3, PartGroup, PartLevel, PartExt01, PartExt02, PartExt03, PartExt04, PartExt05, PartExt06, PartExt07, PartExt08, PartExt09, PartD, PartProd, GroupCode, Status, Inserted, LastChanged, PartQtyCut, PartExt10, PartExt11"
+            Dim query As String = $"Select top 1 {lijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartCalc='{barcodeId}'"
+            'Query uitvoeren en resultaat retourneren.
+            Dim resultaat = ExecuteIntoResultset(query)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van Ardisdata met barcode '{barcodeId}'", True)
+            Return resultaat
         Catch ex As Exception
-            Throw ex
+            Throw New Exception($"Kon ArdisData niet ophalen uit Ardis met barcode '{barcodeId}'{vbNewLine}{ex.Message}")
         End Try
     End Function
 
-    Public Function geefBarcodes(ByVal Partgroup As String, ByVal PartExt02 As String, ByVal PartL As String, ByVal LinksOfRechts As String) As List(Of String)
+    ''' <summary>
+    ''' Opvragen van barcodes aan de hand van parameters.
+    ''' </summary>
+    ''' <param name="partgroup">De PartGroup</param>
+    ''' <param name="partExt02">De PartExt02</param>
+    ''' <param name="partL">De PartL</param>
+    ''' <param name="linksOfRechts">L of R</param>
+    ''' <returns>Lijst van barcodes</returns>
+    Public Function GeefBarcodes(ByVal partgroup As String, ByVal partExt02 As String, ByVal partL As String, ByVal linksOfRechts As String) As List(Of String)
         Try
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes met info " & " Partgroup, PartExt02, LinksOfRechts: " & Partgroup & ", " & PartExt02 & ", " & LinksOfRechts)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes met info Partgroup, PartExt02, LinksOfRechts: {partgroup}{partExt02}{linksOfRechts}")
 
-            Dim result As List(Of String)
-            Dim query As String = "select distinct PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup=" & "'" & Partgroup & "'" & " and partext02=" & "'" & PartExt02 & "'" & " and partl=" & "'" & PartL & "'" & " and partext01 like 'ZIJ-" & LinksOfRechts & "%'"
-            result = getList(query)
+            'Query opbouwen.
+            Dim query As String = $"select distinct PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like 'ZIJ-{linksOfRechts}%'"
 
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes met info " & " Partgroup, PartExt02, LinksOfRechts: " & Partgroup & ", " & PartExt02 & ", " & LinksOfRechts, True)
+            'Query uitvoeren en resultaat retourneren.
+            Dim result = ExecuteIntoListOfString(query)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes met info Partgroup, PartExt02, LinksOfRechts: {partgroup}{partExt02}{linksOfRechts}", True)
             Return result
         Catch ex As Exception
-            Throw ex
+            Throw New Exception($"Kon barcodes niet ophalen uit Ardis met Partgroup, PartExt02, LinksOfRechts: {partgroup}{partExt02}{linksOfRechts}{vbNewLine}{ex.Message}")
         End Try
     End Function
 
-    Public Function geefBarcodeGegenereerdePlankjes(ByVal Partgroup As String, ByVal PartExt02 As String, ByVal PartL As String) As List(Of String)
+    ''' <summary>
+    ''' Opvragen van barcodes aan de hand van parameters voor gegenereerde plankjes.
+    ''' </summary>
+    ''' <param name="partgroup">De PartGroup</param>
+    ''' <param name="partExt02">De PartExt02</param>
+    ''' <param name="partL">De PartL</param>
+    ''' <returns>Lijst van barcodes</returns>
+    Public Function GeefBarcodesGegenereerdePlankjes(partgroup As String, partExt02 As String, partL As String) As List(Of String)
         Try
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes gegenereerde plankjes met info " & " Partgroup, PartExt02: " & Partgroup & ", " & PartExt02)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes gegenereerde plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'")
 
-            Dim result As List(Of String)
-            Dim query As String = "select top 2 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup=" & "'" & Partgroup & "'" & " and partext02=" & "'" & PartExt02 & "'" & " and partl=" & "'" & PartL & "'" & " and partext01 like '%ZIJ-%' and (partext09 ='A' or partext09='B') order by partid desc"
-            result = getList(query)
-
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes gegenereerde plankjes met info " & " Partgroup, PartExt02: " & Partgroup & ", " & PartExt02, True)
+            'Query opbouwen.
+            Dim query = $"select top 2 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='A' or partext09='B') order by partid desc"
+            'Query uitvoeren en resultaat retourneren.
+            Dim result = ExecuteIntoListOfString(query)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes gegenereerde plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'", True)
             Return result
         Catch ex As Exception
-            Throw ex
+            Throw New Exception($"Kon barcodes voor gegenereerde plankjes niet ophalen uit Ardis met Partgroup, PartExt02, LinksOfRechts: '{partgroup}' '{partExt02}' '{partL}' {vbNewLine}{ex.Message}")
         End Try
     End Function
 
-    Public Function geefBarcodeOrigineleBijGegenereerdePlankjes(ByVal Partgroup As String, ByVal PartExt02 As String, ByVal PartL As String) As List(Of String)
+    ''' <summary>
+    ''' Opvragen van de originele barcodes bij gegenereerde plankjes.
+    ''' </summary>
+    ''' <param name="partgroup">De PartGroup</param>
+    ''' <param name="partExt02">De PartExt02</param>
+    ''' <param name="partL">De PartL</param>
+    ''' <returns>Lijst van barcodes</returns>
+    Public Function GeefBarcodeOrigineleBijGegenereerdePlankjes(ByVal partgroup As String, ByVal partExt02 As String, ByVal partL As String) As List(Of String)
         Try
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes originele voor gegenereerde plankjes met info " & " Partgroup, PartExt02: " & Partgroup & ", " & PartExt02)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes originele plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'")
 
-            Dim result As List(Of String)
-            Dim query As String = "select top 4 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup=" & "'" & Partgroup & "'" & " and partext02=" & "'" & PartExt02 & "'" & " and partext01 like '%ZIJ-%' and not (partext09 ='A' or partext09='B') order by partid desc"
-            result = getList(query)
-
-            LogBestandTextMapper.writeToFile("Ardis", "Opvragen van barcodes originele voor gegenereerde plankjes met info " & " Partgroup, PartExt02: " & Partgroup & ", " & PartExt02, True)
+            'Query opbouwen.
+            Dim query = $"select top 4 PartCalc from [VH_Ardis_TST].[dbo].[Parts] where partgroup='{partgroup}' and partext02='{partExt02}' and partl='{partL}' and partext01 like '%ZIJ-%' and (partext09 ='A' or partext09='B') order by partid desc"
+            'Query uitvoeren en resultaat retourneren.
+            Dim result = ExecuteIntoListOfString(query)
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van barcodes originele plankjes met info Partgroup, PartExt02, PartL: '{partgroup}' '{partExt02}' '{partL}'", True)
             Return result
         Catch ex As Exception
-            Throw ex
+            Throw New Exception($"Kon barcodes voor originele plankjes niet ophalen uit Ardis met Partgroup, PartExt02, LinksOfRechts: '{partgroup}' '{partExt02}' '{partL}' {vbNewLine}{ex.Message}")
         End Try
     End Function
 
-    Private dr As SqlDataReader
-    Public Sub sluitDataReader()
-        If Not (dr Is Nothing OrElse dr.IsClosed) Then
-            dr.Close()
-        End If
-    End Sub
-
-    Public Function geefDataReader(waarde As String) As SqlDataReader
-        LogBestandTextMapper.writeToFile("Ardis", "Opvragen van DataReader met waarde: " & ", " & waarde)
-        Dim query As String = "select SUBSTRING(PartGroup, 0, 6) as BatchID, 'ToeleveringID' as ToeleveringID, substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, CHARINDEX('/', substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, len(partext03)))-1) as Naam, PartRemark as DossierCode, substring(substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)), CHARINDEX('/',substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)))+1,len(partext02)) as Kar, PartCalc as VerwerkingID, case PartRef when 'ZijkantPlaat' then 'Zijkant' else Partref end as Onderdeel, -1 as Status, 0 as Rework  FROM [VH_Ardis_TST].[dbo].[Parts] where Partcalc = '" & waarde & "'" & " and PartRemark3='NoRework'"
+    ''' <summary>
+    ''' Opvragen van de datatable aan de hand van de PartCalc.
+    ''' </summary>
+    ''' <param name="partCalc">De PartCalc</param>
+    ''' <returns>De data table</returns>
+    Public Function GeefDataTable(partCalc As String) As DataTable
         Try
-            sluitDataReader()
-            connectToArdis()
-            command = New SqlCommand(query, SQLConnection)
-            dr = command.ExecuteReader
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van data table met partCalc: '{partCalc}'")
+            'Query opbouwen.
+            Dim query As String = $"select SUBSTRING(PartGroup, 0, 6) as BatchID, 'ToeleveringID' as ToeleveringID, substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, CHARINDEX('/', substring(substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)), CHARINDEX('/',substring(PartExt03, CHARINDEX('/',PartExt03)+1, len(partext03)))+1, len(partext03)))-1) as Naam, PartRemark as DossierCode, substring(substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)), CHARINDEX('/',substring(PartExt02, CHARINDEX('/',PartExt02)+1, len(partext02)))+1,len(partext02)) as Kar, PartCalc as VerwerkingID, case PartRef when 'ZijkantPlaat' then 'Zijkant' else Partref end as Onderdeel, -1 as Status, 0 as Rework  FROM [VH_Ardis_TST].[dbo].[Parts] where Partcalc ='{partCalc}' and PartRemark3='NoRework'"
+
+            'Datareader opvragen en bijhouden.
+            Dim dataReader = ExecuteIntoDataReader(query)
+            'DataTable initialiseren en vullen met resultaat van de datareader.
+            Dim datatable = New DataTable()
+            datatable.Load(dataReader)
+            'Connectie van datareader sluiten.
+            dataReader.Close()
+            'Log
+            LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van data table met partCalc: '{partCalc}'", True)
+            'Retourneren van de datatable
+            Return datatable
         Catch ex As Exception
-            sluitDataReader()
-            Throw New Exception("Er is een fout opgetreden bij het ophalen van de reader data uit de Ardis databank " + ex.Message)
+            Throw New Exception($"Er is een fout opgetreden bij het ophalen van de data table uit de Ardis databank {vbNewLine}{ex.Message}")
         End Try
-        LogBestandTextMapper.writeToFile("Ardis", "Opvragen van DataReader met waarde: " & ", " & waarde, True)
-        Return dr
     End Function
 
 End Module
Index: TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb
===================================================================
diff -u -r1603 -r1609
--- TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb	(.../FormSelectID.vb)	(revision 1603)
+++ TAOR-rework-bugfixing/TAOR rework/formulieren/FormSelectID.vb	(.../FormSelectID.vb)	(revision 1609)
@@ -116,7 +116,7 @@
                 'Todo ardis ook updaten en datatable laten retourneren
                 'Er zijn geen rijen aanwezig en het type is een barcode.
                 'Data table opvragen opvragen
-                'dataTable = ArdisMapper.geefDataReader(input)
+                'dataTable = ArdisMapper.GeefDataTable(input)
                 'If DirectCast(dataTable, SqlDataReader).HasRows Then
                 '    gevondenArdis = True
                 'End If
Index: TAOR-rework-bugfixing/TAOR rework/databases/Cache/CacheMapper.vb
===================================================================
diff -u -r1608 -r1609
--- TAOR-rework-bugfixing/TAOR rework/databases/Cache/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1608)
+++ TAOR-rework-bugfixing/TAOR rework/databases/Cache/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1609)
@@ -235,9 +235,9 @@
     ''' <summary>
     ''' Opvragen van de datatable aan de hand van het type kolom en de waarde.
     ''' </summary>
-    ''' <param name="kolom"></param>
-    ''' <param name="waarde"></param>
-    ''' <returns></returns>
+    ''' <param name="kolom">Het type kolom</param>
+    ''' <param name="waarde">De waarde</param>
+    ''' <returns>De data table</returns>
     Public Function GeefDataTable(kolom As Kolommen, waarde As Object) As DataTable
         'Declaratie van de data reader.
         Dim dataReader As OdbcDataReader