ms

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\MC_SUPPLYWATCH.sln",
+  "PreviewInSolutionExplorer": false
+}

Supplywatch/FMMain.resx

@@ -267,9 +267,6 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="rptViewerBestellungen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="VWSUPPLIES_BESTELLUNG_GESENDETBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>975, 602</value>
   </metadata>
@@ -1016,7 +1013,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2
-        CwAAAk1TRnQBSQFMAgEBAwEAAYABIQGAASEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBAwEAAYgBIQGIASEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Supplywatch/FMMain.vb

@@ -540,7 +540,7 @@ Public Class FMMain
             Gesamtfiles = 0
             Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
             For Each file As IO.FileInfo In diPfad.GetFiles()
-                If file.Name.EndsWith(".xls") Then
+                If file.Name.ToUpper.EndsWith(".XLS") Then
                     Gesamtfiles = Gesamtfiles + 1
                 End If
             Next
@@ -557,7 +557,7 @@ Public Class FMMain
         Dim Counter As Integer = 0
         For Each file As IO.FileInfo In diPfad.GetFiles()
             ' Dim vDatum As String = ""
-            If file.Name.EndsWith(".xls") Then
+            If file.Name.ToUpper.EndsWith(".XLS") Then
                 Anzahl_Dateien = Anzahl_Dateien + 1
                 Progress += 25
                 'bwXMLverarbeiten.ReportProgress(Progress)
@@ -682,11 +682,11 @@ Public Class FMMain
                                             Dim value As New String(_VAS)
                                             _VAS = value
                                             If chkLogData.Checked Then
-                                                Dim msg = "Device: '" & _gerät & "'" & vbNewLine & _
-                                                       "Serial: '" & _seriennr & "'" & vbNewLine & _
-                                                       "Markt: '" & _markt & "'" & vbNewLine & _
-                                                       "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine & _
-                                                       "Supply: '" & _gerät & "'" & vbNewLine & _
+                                                Dim msg = "Device: '" & _gerät & "'" & vbNewLine &
+                                                       "Serial: '" & _seriennr & "'" & vbNewLine &
+                                                       "Markt: '" & _markt & "'" & vbNewLine &
+                                                       "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine &
+                                                       "Supply: '" & _gerät & "'" & vbNewLine &
                                                        "VAS#: '" & _VAS & "'"
                                                 ClassLogger.Add(msg, False)
                                             End If
@@ -739,7 +739,7 @@ Public Class FMMain
                         Next
                     End If
 
-                    
+
                 End If
 
                 'For Each DC In DT.Columns
@@ -767,8 +767,8 @@ Public Class FMMain
             'Instanz des DataSet-Objektes instanzieren
             Dim ds As New DataSet
             'Verbindungszeichenfolge festlegen, der Name der Excel-Datei wird als Parameter übergeben
-            Dim con As String = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" & _
-                       "Extended Properties=""Excel 8.0;"""
+            Dim con As String = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" &
+                       "Extended Properties=""Excel 8.0;HDR=YES;"""
             Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", con)
             'DataSet füllen
             da.Fill(ds)
@@ -778,6 +778,14 @@ Public Class FMMain
             Return ds
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei XLSReader:")
+            Dim newcon As String = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=" + filepath + ";Extended Properties=Excel 12.0;"";"
+            Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", newcon)
+            'DataSet füllen
+            Dim ds As New DataSet
+            da.Fill(ds)
+            Dim DT As System.Data.DataTable
+            DT = ds.Tables(0)
+            MsgBox("New Connectionw as established")
             Return Nothing
         End Try
     End Function
@@ -2049,7 +2057,7 @@ Public Class FMMain
                     Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
                     Dim _count As Integer = 0
                     For Each file As IO.FileInfo In diPfad.GetFiles()
-                        If file.Name.EndsWith(".xls") Then
+                        If file.Name.ToUpper.EndsWith(".XLS") Then
                             _count = _count + 1
                         End If
                     Next

Supplywatch/My Project/licenses.licx

@@ -1 +1 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Supplywatch/Supplywatch.vbproj

@@ -71,13 +71,34 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DevExpress.Data.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Utils.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraLayout.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Reporting.WinForms.v11.1.0.0.0\lib\Microsoft.ReportViewer.Common.dll</HintPath>
     </Reference>

Supplywatch/obj/x86/Debug/Supplywatch.vbproj.FileListAbsolute.txt

@@ -210,4 +210,3 @@ E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATC
 E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.exe
 E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.xml
 E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\SUPPLYWATCH.pdb
-E:\SchreiberM\Visual Studio\GIT\Supplywatch\Supplywatch\obj\x86\Debug\Supplywatch.vbprojResolveAssemblyReference.cache

Supplywatch/obj/x86/Release/CoreCompileInputs.cache

@@ -0,0 +1 @@
+cdb33d364782c05efad8b9e4ca2ee0ee62f779bd