MS änderungen select nur BEstellnr

SchaumKommiCollo/KommiCollo/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.1")>
+<Assembly: AssemblyVersion("2.1.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

SchaumKommiCollo/KommiCollo/frmMain.Designer.vb

@@ -120,6 +120,7 @@ Partial Class frmMain
         Me.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_TEXTSCHLUESSELTableAdapter()
         Me.TBKOMMCOLLI_HINWEISTableAdapter = New KommiCollo.MyDatasetTableAdapters.TBKOMMCOLLI_HINWEISTableAdapter()
         Me.bw_Tagesabschluss = New System.ComponentModel.BackgroundWorker()
+        Me.ToolStripStatusLabelVersion = New System.Windows.Forms.ToolStripStatusLabel()
         PAKET_IDLabel = New System.Windows.Forms.Label()
         Label3 = New System.Windows.Forms.Label()
         GESAMTGEWICHTLabel = New System.Windows.Forms.Label()
@@ -538,7 +539,7 @@ Partial Class frmMain
         '
         'StatusStrip1
         '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsinfolabel})
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsinfolabel, Me.ToolStripStatusLabelVersion})
         Me.StatusStrip1.Location = New System.Drawing.Point(0, 711)
         Me.StatusStrip1.Name = "StatusStrip1"
         Me.StatusStrip1.Size = New System.Drawing.Size(1209, 22)
@@ -1084,6 +1085,12 @@ Partial Class frmMain
         '
         Me.TBKOMMCOLLI_HINWEISTableAdapter.ClearBeforeFill = True
         '
+        'ToolStripStatusLabelVersion
+        '
+        Me.ToolStripStatusLabelVersion.Name = "ToolStripStatusLabelVersion"
+        Me.ToolStripStatusLabelVersion.Size = New System.Drawing.Size(48, 17)
+        Me.ToolStripStatusLabelVersion.Text = "Version:"
+        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!)
@@ -1237,4 +1244,5 @@ Partial Class frmMain
     Friend WithEvents TabPage4 As TabPage
     Friend WithEvents GridControlLHM As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridViewLHM As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents ToolStripStatusLabelVersion As ToolStripStatusLabel
 End Class

SchaumKommiCollo/KommiCollo/frmMain.vb

@@ -42,7 +42,7 @@ Public Class frmMain
         Catch ex As Exception
             MsgBox("Fehler bei Load ConnectionString frm Main: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
         End Try
-
+        ToolStripStatusLabelVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString)
     End Sub
 
     Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As System.Object, e As System.EventArgs) Handles GrundeinstellungenToolStripMenuItem.Click
@@ -124,35 +124,48 @@ Public Class frmMain
                 _LS_no = ""
             End Try
             If _EDV_no <> String.Empty And _LS_no <> String.Empty Then
-                Dim sql = String.Format("SELECT MIN(GUID) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}'", _EDV_no, _LS_no)
+                Dim sql = String.Format("SELECT * FROM VKKOPF WHERE GUID = (SELECT MAX(GUID) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}')", _EDV_no)
-                Dim GUID = ClassDatabase.Execute_Scalar_CS(sql, My.Settings.ConfigConnStringMercator, True)
+                Dim DT_ROW As DataTable = ClassDatabase.Return_Datatable_CS(sql, My.Settings.ConfigConnStringMercator)
-                If IsDBNull(GUID) Then
+                If IsNothing(DT_ROW) Then
-                    MsgBox("Für diese Kombination aus Lieferschein und EDV-Nr existieren keine Daten!", MsgBoxStyle.Exclamation)
+                    MsgBox("Für diese Bestellnummer wurde kein Eintrag gefunden!", MsgBoxStyle.Exclamation)
+                    Return False
+                ElseIf DT_ROW.Rows.Count <> 1 Then
+                    MsgBox("Für diese Bestellnummer wurde mehr als ein Eintrag gefunden!", MsgBoxStyle.Exclamation)
                     Return False
                 End If
-                Dim getMERC_SELECT = String.Format("select TOP 1 vkkopf_kunde FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                ' Dim GUID = ClassDatabase.Execute_Scalar_CS(sql, My.Settings.ConfigConnStringMercator, True)
-                Dim MERC_KDNR = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                ' If IsDBNull(GUID) Then
+
+                'End If
+                ' Dim getMERC_SELECT = String.Format("select TOP 1 vkkopf_kunde FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                Dim MERC_KDNR = DT_ROW.Rows(0).Item("vkkopf_kunde") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
                 If MERC_KDNR Is Nothing Then
-
+                    MsgBox("Es konnte keine Kundennummer selektiert werden!", MsgBoxStyle.Exclamation)
-
-                    MsgBox("Für diese Kombination aus Lieferschein und EDV-Nr konnten keine Werte aus Merkator geholt werden!", MsgBoxStyle.Exclamation)
                     Return False
                 End If
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name1])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name1])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
-                Dim MERC_LIEFADR1 = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                Dim MERC_LIEFADR1 = DT_ROW.Rows(0).Item("vkkopf_liefadr_name1")
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name2])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                MERC_LIEFADR1 = LTrim(RTrim(MERC_LIEFADR1))
-                Dim MERC_LIEFADR2 = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_strasse])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                ' getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_name2])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
-                Dim MERC_LIEFSTR = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                'Dim MERC_LIEFADR2 = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_land_nr])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                Dim MERC_LIEFADR2 = DT_ROW.Rows(0).Item("vkkopf_liefadr_name2")
-                Dim MERC_LIEFLAND = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                MERC_LIEFADR2 = LTrim(RTrim(MERC_LIEFADR2))
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ldplz])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_strasse])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
-                Dim MERC_LIEFPLZ = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                Dim MERC_LIEFSTR = DT_ROW.Rows(0).Item("vkkopf_liefadr_strasse") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ort])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                MERC_LIEFSTR = LTrim(RTrim(MERC_LIEFSTR))
-                Dim MERC_LIEFORT = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_land_nr])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, Guid)
-                getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_gew_netto])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                Dim MERC_LIEFLAND = DT_ROW.Rows(0).Item("vkkopf_liefadr_land_nr") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
-                Dim MERC_GEWICHT = ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                MERC_LIEFLAND = LTrim(RTrim(MERC_LIEFLAND))
-
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ldplz])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, GUID)
+                Dim MERC_LIEFPLZ = DT_ROW.Rows(0).Item("vkkopf_liefadr_ldplz") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                MERC_LIEFPLZ = LTrim(RTrim(MERC_LIEFPLZ))
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_liefadr_ort])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, Guid)
+                Dim MERC_LIEFORT = DT_ROW.Rows(0).Item("vkkopf_liefadr_ort") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                MERC_LIEFORT = LTrim(RTrim(MERC_LIEFORT))
+                'getMERC_SELECT = String.Format("select TOP 1 LTRIM(RTRIM([vkkopf_gew_netto])) FROM VKKOPF WHERE vkkopf_bestellnr = '{0}' and [vkkopf_eingang_nr] = '{1}' AND GUID = {2}", _EDV_no, _LS_no, Guid)
+                Dim MERC_GEWICHT = DT_ROW.Rows(0).Item("vkkopf_gew_netto") 'ClassDatabase.Execute_Scalar_CS(getMERC_SELECT, My.Settings.ConfigConnStringMercator, True)
+                MERC_GEWICHT = LTrim(RTrim(MERC_GEWICHT))
                 If CURR_LIEFADR = "" And CURR_Ort = "" Then
                     CURR_LIEFADR = MERC_LIEFADR1
                     CURR_Ort = MERC_LIEFORT

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.BindOutputsFileListde-DE.txt

@@ -1,2 +1,2 @@
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb

SchaumKommiCollo/SetupWix/obj/Debug/SetupWix.wixproj.FileList.txt

@@ -2,9 +2,9 @@ E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.ms
 E:\JenneJ\Visual Studio\SchaumKommi\SetupWix\bin\Debug\KommiCollo-x86-1.0.0.0.wixpdb
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.msi
 E:\SchreiberM\Visual Studio\GIT\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.0.wixpdb
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.msi
-E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.0.0.1.wixpdb
 obj\Debug\Product.wixobj
 obj\Debug\SetupWix.wixproj.BindContentsFileListde-DE.txt
 obj\Debug\SetupWix.wixproj.BindOutputsFileListde-DE.txt
 obj\Debug\SetupWix.wixproj.BindBuiltOutputsFileListde-DE.txt
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.msi
+E:\SchreiberM\Visual Studio\GIT\SchaumKommi\SchaumKommiCollo\SetupWix\bin\Debug\KommiCollo-x86-2.1.0.0.wixpdb