Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

2023-06-23 22:46:58 +02:00
parent 8b3886014f 7cb025586a
commit decaea1dff
8 changed files with 806 additions and 355 deletions
--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -28,6 +28,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label22 = New System.Windows.Forms.Label()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.cbxAlleAnzeigen = New System.Windows.Forms.CheckBox()
        Me.lblBestellungBis = New System.Windows.Forms.Label()
        Me.btnBestelllimit = New System.Windows.Forms.Button()
        Me.lblDaysToOrder = New System.Windows.Forms.Label()
@@ -79,7 +80,8 @@ Partial Class frmEssensbestellungenAdministration
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Label9 = New System.Windows.Forms.Label()
-        Me.cbxAlleAnzeigen = New System.Windows.Forms.CheckBox()
+        Me.ExportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -159,6 +161,16 @@ Partial Class frmEssensbestellungenAdministration
        Me.Panel1.Size = New System.Drawing.Size(1242, 106)
        Me.Panel1.TabIndex = 2
        '
+        'cbxAlleAnzeigen
+        '
+        Me.cbxAlleAnzeigen.AutoSize = True
+        Me.cbxAlleAnzeigen.Location = New System.Drawing.Point(668, 79)
+        Me.cbxAlleAnzeigen.Name = "cbxAlleAnzeigen"
+        Me.cbxAlleAnzeigen.Size = New System.Drawing.Size(42, 17)
+        Me.cbxAlleAnzeigen.TabIndex = 72
+        Me.cbxAlleAnzeigen.Text = "alle"
+        Me.cbxAlleAnzeigen.UseVisualStyleBackColor = True
+        '
        'lblBestellungBis
        '
        Me.lblBestellungBis.AutoSize = True
@@ -612,9 +624,9 @@ Partial Class frmEssensbestellungenAdministration
        '
        'ContextMenuStrip1
        '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StornierenToolStripMenuItem, Me.AbgerechnetToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.AnHigway118SchickenToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StornierenToolStripMenuItem, Me.AbgerechnetToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.AnHigway118SchickenToolStripMenuItem, Me.ExportToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 92)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 136)
        '
        'StornierenToolStripMenuItem
        '
@@ -798,15 +810,18 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label9.Text = "Gesamtbetrag"
        Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'cbxAlleAnzeigen
+        'ExportToolStripMenuItem
        '
-        Me.cbxAlleAnzeigen.AutoSize = True
-        Me.cbxAlleAnzeigen.Location = New System.Drawing.Point(668, 79)
-        Me.cbxAlleAnzeigen.Name = "cbxAlleAnzeigen"
-        Me.cbxAlleAnzeigen.Size = New System.Drawing.Size(42, 17)
-        Me.cbxAlleAnzeigen.TabIndex = 72
-        Me.cbxAlleAnzeigen.Text = "alle"
-        Me.cbxAlleAnzeigen.UseVisualStyleBackColor = True
+        Me.ExportToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExcelToolStripMenuItem})
+        Me.ExportToolStripMenuItem.Name = "ExportToolStripMenuItem"
+        Me.ExportToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
+        Me.ExportToolStripMenuItem.Text = "Export"
+        '
+        'ExcelToolStripMenuItem
+        '
+        Me.ExcelToolStripMenuItem.Name = "ExcelToolStripMenuItem"
+        Me.ExcelToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExcelToolStripMenuItem.Text = "Excel"
        '
        'frmEssensbestellungenAdministration
        '
@@ -899,4 +914,6 @@ Partial Class frmEssensbestellungenAdministration
    Friend WithEvents btnBestelllimit As Button
    Friend WithEvents lblBestellungBis As Label
    Friend WithEvents cbxAlleAnzeigen As CheckBox
+    Friend WithEvents ExportToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ExcelToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -823,5 +823,57 @@ Public Class frmEssensbestellungenAdministration

    End Sub

+    Private Sub ExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExcelToolStripMenuItem.Click
+        Me.Cursor =
+            Cursors.WaitCursor
+        Try
+            If dgvBestellungen.SelectedRows.Count = 0 Then
+                lblWarning.Text = "keine Bestellungen markiert!"
+                Me.Cursor = Cursors.Default
+                Exit Sub
+            End If

+
+
+            Dim dtSource As DataTable
+            dtSource = CType(dgvBestellungen.DataSource, DataTable)
+            Dim dt = dtSource.Clone()
+
+            For Each row As DataGridViewRow In dgvBestellungen.SelectedRows
+
+                dt.ImportRow(dtSource.Rows(row.Index))
+
+            Next
+
+            dt.DefaultView.Sort = "eb_mitid ASC, eb_kw ASC"
+            dt = dt.DefaultView.ToTable
+
+            Dim drFirst = dt.NewRow
+            drFirst.Item("eb_mitname") = "Bestellungen von " & txtBestellDat.Text & " bis " & txtBestellDatBis.Text
+            drFirst.Item("eb_mitId") = 0
+            drFirst.Item("eb_kw") = " "
+            drFirst.Item("eb_gebaeude") = " "
+            drFirst.Item("eb_abteilung") = " "
+            drFirst.Item("eb_preis") = 0
+
+            dt.Rows.InsertAt(drFirst, 0)
+
+            Dim drLast = dt.NewRow
+            drLast.Item("eb_mitname") = "Gesamtsumme: "
+            drLast.Item("eb_mitId") = 0
+            drLast.Item("eb_kw") = " "
+            drLast.Item("eb_gebaeude") = " "
+            drLast.Item("eb_abteilung") = " "
+            drLast.Item("eb_preis") = txtMarkierteDS.Text.Replace("€", "")
+            dt.Rows.InsertAt(drLast, dt.Rows.Count)
+
+            dt.Columns.Remove("eb_mitid")
+
+            SDL.cProgramFunctions.genExcelFromDT_NEW(dt)
+
+                Me.Cursor = Cursors.Default
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
 End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -27,7 +27,9 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.dgvListe = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ExportCSVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ExportCSV2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DetaillisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ReferenzlisteZollamtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SaldenNeuBerechnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.btnOpenOver85Days = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -51,12 +53,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Label4 = New System.Windows.Forms.Label()
        Me.cbxStandort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.lblFiliale = New System.Windows.Forms.Label()
-        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnSucheStarten = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.txtbis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.txtVon = New VERAG_PROG_ALLGEMEIN.MyTextBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.btnResetFilter = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.txtSuchbegriff = New System.Windows.Forms.TextBox()
@@ -88,21 +85,34 @@ Partial Class frmGesamtsicherheitenMenuNEU
        '
        'ContextMenuStrip1
        '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.ExportCSV2ToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.SaldenNeuBerechnenToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 70)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(192, 48)
        '
        'ExportCSVToolStripMenuItem
        '
+        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, Me.DetaillisteToolStripMenuItem, Me.ReferenzlisteZollamtToolStripMenuItem})
        Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
        Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
        '
-        'ExportCSV2ToolStripMenuItem
+        'ListeToolStripMenuItem
        '
-        Me.ExportCSV2ToolStripMenuItem.Name = "ExportCSV2ToolStripMenuItem"
-        Me.ExportCSV2ToolStripMenuItem.Size = New System.Drawing.Size(191, 22)
-        Me.ExportCSV2ToolStripMenuItem.Text = "Export CSV Details"
+        Me.ListeToolStripMenuItem.Name = "ListeToolStripMenuItem"
+        Me.ListeToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.ListeToolStripMenuItem.Text = "Liste"
+        '
+        'DetaillisteToolStripMenuItem
+        '
+        Me.DetaillisteToolStripMenuItem.Name = "DetaillisteToolStripMenuItem"
+        Me.DetaillisteToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.DetaillisteToolStripMenuItem.Text = "Detailliste"
+        '
+        'ReferenzlisteZollamtToolStripMenuItem
+        '
+        Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem"
+        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt"
        '
        'SaldenNeuBerechnenToolStripMenuItem
        '
@@ -134,12 +144,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.Panel1.Controls.Add(Me.Label4)
        Me.Panel1.Controls.Add(Me.cbxStandort)
        Me.Panel1.Controls.Add(Me.lblFiliale)
-        Me.Panel1.Controls.Add(Me.FlatButton2)
        Me.Panel1.Controls.Add(Me.btnSucheStarten)
-        Me.Panel1.Controls.Add(Me.txtbis)
-        Me.Panel1.Controls.Add(Me.txtVon)
-        Me.Panel1.Controls.Add(Me.Label3)
-        Me.Panel1.Controls.Add(Me.Label2)
        Me.Panel1.Controls.Add(Me.Label1)
        Me.Panel1.Controls.Add(Me.btnResetFilter)
        Me.Panel1.Controls.Add(Me.txtSuchbegriff)
@@ -460,22 +465,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.lblFiliale.TabIndex = 4
        Me.lblFiliale.Text = "Filiale:"
        '
-        'FlatButton2
-        '
-        Me.FlatButton2.allowBorder = False
-        Me.FlatButton2.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.FlatButton2.BackColor = System.Drawing.Color.White
-        Me.FlatButton2.FlatAppearance.BorderSize = 0
-        Me.FlatButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.FlatButton2.ForeColor = System.Drawing.Color.Black
-        Me.FlatButton2.Location = New System.Drawing.Point(565, 220)
-        Me.FlatButton2.Name = "FlatButton2"
-        Me.FlatButton2.Size = New System.Drawing.Size(81, 20)
-        Me.FlatButton2.TabIndex = 30
-        Me.FlatButton2.Text = "jedes Datum"
-        Me.FlatButton2.UseVisualStyleBackColor = False
-        Me.FlatButton2.Visible = False
-        '
        'btnSucheStarten
        '
        Me.btnSucheStarten.allowBorder = False
@@ -490,84 +479,6 @@ Partial Class frmGesamtsicherheitenMenuNEU
        Me.btnSucheStarten.Text = "Suche starten"
        Me.btnSucheStarten.UseVisualStyleBackColor = False
        '
-        'txtbis
-        '
-        Me.txtbis._DateTimeOnly = False
-        Me.txtbis._numbersOnly = False
-        Me.txtbis._numbersOnlyKommastellen = ""
-        Me.txtbis._numbersOnlyTrennzeichen = True
-        Me.txtbis._Prozent = False
-        Me.txtbis._ShortDateNew = False
-        Me.txtbis._ShortDateOnly = False
-        Me.txtbis._TimeOnly = False
-        Me.txtbis._TimeOnly_Seconds = False
-        Me.txtbis._value = ""
-        Me.txtbis._Waehrung = False
-        Me.txtbis._WaehrungZeichen = True
-        Me.txtbis.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.txtbis.ForeColor = System.Drawing.Color.Black
-        Me.txtbis.Location = New System.Drawing.Point(565, 196)
-        Me.txtbis.MaxLineLength = -1
-        Me.txtbis.MaxLines_Warning = ""
-        Me.txtbis.MaxLines_Warning_Label = Nothing
-        Me.txtbis.Name = "txtbis"
-        Me.txtbis.Size = New System.Drawing.Size(81, 20)
-        Me.txtbis.TabIndex = 24
-        Me.txtbis.TabStop = False
-        Me.txtbis.Visible = False
-        '
-        'txtVon
-        '
-        Me.txtVon._DateTimeOnly = False
-        Me.txtVon._numbersOnly = False
-        Me.txtVon._numbersOnlyKommastellen = ""
-        Me.txtVon._numbersOnlyTrennzeichen = True
-        Me.txtVon._Prozent = False
-        Me.txtVon._ShortDateNew = False
-        Me.txtVon._ShortDateOnly = False
-        Me.txtVon._TimeOnly = False
-        Me.txtVon._TimeOnly_Seconds = False
-        Me.txtVon._value = ""
-        Me.txtVon._Waehrung = False
-        Me.txtVon._WaehrungZeichen = True
-        Me.txtVon.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.txtVon.ForeColor = System.Drawing.Color.Black
-        Me.txtVon.Location = New System.Drawing.Point(562, 153)
-        Me.txtVon.MaxLineLength = -1
-        Me.txtVon.MaxLines_Warning = ""
-        Me.txtVon.MaxLines_Warning_Label = Nothing
-        Me.txtVon.Name = "txtVon"
-        Me.txtVon.Size = New System.Drawing.Size(81, 20)
-        Me.txtVon.TabIndex = 15
-        Me.txtVon.TabStop = False
-        Me.txtVon.Visible = False
-        '
-        'Label3
-        '
-        Me.Label3.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.Label3.AutoSize = True
-        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.Label3.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label3.Location = New System.Drawing.Point(562, 177)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(24, 15)
-        Me.Label3.TabIndex = 22
-        Me.Label3.Text = "Bis"
-        Me.Label3.Visible = False
-        '
-        'Label2
-        '
-        Me.Label2.Anchor = System.Windows.Forms.AnchorStyles.Right
-        Me.Label2.AutoSize = True
-        Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!)
-        Me.Label2.ForeColor = System.Drawing.Color.Honeydew
-        Me.Label2.Location = New System.Drawing.Point(562, 134)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(28, 15)
-        Me.Label2.TabIndex = 10
-        Me.Label2.Text = "Von"
-        Me.Label2.Visible = False
-        '
        'Label1
        '
        Me.Label1.AutoSize = True
@@ -710,13 +621,8 @@ Partial Class frmGesamtsicherheitenMenuNEU
    Friend WithEvents chkOffen As CheckBox
    Friend WithEvents txtSuchbegriff As TextBox
    Friend WithEvents btnResetFilter As VERAG_PROG_ALLGEMEIN.FlatButton
-    Friend WithEvents Label3 As Label
-    Friend WithEvents Label2 As Label
    Friend WithEvents Label1 As Label
-    Friend WithEvents txtbis As VERAG_PROG_ALLGEMEIN.MyTextBox
-    Friend WithEvents txtVon As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents btnSucheStarten As VERAG_PROG_ALLGEMEIN.FlatButton
-    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
    Friend WithEvents ExportCSVToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents lblFiliale As Label
@@ -740,7 +646,9 @@ Partial Class frmGesamtsicherheitenMenuNEU
    Friend WithEvents Label25 As Label
    Friend WithEvents DateTimePicker1 As DateTimePicker
    Friend WithEvents btnOpenOver85Days As VERAG_PROG_ALLGEMEIN.FlatButton
-    Friend WithEvents ExportCSV2ToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents SaldenNeuBerechnenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents btnExcel As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents ListeToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents ReferenzlisteZollamtToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents DetaillisteToolStripMenuItem As ToolStripMenuItem
 End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -350,8 +350,6 @@ Public Class frmGesamtsicherheitenMenuNEU

        Dim anzahlOffenerGSUeber85Tage As Integer

-        Dim dtNew As New DataTable
-
        Dim sqlstring As String = "select count(*) as anzahlOffeneATBs from (Select gs_gsnr as gs_gsnr, MIN(gs_standort) as gs_standort,min (gs_datum) as gs_datum, 
                  (Select SUM( Case 
 			when gs_art = 'Open' then (gs_sicherheitsbetrag * -1)
@@ -368,7 +366,7 @@ Public Class frmGesamtsicherheitenMenuNEU
            From [tblGesamtsicherheit] as meh group by gs_gsnr) as meh2
            Where gs_standort = '" & Standort & "'AND Sicherheitssaldo <> 0  AND gs_datum < '" & Date.Now().AddDays(-85) & "'"

-        dtNew = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)
+        Dim dtNew As DataTable = SQL.loadDgvBySql(sqlstring, "AVISO", 100, True)

        If (dtNew.Rows(0).Item(0) IsNot DBNull.Value) Then

@@ -383,31 +381,43 @@ Public Class frmGesamtsicherheitenMenuNEU

    End Function

-    Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ExportCSVToolStripMenuItem.Click
+    Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ListeToolStripMenuItem.Click

        SDL.cProgramFunctions.genExcelFromDGV_NEW(dgvListe)

    End Sub

-    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportCSV2ToolStripMenuItem.Click
-
-        If dgvListe.Rows.Count > 0 Then
-            Dim list As New List(Of Integer)
-
-            For Each row As DataGridViewRow In dgvListe.Rows
-                list.Add(CInt(row.Cells("gs_gsnr").Value))
-
-
-            Next
-            Dim frm As New frmGesamtsicherheitenNEU
-
-            Dim datumVon As String = DateTimePicker1.Value.AddDays(-1)
-
-            frm.LoadDataTableSicherheitenForExport(list, datumVon, txtDatBis.Text)
-
-            SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReferenzlisteZollamtToolStripMenuItem.Click, DetaillisteToolStripMenuItem.Click

+        If dgvListe.Rows.Count = 0 Then
+            MsgBox("keine Daten vorhanden!")
+            Exit Sub
        End If
+
+        Dim list As New List(Of Integer)
+
+        For Each row As DataGridViewRow In dgvListe.Rows
+            list.Add(CInt(row.Cells("gs_gsnr").Value))
+        Next
+
+        Dim frm As New frmGesamtsicherheitenNEU
+
+        Dim datumVon As Date = CDate(txtDatVon.Text)
+
+        datumVon = datumVon.AddDays(-1)
+
+        If sender.ToString = "Detailliste" Then
+
+            frm.LoadDataTableSicherheitenForExport2(list, datumVon.ToShortDateString, txtDatBis.Text)
+        ElseIf sender.ToString = "Referenzliste-Zollamt" Then
+            frm.LoadDataTableSicherheitenForExport(list, datumVon.ToShortDateString, txtDatBis.Text, Standort)
+        Else
+            MsgBox("Funktion nicht definiert!")
+            Exit Sub
+        End If
+
+        SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+
    End Sub

    Private Sub chkOffen_CheckedChanged_1(sender As Object, e As EventArgs) Handles chkOffen.CheckedChanged
@@ -443,4 +453,6 @@ Public Class frmGesamtsicherheitenMenuNEU
        End Select

    End Sub
+
+
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb
@@ -114,12 +114,8 @@ Partial Class frmGesamtsicherheitenNEU
        Me.btnRundungsdifAusgl = New System.Windows.Forms.Button()
        Me.btnNew = New System.Windows.Forms.Button()
        Me.cbx_offene = New System.Windows.Forms.CheckBox()
-        Me.btnSuche = New System.Windows.Forms.Button()
-        Me.cbx_Suche_Warenort = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Label19 = New System.Windows.Forms.Label()
-        Me.txt_Suche = New System.Windows.Forms.TextBox()
+        Me.txtSuche = New System.Windows.Forms.TextBox()
        Me.Label21 = New System.Windows.Forms.Label()
-        Me.btn_resetSearch = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnDeletePos = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnDeleteSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
        Me.btnUpdatePos = New VERAG_PROG_ALLGEMEIN.FlatButton()
@@ -1284,12 +1280,8 @@ Partial Class frmGesamtsicherheitenNEU
        Me.Panel1.Controls.Add(Me.btnRundungsdifAusgl)
        Me.Panel1.Controls.Add(Me.btnNew)
        Me.Panel1.Controls.Add(Me.cbx_offene)
-        Me.Panel1.Controls.Add(Me.btnSuche)
-        Me.Panel1.Controls.Add(Me.cbx_Suche_Warenort)
-        Me.Panel1.Controls.Add(Me.Label19)
-        Me.Panel1.Controls.Add(Me.txt_Suche)
+        Me.Panel1.Controls.Add(Me.txtSuche)
        Me.Panel1.Controls.Add(Me.Label21)
-        Me.Panel1.Controls.Add(Me.btn_resetSearch)
        Me.Panel1.Location = New System.Drawing.Point(3, 41)
        Me.Panel1.Name = "Panel1"
        Me.Panel1.Size = New System.Drawing.Size(1384, 61)
@@ -1333,77 +1325,25 @@ Partial Class frmGesamtsicherheitenNEU
        Me.cbx_offene.Text = "nur offene anzeigen"
        Me.cbx_offene.UseVisualStyleBackColor = True
        '
-        'btnSuche
+        'txtSuche
        '
-        Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSuche.Location = New System.Drawing.Point(737, 3)
-        Me.btnSuche.Name = "btnSuche"
-        Me.btnSuche.Size = New System.Drawing.Size(162, 52)
-        Me.btnSuche.TabIndex = 7
-        Me.btnSuche.Text = "Suche starten"
-        Me.btnSuche.UseVisualStyleBackColor = True
-        '
-        'cbx_Suche_Warenort
-        '
-        Me.cbx_Suche_Warenort._allowedValuesFreiText = Nothing
-        Me.cbx_Suche_Warenort._allowFreiText = False
-        Me.cbx_Suche_Warenort._value = ""
-        Me.cbx_Suche_Warenort.DropDownWidth = 300
-        Me.cbx_Suche_Warenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbx_Suche_Warenort.FormattingEnabled = True
-        Me.cbx_Suche_Warenort.Location = New System.Drawing.Point(274, 20)
-        Me.cbx_Suche_Warenort.MaxLength = 4
-        Me.cbx_Suche_Warenort.Name = "cbx_Suche_Warenort"
-        Me.cbx_Suche_Warenort.Size = New System.Drawing.Size(95, 24)
-        Me.cbx_Suche_Warenort.TabIndex = 6
-        Me.cbx_Suche_Warenort.Visible = False
-        '
-        'Label19
-        '
-        Me.Label19.AutoSize = True
-        Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label19.Location = New System.Drawing.Point(271, 3)
-        Me.Label19.Name = "Label19"
-        Me.Label19.Size = New System.Drawing.Size(63, 13)
-        Me.Label19.TabIndex = 2
-        Me.Label19.Text = "Warenort:"
-        Me.Label19.Visible = False
-        '
-        'txt_Suche
-        '
-        Me.txt_Suche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txt_Suche.Location = New System.Drawing.Point(379, 19)
-        Me.txt_Suche.Margin = New System.Windows.Forms.Padding(0)
-        Me.txt_Suche.Name = "txt_Suche"
-        Me.txt_Suche.Size = New System.Drawing.Size(243, 24)
-        Me.txt_Suche.TabIndex = 5
+        Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSuche.Location = New System.Drawing.Point(208, 19)
+        Me.txtSuche.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtSuche.Name = "txtSuche"
+        Me.txtSuche.Size = New System.Drawing.Size(243, 24)
+        Me.txtSuche.TabIndex = 5
        '
        'Label21
        '
        Me.Label21.AutoSize = True
        Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label21.Location = New System.Drawing.Point(376, 3)
+        Me.Label21.Location = New System.Drawing.Point(205, 3)
        Me.Label21.Name = "Label21"
        Me.Label21.Size = New System.Drawing.Size(47, 13)
        Me.Label21.TabIndex = 1
        Me.Label21.Text = "Suche:"
        '
-        'btn_resetSearch
-        '
-        Me.btn_resetSearch.allowBorder = False
-        Me.btn_resetSearch.BackColor = System.Drawing.Color.White
-        Me.btn_resetSearch.FlatAppearance.BorderSize = 0
-        Me.btn_resetSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btn_resetSearch.ForeColor = System.Drawing.Color.Black
-        Me.btn_resetSearch.Image = Global.AVISO.My.Resources.Resources.refresh
-        Me.btn_resetSearch.Location = New System.Drawing.Point(660, 10)
-        Me.btn_resetSearch.Name = "btn_resetSearch"
-        Me.btn_resetSearch.Size = New System.Drawing.Size(32, 33)
-        Me.btn_resetSearch.TabIndex = 4
-        Me.btn_resetSearch.UseVisualStyleBackColor = False
-        '
        'btnDeletePos
        '
        Me.btnDeletePos.allowBorder = False
@@ -1744,7 +1684,6 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents txtSicherheitSicherheitsbetrag As TextBox
    Friend WithEvents txtSicherheitWarenwert As TextBox
    Friend WithEvents txtSicherheitATBNr As TextBox
-    Friend WithEvents btn_resetSearch As VERAG_PROG_ALLGEMEIN.FlatButton
    Friend WithEvents lblZollsatz As Label
    Friend WithEvents lblReferenzwert As Label
    Friend WithEvents lblSaldo As Label
@@ -1787,11 +1726,8 @@ Partial Class frmGesamtsicherheitenNEU
    Friend WithEvents ContextMenuStripGesSicherh As ContextMenuStrip
    Friend WithEvents ATBNraendernToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents Panel1 As Panel
-    Friend WithEvents cbx_Suche_Warenort As VERAG_PROG_ALLGEMEIN.MyComboBox
-    Friend WithEvents Label19 As Label
-    Friend WithEvents txt_Suche As TextBox
+    Friend WithEvents txtSuche As TextBox
    Friend WithEvents Label21 As Label
-    Friend WithEvents btnSuche As Button
    Friend WithEvents Label20 As Label
    Friend WithEvents txtPosNr As TextBox
    Friend WithEvents lbloffenerSaldo As Label
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -68,9 +68,6 @@ Public Class frmGesamtsicherheitenNEU

        Me.Text = "Gesamtsicherheit " & Standort

-
-        cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge]", True, "AVISO", True)
-
        If setNullToZero(gessicherheitID) = "" Or Neu = True Then

            panOben.Enabled = False : panOben.Enabled = False
@@ -106,16 +103,13 @@ Public Class frmGesamtsicherheitenNEU

    Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False)

-
-        'lblSaldo.Text = "Saldo:     € " & currentGesSichRef.gsr_Saldo.ToString()
        txtGestellInfo.Text = ""
        Dim sqladd1 As String = ""
        If currentGesSichRef.brgakto_gs_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.brgakto_gs_ust & "/100), 'C', 'de-DE') as gs_ust"
        If currentGesSichRef.brgakto_gs_ATR Then sqladd1 &= ", [gs_atr]"
        Dim sqlSearchSting As String = ""
        If withFilterParam = True Then
-            If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')"
-            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
+            If txtSuche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
            If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0"
        End If

@@ -183,7 +177,95 @@ Public Class frmGesamtsicherheitenNEU

    End Sub

-    Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As String, datumBis As String)
+    Public Sub LoadDataTableSicherheitenForExport(list As List(Of Integer), datumVon As String, datumBis As String, standort As String)
+
+        Me.Cursor = Cursors.WaitCursor
+
+        Dim currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(standort)
+
+
+        Dim gsnr As String
+        Dim counter = 0
+        For Each n In list
+            gsnr &= n.ToString()
+            counter = counter + 1
+            If (list.Count <> 0 And counter <> list.Count) Then
+                gsnr &= ","
+            End If
+
+        Next
+
+        'Dim SQLStringSicherheit As String = "select  [gs_ATBNr] as 'ATB Verwahrlager',[gs_gsnr] as 'GS Nr', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_saldo] as Saldo, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',  
+        '                                    [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_datum as Date) as Datum, CONVERT(VARCHAR(5),gsp_datum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag2, [gsp_freitext] as Freitext
+        '                                    from [tblGesamtsicherheit]
+        '                                    inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
+        '                                     where [gs_gsnr] IN (" & gsnr & ")
+        '                                    order by gs_gsId"
+
+
+        Dim SQLStringSicherheit = "select gs_gsnr as 'Nr',[gs_ATBNr] as 'ATB Verwahrlager " & standort & "','Eingang Verwahrlager' as 'Typ', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_sicherheitsbetrag] *-1 as Sicherheitbetrag_Calc, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt'
+                                            From [tblGesamtsicherheit]
+                                            Where [gs_gsnr] In (" & gsnr & ")
+                                            and isnull(gs_warenwert,0) <> 0
+											UNION
+                                                Select gsp_gsnr, [gsp_ATCNr],'Ausgang Verwahrlager', CAST(gsp_datum as Date), CONVERT(VARCHAR(5),gsp_datum, 108), [gsp_warenwert] , [gsp_sicherheitsbetrag],[gsp_sicherheitsbetrag], [gsp_freitext],[gsp_art],[gsp_ust]
+                                            From [tblGesamtsicherheitsPositionen] 
+                                            where [gsp_gsnr] In (" & gsnr & ")
+                                            and isnull(gsp_warenwert,0) <> 0 
+											order by Datum, Uhrzeit"
+
+
+
+        dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True)
+
+
+        dtSicherheiten.Columns.Add("Saldo")
+
+        Dim drFirst = dtSicherheiten.NewRow
+        drFirst.Item("Nr") = 0
+        drFirst.Item("Typ") = "Uebertrag vom"
+        drFirst.Item("Datum") = CDate(datumVon).ToShortDateString
+        drFirst.Item("Saldo") = SQL.getValueTxtBySql("SELECT TOP 1 isnull([gs_saldo],0) FROM [tblGesamtsicherheit] where gs_standort = '" & standort & "' AND gs_datum <'" & CDate(datumVon).ToShortDateString & "' order by gs_datum asc", "AVISO",,, currentGesSichRef.brgakto_betrag) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+
+        dtSicherheiten.Rows.InsertAt(drFirst, 0)
+
+
+        Dim sicherheitsbetrag As Double
+        Dim saldo As Double
+        Dim c1 As Double
+        Dim saldoStart As Double
+
+        For i As Integer = 1 To dtSicherheiten.Rows.Count - 1
+
+            saldoStart = CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+            saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("Saldo"))
+
+            sicherheitsbetrag = IIf(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc") IsNot Nothing, CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc")), 0)
+
+            c1 = saldo + sicherheitsbetrag
+
+            dtSicherheiten.Rows(i)("Saldo") = c1
+        Next
+
+        Dim drLast = dtSicherheiten.NewRow
+
+        drLast.Item("Nr") = 0
+        drLast.Item("Typ") = "Saldo zum"
+        drLast.Item("Datum") = CDate(datumBis).ToShortDateString
+        drLast.Item("Saldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("Saldo"))
+
+        dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count)
+
+
+        'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc")
+
+        Me.Cursor = Cursors.Default
+
+    End Sub
+
+
+
+    Public Sub LoadDataTableSicherheitenForExport2(list As List(Of Integer), datumVon As String, datumBis As String)

        Me.Cursor = Cursors.WaitCursor

@@ -250,6 +332,7 @@ Public Class frmGesamtsicherheitenNEU



+
    Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged
        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then

@@ -262,11 +345,11 @@ Public Class frmGesamtsicherheitenNEU

            If dgvGesamtsicherheit.Enabled = False Then Exit Sub
            ATBNraendernToolStripMenuItem.Visible = True
-
+            btnAddPos.Visible = False
        Else
            LoadDGVSicherheitsPos(-1, True)
            ATBNraendernToolStripMenuItem.Visible = False
-
+            'btnAddPos.Visible = True
        End If
    End Sub

@@ -274,20 +357,19 @@ Public Class frmGesamtsicherheitenNEU

        'If gsNr = "" Then Exit Sub

-        Dim sqlSearchSting As String = ""
+        Dim sqlSearch As String = ""

        If withFilterParam = True Then
-            sqlSearchSting &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'"
-            If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')"
-            If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= " AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'"
-            If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0"
-            sqlSearchSting &= ")"
+            sqlSearch &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'"
+            If txtSuche.Text <> "" Then sqlSearch &= "AND ([gs_abfertigungsNr] Like '%" & txtSuche.Text & "%' OR [gs_ATBNr] Like '%" & txtSuche.Text & "%' OR [gs_LKWKZ] like '%" & txtSuche.Text & "%' OR [gs_avisoId] like '%" & txtSuche.Text & "%' OR [gs_freitext] like '%" & txtSuche.Text & "%')"
+            If cbxRundPosanzeigen.Checked = False Then sqlSearch &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0"
+            sqlSearch &= ")"
        End If


        Dim SQLStringCRN As String =
            "select [gsp_gspPosId],[gsp_ATCNr],[gsp_datum],[gsp_gsId],[gsp_gsnr],[gsp_warenwert],[gsp_sicherheitsbetrag],  [gsp_freitext]" &' ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_MRNNr], [gsp_art]
-                "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]"
+                "From [tblGesamtsicherheitsPositionen] inner join [tblGesamtsicherheit] on gs_gsId = gsp_gsId where [gsp_gsnr] = '" & gsNr & "'" & sqlSearch & " order by [gs_ATBNr], [gs_posNr]"

        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
        dgvSicherheitsPos.LOAD()
@@ -338,20 +420,7 @@ Public Class frmGesamtsicherheitenNEU

    End Sub

-
-    'Private Sub dgvSicherheitsPos_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSicherheitsPos.SelectionChanged
-    '    If dgvSicherheitsPos.SelectedRows.Count > 0 Then
-
-    '        indexGspPosId = CInt(dgvSicherheitsPos.SelectedRows(0).Cells("gsp_gspPosId").Value)
-    '        currentSPos = New cGesamtsicherheitsPositionen(indexGsId, indexGspPosId)
-
-    '        If dgvSicherheitsPos.Enabled = False Then Exit Sub
-
-    '    End If
-    'End Sub
-
    Sub loadTitle()
-        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"

        txtGestellInfo.Text = ""
        lblId.Text = ""
@@ -394,8 +463,6 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtSicherheitWarenwert.TextChanged, txtPosWarenwert.TextChanged

-
-
        If Not IsNumeric(txtSicherheitWarenwert.Text) And sender.name = "txtSicherheitWarenwert" Then
            txtSicherheitWarenwert.ForeColor = Color.Red
            Exit Sub
@@ -404,7 +471,6 @@ Public Class frmGesamtsicherheitenNEU

        End If

-
        If Not IsNumeric(txtPosWarenwert.Text) And sender.name = "txtPosWarenwert" Then
            txtPosWarenwert.ForeColor = Color.Red
            Exit Sub
@@ -511,21 +577,26 @@ Public Class frmGesamtsicherheitenNEU
    End Sub

    Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click
-
-        If checkNothingValue(txtSicherheitSicherheitsbetrag.Text, "Double") IsNot Nothing Then
-            Dim sichBetr As Double = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
-            If checkSaldo(sichBetr, True) = False Then Exit Sub
-        End If
-
-        Dim attachPosNrToExistingATB As Boolean = False
-
        Try

+            If (txtSicherheitATBNr.Text = "") Then
+                txtSicherheitATBNr.Focus()
+                Exit Sub
+            End If
+
            If (txtAnzahlPos.Text = "") Then
                txtAnzahlPos.Focus()
                Exit Sub
            End If

+
+            If checkNothingValue(txtSicherheitSicherheitsbetrag.Text, "Double") IsNot Nothing Then
+                Dim sichBetr As Double = Double.Parse(txtSicherheitSicherheitsbetrag.Text)
+                If checkSaldo(sichBetr, True) = False Then Exit Sub
+            End If
+
+            Dim attachPosNrToExistingATB As Boolean = False
+
            Dim limit As Integer = Integer.Parse(setNullToZero(txtAnzahlPos.Text))


@@ -618,13 +689,14 @@ Public Class frmGesamtsicherheitenNEU
    Private Sub btnAddPos_Click(sender As Object, e As EventArgs) Handles btnAddPos.Click

        If dgvGesamtsicherheit.SelectedRows.Count = 0 Then
-
            MsgBox("Bitte eine Gestellung markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll")
            Exit Sub
        End If

        If checkSicherheitsbetrag() = False Then Exit Sub

+        If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub
+
        Try

            Dim OPEN As New cSicherheiten()
@@ -876,6 +948,9 @@ Public Class frmGesamtsicherheitenNEU

    Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click

+
+        If Not checkDateOfPosition(txtPosDat.Text, txtPosTime.Text) Then Exit Sub
+
        With currentSPos

            .gsp_art = "CLOSE"
@@ -885,9 +960,9 @@ Public Class frmGesamtsicherheitenNEU
            .gsp_ATCNr = If(txtPositionenCRN.Text <> "", txtPositionenCRN.Text, Nothing)

            If txtPosDat.Text <> "" AndAlso txtPosTime.Text <> "" Then
-                .gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
+                currentSPos.gsp_datum = DateTimeString2DateTimeKonvertinator(txtPosDat.Text, txtPosTime.Text)
            Else
-                .gsp_datum = Nothing
+                currentSPos.gsp_datum = Nothing
            End If


@@ -963,7 +1038,6 @@ Public Class frmGesamtsicherheitenNEU
        cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
        cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
        cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1  AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True)
-        cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
        txtlkwIdSearch.initSearchBox(Me.FindForm, "  LKW_Nr, avisoID, CAST(datum As Date) As Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200)
        txtlkwIdSearch.SET_VALUE(avisoID)
        txtAbfertNum.Text = Me.Abfertigungsnummer
@@ -1016,7 +1090,7 @@ Public Class frmGesamtsicherheitenNEU

    End Function

-    Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
+    Private Sub btnSuche_Click(sender As Object, e As EventArgs)
        Try
            If Me.Visible Then LoadDGVSicherheiten(True)
        Catch ex As Exception
@@ -1028,24 +1102,19 @@ Public Class frmGesamtsicherheitenNEU
        panOverlay.Visible = True
    End Sub

-    Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click
+    Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs)

        Dim dgv As String = ""
        For Each c As DataGridViewColumn In dgvGesamtsicherheit.Columns
            dgv &= c.Width & c.HeaderText & vbCrLf
        Next

-        clearSearchFields()
-
        LoadDGVSicherheiten()
        currentGesSichRef.LOAD()
        LoadStandort()
    End Sub

-    Private Sub clearSearchFields()
-        cbx_Suche_Warenort.changeItem("")
-        txt_Suche.Clear()
-    End Sub
+

    Private Function checkSicherheitsbetrag() As Boolean

@@ -1767,7 +1836,7 @@ Public Class frmGesamtsicherheitenNEU
                End With

                SicherheitsPos.SAVE()
-
+                cbxRundPosanzeigen.Checked = True
                AfterButton()

            End If
@@ -1795,4 +1864,60 @@ Public Class frmGesamtsicherheitenNEU
        LoadDGVSicherheiten(True)
    End Sub

+    Private Function checkDateOfPosition(datum As String, uhrzeit As String) As Boolean
+        Dim checkOK As Boolean = True
+        Dim datumPos As Date = Nothing
+
+        If datum <> "" AndAlso uhrzeit <> "" Then
+            datumPos = DateTimeString2DateTimeKonvertinator(datum, uhrzeit)
+        ElseIf datum <> "" Then
+            datumPos = CDate(datum).ToShortDateString
+
+        End If
+
+        If datumPos <> Nothing And dgvGesamtsicherheit.Rows.Count > 0 Then
+            If IsDate(dgvGesamtsicherheit.Rows(0).Cells("gs_datum").Value) Then
+                If datumPos <= dgvGesamtsicherheit.Rows(0).Cells("gs_datum").Value Then
+                    MsgBox("Datum/Uhrzeit des Gestellungsausganges muss zeitlich nach dem Gestellungseingang liegen! (" & dgvGesamtsicherheit.Rows(0).Cells("gs_datum").Value & ")")
+                    checkOK = False
+                End If
+            End If
+        End If
+
+        Return checkOK
+    End Function
+
+
+    Private Function checkMandatoryFields() As Boolean
+
+        Dim valuesOK As Boolean = True
+
+        If (txtAnzahlPos.Text = "") Then
+            txtAnzahlPos.Focus()
+            valuesOK = False
+        End If
+
+
+        Return valuesOK
+
+    End Function
+
+    Private Sub txt_Suche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown
+        If e.KeyCode = Keys.Enter Then
+            If txtSuche.Text <> "" Then
+                If Me.Visible Then LoadDGVSicherheiten(True)
+                e.Handled = True
+            Else
+                If Me.Visible Then LoadDGVSicherheiten(True)
+                e.Handled = True
+            End If
+
+        End If
+    End Sub
+
+    Private Sub txtAnzahlPos_Leave(sender As Object, e As EventArgs) Handles txtAnzahlPos.Leave
+        If txtAnzahlPos.Text = "" Then
+            txtAnzahlPos.Text = 1
+        End If
+    End Sub
 End Class
--- a/Aviso/frmNorsware.Designer.vb
+++ b/Aviso/frmNorsware.Designer.vb
@@ -29,11 +29,41 @@ Partial Class frmNorsware
        Me.rtfToken = New System.Windows.Forms.RichTextBox()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.btnCreateToken = New System.Windows.Forms.Button()
-        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
-        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.Label3 = New System.Windows.Forms.Label()
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.txtAbsNr = New System.Windows.Forms.TextBox()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.txtAbsAdresse = New System.Windows.Forms.TextBox()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.txtAbsFirma = New System.Windows.Forms.TextBox()
+        Me.Label10 = New System.Windows.Forms.Label()
+        Me.txtAbsStadt = New System.Windows.Forms.TextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.txtEmpfStadt = New System.Windows.Forms.TextBox()
+        Me.Label12 = New System.Windows.Forms.Label()
+        Me.txtEmpfFirma = New System.Windows.Forms.TextBox()
+        Me.Label13 = New System.Windows.Forms.Label()
+        Me.txtEmpfAdresse = New System.Windows.Forms.TextBox()
+        Me.Label15 = New System.Windows.Forms.Label()
+        Me.txtRohm = New System.Windows.Forms.TextBox()
+        Me.Label16 = New System.Windows.Forms.Label()
+        Me.txtPos = New System.Windows.Forms.TextBox()
+        Me.Label17 = New System.Windows.Forms.Label()
+        Me.txtPackst = New System.Windows.Forms.TextBox()
+        Me.Label18 = New System.Windows.Forms.Label()
+        Me.txtMRN = New System.Windows.Forms.TextBox()
+        Me.Label19 = New System.Windows.Forms.Label()
+        Me.txtRechnugssumme = New System.Windows.Forms.TextBox()
+        Me.Label20 = New System.Windows.Forms.Label()
+        Me.dgvPositionen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
+        CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -41,7 +71,7 @@ Partial Class frmNorsware
        '
        Me.btnUpload.Enabled = False
        Me.btnUpload.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnUpload.Location = New System.Drawing.Point(170, 179)
+        Me.btnUpload.Location = New System.Drawing.Point(253, 181)
        Me.btnUpload.Name = "btnUpload"
        Me.btnUpload.Size = New System.Drawing.Size(78, 25)
        Me.btnUpload.TabIndex = 104
@@ -50,9 +80,9 @@ Partial Class frmNorsware
        '
        'rtfDetals
        '
-        Me.rtfDetals.Location = New System.Drawing.Point(286, 30)
+        Me.rtfDetals.Location = New System.Drawing.Point(12, 531)
        Me.rtfDetals.Name = "rtfDetals"
-        Me.rtfDetals.Size = New System.Drawing.Size(277, 484)
+        Me.rtfDetals.Size = New System.Drawing.Size(319, 61)
        Me.rtfDetals.TabIndex = 108
        Me.rtfDetals.Text = ""
        '
@@ -70,7 +100,7 @@ Partial Class frmNorsware
        '
        Me.rtfToken.Location = New System.Drawing.Point(12, 30)
        Me.rtfToken.Name = "rtfToken"
-        Me.rtfToken.Size = New System.Drawing.Size(236, 42)
+        Me.rtfToken.Size = New System.Drawing.Size(319, 42)
        Me.rtfToken.TabIndex = 109
        Me.rtfToken.Text = ""
        '
@@ -88,13 +118,307 @@ Partial Class frmNorsware
        'btnCreateToken
        '
        Me.btnCreateToken.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnCreateToken.Location = New System.Drawing.Point(133, 78)
+        Me.btnCreateToken.Location = New System.Drawing.Point(216, 78)
        Me.btnCreateToken.Name = "btnCreateToken"
        Me.btnCreateToken.Size = New System.Drawing.Size(115, 25)
        Me.btnCreateToken.TabIndex = 111
        Me.btnCreateToken.Text = "Create Token"
        Me.btnCreateToken.UseVisualStyleBackColor = True
        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label3.Location = New System.Drawing.Point(12, 486)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(0, 13)
+        Me.Label3.TabIndex = 114
+        '
+        'Button1
+        '
+        Me.Button1.Enabled = False
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Location = New System.Drawing.Point(236, 489)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(95, 25)
+        Me.Button1.TabIndex = 115
+        Me.Button1.Text = "Send Selection"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Location = New System.Drawing.Point(12, 78)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(115, 25)
+        Me.Button2.TabIndex = 116
+        Me.Button2.Text = "Clear Token"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label4.Location = New System.Drawing.Point(359, 380)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(56, 13)
+        Me.Label4.TabIndex = 118
+        Me.Label4.Text = "Positionen"
+        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label5.Location = New System.Drawing.Point(357, 30)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(55, 13)
+        Me.Label5.TabIndex = 119
+        Me.Label5.Text = "Versender"
+        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label6.Location = New System.Drawing.Point(357, 163)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(58, 13)
+        Me.Label6.TabIndex = 120
+        Me.Label6.Text = "Empfänger"
+        '
+        'txtAbsNr
+        '
+        Me.txtAbsNr.Location = New System.Drawing.Point(360, 68)
+        Me.txtAbsNr.Name = "txtAbsNr"
+        Me.txtAbsNr.Size = New System.Drawing.Size(170, 20)
+        Me.txtAbsNr.TabIndex = 121
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label7.Location = New System.Drawing.Point(357, 52)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(18, 13)
+        Me.Label7.TabIndex = 122
+        Me.Label7.Text = "Nr"
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label8.Location = New System.Drawing.Point(357, 91)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(45, 13)
+        Me.Label8.TabIndex = 124
+        Me.Label8.Text = "Adresse"
+        '
+        'txtAbsAdresse
+        '
+        Me.txtAbsAdresse.Location = New System.Drawing.Point(360, 107)
+        Me.txtAbsAdresse.Name = "txtAbsAdresse"
+        Me.txtAbsAdresse.Size = New System.Drawing.Size(170, 20)
+        Me.txtAbsAdresse.TabIndex = 123
+        '
+        'Label9
+        '
+        Me.Label9.AutoSize = True
+        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label9.Location = New System.Drawing.Point(547, 52)
+        Me.Label9.Name = "Label9"
+        Me.Label9.Size = New System.Drawing.Size(32, 13)
+        Me.Label9.TabIndex = 126
+        Me.Label9.Text = "Firma"
+        '
+        'txtAbsFirma
+        '
+        Me.txtAbsFirma.Location = New System.Drawing.Point(550, 68)
+        Me.txtAbsFirma.Name = "txtAbsFirma"
+        Me.txtAbsFirma.Size = New System.Drawing.Size(185, 20)
+        Me.txtAbsFirma.TabIndex = 125
+        '
+        'Label10
+        '
+        Me.Label10.AutoSize = True
+        Me.Label10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label10.Location = New System.Drawing.Point(547, 91)
+        Me.Label10.Name = "Label10"
+        Me.Label10.Size = New System.Drawing.Size(32, 13)
+        Me.Label10.TabIndex = 128
+        Me.Label10.Text = "Stadt"
+        '
+        'txtAbsStadt
+        '
+        Me.txtAbsStadt.Location = New System.Drawing.Point(550, 107)
+        Me.txtAbsStadt.Name = "txtAbsStadt"
+        Me.txtAbsStadt.Size = New System.Drawing.Size(185, 20)
+        Me.txtAbsStadt.TabIndex = 127
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label11.Location = New System.Drawing.Point(547, 220)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(32, 13)
+        Me.Label11.TabIndex = 136
+        Me.Label11.Text = "Stadt"
+        '
+        'txtEmpfStadt
+        '
+        Me.txtEmpfStadt.Location = New System.Drawing.Point(550, 236)
+        Me.txtEmpfStadt.Name = "txtEmpfStadt"
+        Me.txtEmpfStadt.Size = New System.Drawing.Size(185, 20)
+        Me.txtEmpfStadt.TabIndex = 135
+        '
+        'Label12
+        '
+        Me.Label12.AutoSize = True
+        Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label12.Location = New System.Drawing.Point(357, 181)
+        Me.Label12.Name = "Label12"
+        Me.Label12.Size = New System.Drawing.Size(32, 13)
+        Me.Label12.TabIndex = 134
+        Me.Label12.Text = "Firma"
+        '
+        'txtEmpfFirma
+        '
+        Me.txtEmpfFirma.Location = New System.Drawing.Point(360, 197)
+        Me.txtEmpfFirma.Name = "txtEmpfFirma"
+        Me.txtEmpfFirma.Size = New System.Drawing.Size(375, 20)
+        Me.txtEmpfFirma.TabIndex = 133
+        '
+        'Label13
+        '
+        Me.Label13.AutoSize = True
+        Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label13.Location = New System.Drawing.Point(357, 220)
+        Me.Label13.Name = "Label13"
+        Me.Label13.Size = New System.Drawing.Size(45, 13)
+        Me.Label13.TabIndex = 132
+        Me.Label13.Text = "Adresse"
+        '
+        'txtEmpfAdresse
+        '
+        Me.txtEmpfAdresse.Location = New System.Drawing.Point(360, 236)
+        Me.txtEmpfAdresse.Name = "txtEmpfAdresse"
+        Me.txtEmpfAdresse.Size = New System.Drawing.Size(170, 20)
+        Me.txtEmpfAdresse.TabIndex = 131
+        '
+        'Label15
+        '
+        Me.Label15.AutoSize = True
+        Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label15.Location = New System.Drawing.Point(357, 332)
+        Me.Label15.Name = "Label15"
+        Me.Label15.Size = New System.Drawing.Size(57, 13)
+        Me.Label15.TabIndex = 144
+        Me.Label15.Text = "Rohmasse"
+        '
+        'txtRohm
+        '
+        Me.txtRohm.Location = New System.Drawing.Point(360, 348)
+        Me.txtRohm.Name = "txtRohm"
+        Me.txtRohm.Size = New System.Drawing.Size(170, 20)
+        Me.txtRohm.TabIndex = 143
+        '
+        'Label16
+        '
+        Me.Label16.AutoSize = True
+        Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label16.Location = New System.Drawing.Point(547, 292)
+        Me.Label16.Name = "Label16"
+        Me.Label16.Size = New System.Drawing.Size(56, 13)
+        Me.Label16.TabIndex = 142
+        Me.Label16.Text = "Positionen"
+        '
+        'txtPos
+        '
+        Me.txtPos.Location = New System.Drawing.Point(550, 309)
+        Me.txtPos.Name = "txtPos"
+        Me.txtPos.Size = New System.Drawing.Size(74, 20)
+        Me.txtPos.TabIndex = 141
+        '
+        'Label17
+        '
+        Me.Label17.AutoSize = True
+        Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label17.Location = New System.Drawing.Point(631, 292)
+        Me.Label17.Name = "Label17"
+        Me.Label17.Size = New System.Drawing.Size(76, 13)
+        Me.Label17.TabIndex = 140
+        Me.Label17.Text = "Pkg-insgesamt"
+        '
+        'txtPackst
+        '
+        Me.txtPackst.Location = New System.Drawing.Point(630, 309)
+        Me.txtPackst.Name = "txtPackst"
+        Me.txtPackst.Size = New System.Drawing.Size(105, 20)
+        Me.txtPackst.TabIndex = 139
+        '
+        'Label18
+        '
+        Me.Label18.AutoSize = True
+        Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label18.Location = New System.Drawing.Point(357, 292)
+        Me.Label18.Name = "Label18"
+        Me.Label18.Size = New System.Drawing.Size(32, 13)
+        Me.Label18.TabIndex = 138
+        Me.Label18.Text = "MRN"
+        '
+        'txtMRN
+        '
+        Me.txtMRN.Location = New System.Drawing.Point(360, 308)
+        Me.txtMRN.Name = "txtMRN"
+        Me.txtMRN.Size = New System.Drawing.Size(170, 20)
+        Me.txtMRN.TabIndex = 137
+        '
+        'Label19
+        '
+        Me.Label19.AutoSize = True
+        Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label19.Location = New System.Drawing.Point(547, 332)
+        Me.Label19.Name = "Label19"
+        Me.Label19.Size = New System.Drawing.Size(95, 13)
+        Me.Label19.TabIndex = 146
+        Me.Label19.Text = "Summe Rechnung"
+        '
+        'txtRechnugssumme
+        '
+        Me.txtRechnugssumme.Location = New System.Drawing.Point(550, 348)
+        Me.txtRechnugssumme.Name = "txtRechnugssumme"
+        Me.txtRechnugssumme.Size = New System.Drawing.Size(185, 20)
+        Me.txtRechnugssumme.TabIndex = 145
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
+        Me.Label20.Location = New System.Drawing.Point(12, 515)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(86, 13)
+        Me.Label20.TabIndex = 147
+        Me.Label20.Text = "JSON Response"
+        '
+        'dgvPositionen
+        '
+        Me.dgvPositionen.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvPositionen.BackgroundColor = System.Drawing.Color.White
+        Me.dgvPositionen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvPositionen.Location = New System.Drawing.Point(360, 396)
+        Me.dgvPositionen.Name = "dgvPositionen"
+        Me.dgvPositionen.Size = New System.Drawing.Size(375, 196)
+        Me.dgvPositionen.TabIndex = 117
+        '
+        'dgvData
+        '
+        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvData.BackgroundColor = System.Drawing.Color.White
+        Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvData.Location = New System.Drawing.Point(15, 231)
+        Me.dgvData.Name = "dgvData"
+        Me.dgvData.Size = New System.Drawing.Size(316, 252)
+        Me.dgvData.TabIndex = 113
+        '
        'scanSonstiges
        '
        Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE"
@@ -111,54 +435,43 @@ Partial Class frmNorsware
        Me.scanSonstiges.Location = New System.Drawing.Point(15, 106)
        Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0)
        Me.scanSonstiges.Name = "scanSonstiges"
-        Me.scanSonstiges.Size = New System.Drawing.Size(233, 70)
+        Me.scanSonstiges.Size = New System.Drawing.Size(316, 70)
        Me.scanSonstiges.TabIndex = 112
        '
-        'dgvData
-        '
-        Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvData.BackgroundColor = System.Drawing.Color.White
-        Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvData.Location = New System.Drawing.Point(15, 231)
-        Me.dgvData.Name = "dgvData"
-        Me.dgvData.Size = New System.Drawing.Size(233, 252)
-        Me.dgvData.TabIndex = 113
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!)
-        Me.Label3.Location = New System.Drawing.Point(12, 486)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(0, 13)
-        Me.Label3.TabIndex = 114
-        '
-        'Button1
-        '
-        Me.Button1.Enabled = False
-        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(153, 489)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(95, 25)
-        Me.Button1.TabIndex = 115
-        Me.Button1.Text = "Send Selection"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
-        'Button2
-        '
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(12, 78)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(115, 25)
-        Me.Button2.TabIndex = 116
-        Me.Button2.Text = "Clear Token"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
        'frmNorsware
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(600, 558)
+        Me.ClientSize = New System.Drawing.Size(747, 620)
+        Me.Controls.Add(Me.Label20)
+        Me.Controls.Add(Me.Label19)
+        Me.Controls.Add(Me.txtRechnugssumme)
+        Me.Controls.Add(Me.Label15)
+        Me.Controls.Add(Me.txtRohm)
+        Me.Controls.Add(Me.Label16)
+        Me.Controls.Add(Me.txtPos)
+        Me.Controls.Add(Me.Label17)
+        Me.Controls.Add(Me.txtPackst)
+        Me.Controls.Add(Me.Label18)
+        Me.Controls.Add(Me.txtMRN)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.txtEmpfStadt)
+        Me.Controls.Add(Me.Label12)
+        Me.Controls.Add(Me.txtEmpfFirma)
+        Me.Controls.Add(Me.Label13)
+        Me.Controls.Add(Me.txtEmpfAdresse)
+        Me.Controls.Add(Me.Label10)
+        Me.Controls.Add(Me.txtAbsStadt)
+        Me.Controls.Add(Me.Label9)
+        Me.Controls.Add(Me.txtAbsFirma)
+        Me.Controls.Add(Me.Label8)
+        Me.Controls.Add(Me.txtAbsAdresse)
+        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.txtAbsNr)
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.Label5)
+        Me.Controls.Add(Me.Label4)
+        Me.Controls.Add(Me.dgvPositionen)
        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.Label3)
@@ -173,6 +486,7 @@ Partial Class frmNorsware
        Me.Name = "frmNorsware"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "frmNorsware"
+        CType(Me.dgvPositionen, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
@@ -189,4 +503,33 @@ Partial Class frmNorsware
    Friend WithEvents Label3 As Label
    Friend WithEvents Button1 As Button
    Friend WithEvents Button2 As Button
+    Friend WithEvents dgvPositionen As VERAG_PROG_ALLGEMEIN.MyDatagridview
+    Friend WithEvents Label4 As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents Label6 As Label
+    Friend WithEvents txtAbsNr As TextBox
+    Friend WithEvents Label7 As Label
+    Friend WithEvents Label8 As Label
+    Friend WithEvents txtAbsAdresse As TextBox
+    Friend WithEvents Label9 As Label
+    Friend WithEvents txtAbsFirma As TextBox
+    Friend WithEvents Label10 As Label
+    Friend WithEvents txtAbsStadt As TextBox
+    Friend WithEvents Label11 As Label
+    Friend WithEvents txtEmpfStadt As TextBox
+    Friend WithEvents Label12 As Label
+    Friend WithEvents txtEmpfFirma As TextBox
+    Friend WithEvents Label13 As Label
+    Friend WithEvents txtEmpfAdresse As TextBox
+    Friend WithEvents Label15 As Label
+    Friend WithEvents txtRohm As TextBox
+    Friend WithEvents Label16 As Label
+    Friend WithEvents txtPos As TextBox
+    Friend WithEvents Label17 As Label
+    Friend WithEvents txtPackst As TextBox
+    Friend WithEvents Label18 As Label
+    Friend WithEvents txtMRN As TextBox
+    Friend WithEvents Label19 As Label
+    Friend WithEvents txtRechnugssumme As TextBox
+    Friend WithEvents Label20 As Label
 End Class
--- a/Aviso/frmNorsware.vb
+++ b/Aviso/frmNorsware.vb
@@ -5,6 +5,7 @@ Public Class frmNorsware

    Dim nwapi As cNorsware
    Dim dataTable As New DataTable()
+    Dim dataTablePos As New DataTable()
    Dim groupId As String
    Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click

@@ -14,6 +15,7 @@ Public Class frmNorsware
        dataTable.Clear()
        Label1.Text = nwapi.UploadPDFWithAuthHeader(path, "", "POST", rtfToken.Text, dataTable)
        initDGV(dataTable)
+
        'End if

    End Sub
@@ -32,7 +34,7 @@ Public Class frmNorsware
        nwapi = New cNorsware()
        scanSonstiges.INIT(-1, "KUNDENDATEN")
        initDataTable()
-
+        initDataTablePos()

    End Sub

@@ -48,17 +50,32 @@ Public Class frmNorsware

    Sub initDataTable()

+        dataTable.Columns.Add("sira", GetType(Integer))
+        dataTable.Columns.Add("secildi", GetType(Boolean))
        dataTable.Columns.Add("adi", GetType(String))
        dataTable.Columns.Add("id", GetType(String))
        dataTable.Columns.Add("ihracatBeyannamesi", GetType(Boolean))
        dataTable.Columns.Add("ekBelge", GetType(Boolean))
-        dataTable.Columns.Add("sira", GetType(Integer))
-        dataTable.Columns.Add("secildi", GetType(Boolean))
        dataTable.Columns.Add("ogretildi", GetType(Integer))
        dataTable.Columns.Add("kayitTarihi", GetType(String))
        dataTable.Columns.Add("dosyaGrupId", GetType(String))


+    End Sub
+
+    Sub initDataTablePos()
+
+        dataTablePos.Columns.Add("esyaTanim", GetType(String))
+        dataTablePos.Columns.Add("gtip", GetType(String))
+        dataTablePos.Columns.Add("kapAdet", GetType(Integer))
+        dataTablePos.Columns.Add("kalemFiyati", GetType(String))
+        dataTablePos.Columns.Add("brut", GetType(Integer))
+        dataTablePos.Columns.Add("net", GetType(String))
+        dataTablePos.Columns.Add("parcalimi", GetType(Boolean))
+        dataTablePos.Columns.Add("id", GetType(String))
+        dataTablePos.Columns.Add("kayitTarihi", GetType(String))
+
+
    End Sub

    Sub initDGV(dt As DataTable)
@@ -68,30 +85,21 @@ Public Class frmNorsware

        If dgvData.Columns.Count > 0 Then
            With dgvData
-                '.RowHeadersWidth = 10
-                '.Columns("id").Visible = False
-                '.Columns("country").Visible = False
-                '.Columns("name").HeaderText = "Name"
-                '.Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
-                '.Columns("safeNo").Width = 100
-                '.Columns("safeNo").HeaderText = "Nr"
-                '.Columns("safeNo").Visible = False
-                '.Columns("vatNo").Width = 100
-                '.Columns("vatNo").HeaderText = "UID"
-                '.Columns("regNo").Width = 100
-                '.Columns("regNo").HeaderText = "FB-Nr."
-                '.Columns("street").Width = 100
-                '.Columns("street").HeaderText = "Strasse"
-                '.Columns("city").Width = 100
-                '.Columns("city").HeaderText = "Ort"
-                '.Columns("postCode").Width = 75
-                '.Columns("postCode").HeaderText = "PLZ"
-                '.Columns("phoneNo").Width = 100
-                '.Columns("phoneNo").HeaderText = "Tel-Nr"
-                '.Columns("status").Width = 100
-                '.Columns("status").HeaderText = "Status"
-                '.Columns("dateOfLatestChange").Width = 100
-                '.Columns("dateOfLatestChange").HeaderText = "letzte Änderung"
+                .RowHeadersWidth = 10
+                .Columns("sira").HeaderText = "index"
+                .Columns("sira").Width = 50
+                .Columns("secildi").HeaderText = "selected"
+                .Columns("secildi").Width = 80
+                .Columns("adi").HeaderText = "Site"
+                .Columns("id").Visible = False
+                .Columns("ihracatBeyannamesi").HeaderText = "firstPage"
+                .Columns("ihracatBeyannamesi").Width = 50
+                .Columns("ekBelge").HeaderText = "followPages"
+                .Columns("ekBelge").Width = 75
+                .Columns("ogretildi").Visible = False
+                .Columns("dosyaGrupId").Visible = False
+                .Columns("kayitTarihi").Visible = False
+
            End With
            Button1.Enabled = True
        Else
@@ -100,6 +108,33 @@ Public Class frmNorsware
        End If


+    End Sub
+
+    Sub initDGVPos(dt As DataTable)
+
+        dgvPositionen.DataSource = dt
+
+
+        If dgvPositionen.Columns.Count > 0 Then
+            With dgvPositionen
+                .RowHeadersWidth = 10
+                .Columns("esyaTanim").HeaderText = "goods"
+                .Columns("gtip").HeaderText = "GTIP"
+                .Columns("kapAdet").HeaderText = "quantity"
+                .Columns("kapAdet").Width = 50
+                .Columns("kalemFiyati").HeaderText = "price"
+                .Columns("kalemFiyati").Width = 50
+                .Columns("brut").HeaderText = "gross weight"
+                .Columns("net").HeaderText = "net weigt"
+                .Columns("parcalimi").HeaderText = "net weigt"
+                .Columns("id").Visible = False
+                .Columns("kayitTarihi").Visible = False
+
+            End With
+
+        End If
+
+
    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
@@ -113,7 +148,30 @@ Public Class frmNorsware
        Label2.Text = "Status: " & nwapi.sendSelection(rtfToken.Text, "application/json", dataTable, groupId)

        If groupId <> "" Then
-            rtfDetals.Text = nwapi.getData(rtfToken.Text, "application/json", groupId)
+
+            Dim doc = New digitDocumnent(dataTablePos)
+
+            Dim jsonFile = nwapi.getData(rtfToken.Text, "application/json", groupId, doc)
+            rtfDetals.Text = jsonFile
+
+            txtAbsFirma.Text = doc.abs
+            txtAbsNr.Text = doc.absNr
+            txtAbsAdresse.Text = doc.absAdresse
+            txtAbsStadt.Text = doc.absStadt
+
+            txtEmpfFirma.Text = doc.empf
+            'txtEmpfNr.Text = doc.empfNr
+            txtEmpfAdresse.Text = doc.empfAdresse
+            txtEmpfStadt.Text = doc.empfStadt
+
+            txtMRN.Text = doc.MRN
+            txtPos.Text = doc.pos
+            txtPackst.Text = doc.pkgSum
+            txtRohm.Text = doc.mass
+            txtRechnugssumme.Text = doc.totalAmount
+
+            initDGVPos(doc.positonTable)
+
        End If

        Cursor = Cursors.Default