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

Aviso/Aviso.vbproj

@@ -117,6 +117,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\dll\ChillKat64\ChilkatDotNet47.dll</HintPath>
     </Reference>
+    <Reference Include="ClosedXML, Version=0.95.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ClosedXML.0.95.4\lib\net46\ClosedXML.dll</HintPath>
+    </Reference>
     <Reference Include="com.esendex.sdk, Version=3.8.0.0, Culture=neutral, PublicKeyToken=9dceac28a20578e2, processorArchitecture=MSIL">
       <HintPath>..\packages\esendex-dotnet-sdk.3.8.0\lib\net35\com.esendex.sdk.dll</HintPath>
     </Reference>

Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb

@@ -63,6 +63,7 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblSaldo = New System.Windows.Forms.Label()
         Me.lblZollsatz = New System.Windows.Forms.Label()
         Me.lblReferenzwert = New System.Windows.Forms.Label()
+        Me.ExportCSV2ToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.dgvListe, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip1.SuspendLayout()
         Me.Panel1.SuspendLayout()
@@ -85,14 +86,14 @@ Partial Class frmGesamtsicherheitenMenuNEU
         '
         'ContextMenuStrip1
         '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem})
+        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportCSVToolStripMenuItem, Me.ExportCSV2ToolStripMenuItem})
         Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(133, 26)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 70)
         '
         'ExportCSVToolStripMenuItem
         '
         Me.ExportCSVToolStripMenuItem.Name = "ExportCSVToolStripMenuItem"
-        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(132, 22)
+        Me.ExportCSVToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
         Me.ExportCSVToolStripMenuItem.Text = "Export CSV"
         '
         'Panel1
@@ -647,6 +648,12 @@ Partial Class frmGesamtsicherheitenMenuNEU
         Me.lblReferenzwert.TabIndex = 6
         Me.lblReferenzwert.Text = "Referenzwert: -"
         '
+        'ExportCSV2ToolStripMenuItem
+        '
+        Me.ExportCSV2ToolStripMenuItem.Name = "ExportCSV2ToolStripMenuItem"
+        Me.ExportCSV2ToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ExportCSV2ToolStripMenuItem.Text = "Export CSV Details"
+        '
         'frmGesamtsicherheitenMenuNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -707,4 +714,5 @@ 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
 End Class

Aviso/frmGesamtsicherheitenMenuNEU.vb

@@ -1,5 +1,7 @@
 Imports System.Reflection
 Imports SDL
+Imports Spire.PdfViewer.Forms
+Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenMenuNEU
 
@@ -225,60 +227,6 @@ Public Class frmGesamtsicherheitenMenuNEU
         End Try
     End Sub
 
-    'Private Sub FlatButton2_Click(sender As Object, e As EventArgs)
-    '    txtDatVon.Text = Date.Parse("01.01.1970")
-    '    txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy")
-    'End Sub
-
-    Private Sub ExportCSVToolStripMenuItem_Click(sender As Object, e As EventArgs)
-        csvexport(dgvListe)
-    End Sub
-
-    Public Shared Function csvexport(quelldgv As DataGridView)
-        Dim savefiledialog As New SaveFileDialog
-        Dim firstin As String
-        Dim out As String
-        Dim in2 As String
-        Dim header As String
-
-        savefiledialog.Filter = "CSV files (*.csv)|*.CSV"
-        savefiledialog.InitialDirectory = "C:\Verag"
-        savefiledialog.ShowDialog()
-
-
-        Try
-            For r As Integer = 0 To quelldgv.Rows.Count - 1
-                For c As Integer = 0 To quelldgv.Columns.Count
-                    'test &= r & c & vbCrLf
-                    Try
-                        'test &= Replace(quelldgv.Rows(r).Cells(c).Value.ToString, vbCrLf, "vbCrlLf")
-                        firstin = quelldgv.Rows(r).Cells(c).Value.ToString
-                        'in2 = """" & firstin & """" & ";"
-                        in2 = firstin & ";"
-                        out &= Replace(in2, vbCrLf, "##vbCrLf##")
-                        out = Replace(out, "€", "")
-                    Catch ex As Exception
-                        out &= ""
-                    End Try
-
-                Next
-
-                out &= "nZ"
-            Next
-            For c As Integer = 0 To quelldgv.Columns.Count - 1
-                header &= quelldgv.Columns(c).Name & ";"
-            Next
-            out = Replace(out, "nZ", vbCrLf)
-            'MsgBox(out)
-            Using sw As New IO.StreamWriter(savefiledialog.FileName)
-                sw.WriteLine(header)
-                sw.WriteLine(out)
-            End Using
-        Catch ex As Exception
-            MsgBox(ex.Message)
-        End Try
-    End Function
-
     Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1)
     Dim TAG As Date = CDate(Now.ToShortDateString)
     Dim JAHR As Date = CDate("01.01." & Now.Year)
@@ -433,6 +381,26 @@ Public Class frmGesamtsicherheitenMenuNEU
     End Function
 
     Private Sub ExportCSVToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles ExportCSVToolStripMenuItem.Click
-        csvexport(dgvListe)
+
+        SDL.cProgramFunctions.genExcelFromDGV_NEW(dgvListe)
+
+    End Sub
+
+    Private Sub ExportCSV2ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportCSV2ToolStripMenuItem.Click
+
+        If dgvListe.SelectedRows.Count > 0 Then
+            Dim list As New List(Of Integer)
+
+            For Each row As DataGridViewRow In dgvListe.SelectedRows
+                list.Add(CInt(row.Cells("gs_gsnr").Value))
+
+
+            Next
+            Dim frm As New frmGesamtsicherheitenNEU
+            frm.LoadDGVSicherheitenForExport(list)
+
+            SDL.cProgramFunctions.genExcelFromDGV_NEW(frm.dgvGesamtsicherheit)
+
+        End If
     End Sub
 End Class

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -29,9 +29,21 @@ Partial Class frmGesamtsicherheitenNEU
         Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGesamtsicherheitenNEU))
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ClosedErzeugenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.Panel2 = New System.Windows.Forms.Panel()
+        Me.pnlChangeATCNr = New System.Windows.Forms.Panel()
+        Me.lblATCwarning = New System.Windows.Forms.Label()
+        Me.FlatButton3 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtATCaendern = New System.Windows.Forms.TextBox()
+        Me.Label34 = New System.Windows.Forms.Label()
+        Me.FlatButton4 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.pnlChangeATBNr = New System.Windows.Forms.Panel()
+        Me.lblWarningATB = New System.Windows.Forms.Label()
+        Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton()
+        Me.txtATBNraendern = New System.Windows.Forms.TextBox()
+        Me.Label32 = New System.Windows.Forms.Label()
+        Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.panOverlay = New System.Windows.Forms.Panel()
         Me.txtlkwIdSearch = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.Label23 = New System.Windows.Forms.Label()
@@ -47,6 +59,8 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.pnlSummeGes = New System.Windows.Forms.Panel()
         Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
         Me.txtSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -118,30 +132,36 @@ Partial Class frmGesamtsicherheitenNEU
         Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox()
         Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton()
         Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton()
-        Me.ContextMenuStrip1.SuspendLayout()
+        Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
+        Me.pnlChangeATCNr.SuspendLayout()
+        Me.pnlChangeATBNr.SuspendLayout()
         Me.panOverlay.SuspendLayout()
         CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContextMenuStripPosSicherheiten.SuspendLayout()
         Me.pnlSummeGes.SuspendLayout()
         Me.panOben.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
-        'ContextMenuStrip1
+        'ContextMenuStripGesSicherh
         '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ClosedErzeugenToolStripMenuItem})
+        Me.ContextMenuStripGesSicherh.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATBNraendernToolStripMenuItem})
-        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
+        Me.ContextMenuStripGesSicherh.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(162, 26)
+        Me.ContextMenuStripGesSicherh.Size = New System.Drawing.Size(153, 26)
         '
-        'ClosedErzeugenToolStripMenuItem
+        'ATBNraendernToolStripMenuItem
         '
-        Me.ClosedErzeugenToolStripMenuItem.Name = "ClosedErzeugenToolStripMenuItem"
+        Me.ATBNraendernToolStripMenuItem.Name = "ATBNraendernToolStripMenuItem"
-        Me.ClosedErzeugenToolStripMenuItem.Size = New System.Drawing.Size(161, 22)
+        Me.ATBNraendernToolStripMenuItem.Size = New System.Drawing.Size(152, 22)
-        Me.ClosedErzeugenToolStripMenuItem.Text = "Closed erzeugen"
+        Me.ATBNraendernToolStripMenuItem.Text = "ATB-Nr ändern"
+        Me.ATBNraendernToolStripMenuItem.Visible = False
         '
         'Panel2
         '
+        Me.Panel2.Controls.Add(Me.pnlChangeATCNr)
+        Me.Panel2.Controls.Add(Me.pnlChangeATBNr)
         Me.Panel2.Controls.Add(Me.panOverlay)
         Me.Panel2.Controls.Add(Me.dgvGesamtsicherheit)
         Me.Panel2.Controls.Add(Me.dgvSicherheitsPos)
@@ -152,6 +172,152 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Panel2.Size = New System.Drawing.Size(1384, 486)
         Me.Panel2.TabIndex = 1
         '
+        'pnlChangeATCNr
+        '
+        Me.pnlChangeATCNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATCNr.Controls.Add(Me.lblATCwarning)
+        Me.pnlChangeATCNr.Controls.Add(Me.FlatButton3)
+        Me.pnlChangeATCNr.Controls.Add(Me.txtATCaendern)
+        Me.pnlChangeATCNr.Controls.Add(Me.Label34)
+        Me.pnlChangeATCNr.Controls.Add(Me.FlatButton4)
+        Me.pnlChangeATCNr.Location = New System.Drawing.Point(1051, 42)
+        Me.pnlChangeATCNr.Name = "pnlChangeATCNr"
+        Me.pnlChangeATCNr.Size = New System.Drawing.Size(292, 103)
+        Me.pnlChangeATCNr.TabIndex = 13
+        Me.pnlChangeATCNr.Visible = False
+        '
+        'lblATCwarning
+        '
+        Me.lblATCwarning.AutoSize = True
+        Me.lblATCwarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblATCwarning.ForeColor = System.Drawing.Color.Red
+        Me.lblATCwarning.Location = New System.Drawing.Point(10, 7)
+        Me.lblATCwarning.Name = "lblATCwarning"
+        Me.lblATCwarning.Size = New System.Drawing.Size(0, 13)
+        Me.lblATCwarning.TabIndex = 10
+        '
+        'FlatButton3
+        '
+        Me.FlatButton3.allowBorder = False
+        Me.FlatButton3.BackColor = System.Drawing.Color.Gainsboro
+        Me.FlatButton3.FlatAppearance.BorderSize = 0
+        Me.FlatButton3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.FlatButton3.ForeColor = System.Drawing.Color.Black
+        Me.FlatButton3.Location = New System.Drawing.Point(210, 77)
+        Me.FlatButton3.Name = "FlatButton3"
+        Me.FlatButton3.Size = New System.Drawing.Size(75, 23)
+        Me.FlatButton3.TabIndex = 9
+        Me.FlatButton3.Text = "Ändern"
+        Me.FlatButton3.UseVisualStyleBackColor = False
+        '
+        'txtATCaendern
+        '
+        Me.txtATCaendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtATCaendern.Location = New System.Drawing.Point(95, 40)
+        Me.txtATCaendern.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtATCaendern.Name = "txtATCaendern"
+        Me.txtATCaendern.Size = New System.Drawing.Size(186, 24)
+        Me.txtATCaendern.TabIndex = 6
+        '
+        'Label34
+        '
+        Me.Label34.AutoSize = True
+        Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label34.Location = New System.Drawing.Point(10, 40)
+        Me.Label34.Name = "Label34"
+        Me.Label34.Size = New System.Drawing.Size(80, 20)
+        Me.Label34.TabIndex = 5
+        Me.Label34.Text = "ATC/MRN"
+        '
+        'FlatButton4
+        '
+        Me.FlatButton4.allowBorder = False
+        Me.FlatButton4.BackColor = System.Drawing.Color.White
+        Me.FlatButton4.BackgroundImage = Global.AVISO.My.Resources.Resources.del2
+        Me.FlatButton4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.FlatButton4.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        Me.FlatButton4.FlatAppearance.BorderSize = 0
+        Me.FlatButton4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.FlatButton4.ForeColor = System.Drawing.Color.Black
+        Me.FlatButton4.Location = New System.Drawing.Point(261, 3)
+        Me.FlatButton4.Name = "FlatButton4"
+        Me.FlatButton4.Size = New System.Drawing.Size(24, 24)
+        Me.FlatButton4.TabIndex = 0
+        Me.FlatButton4.UseVisualStyleBackColor = False
+        '
+        'pnlChangeATBNr
+        '
+        Me.pnlChangeATBNr.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        Me.pnlChangeATBNr.Controls.Add(Me.lblWarningATB)
+        Me.pnlChangeATBNr.Controls.Add(Me.FlatButton1)
+        Me.pnlChangeATBNr.Controls.Add(Me.txtATBNraendern)
+        Me.pnlChangeATBNr.Controls.Add(Me.Label32)
+        Me.pnlChangeATBNr.Controls.Add(Me.FlatButton2)
+        Me.pnlChangeATBNr.Location = New System.Drawing.Point(65, 39)
+        Me.pnlChangeATBNr.Name = "pnlChangeATBNr"
+        Me.pnlChangeATBNr.Size = New System.Drawing.Size(292, 103)
+        Me.pnlChangeATBNr.TabIndex = 12
+        Me.pnlChangeATBNr.Visible = False
+        '
+        'lblWarningATB
+        '
+        Me.lblWarningATB.AutoSize = True
+        Me.lblWarningATB.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblWarningATB.ForeColor = System.Drawing.Color.Red
+        Me.lblWarningATB.Location = New System.Drawing.Point(10, 7)
+        Me.lblWarningATB.Name = "lblWarningATB"
+        Me.lblWarningATB.Size = New System.Drawing.Size(0, 13)
+        Me.lblWarningATB.TabIndex = 10
+        '
+        'FlatButton1
+        '
+        Me.FlatButton1.allowBorder = False
+        Me.FlatButton1.BackColor = System.Drawing.Color.Gainsboro
+        Me.FlatButton1.FlatAppearance.BorderSize = 0
+        Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.FlatButton1.ForeColor = System.Drawing.Color.Black
+        Me.FlatButton1.Location = New System.Drawing.Point(210, 77)
+        Me.FlatButton1.Name = "FlatButton1"
+        Me.FlatButton1.Size = New System.Drawing.Size(75, 23)
+        Me.FlatButton1.TabIndex = 9
+        Me.FlatButton1.Text = "Ändern"
+        Me.FlatButton1.UseVisualStyleBackColor = False
+        '
+        'txtATBNraendern
+        '
+        Me.txtATBNraendern.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtATBNraendern.Location = New System.Drawing.Point(95, 40)
+        Me.txtATBNraendern.Margin = New System.Windows.Forms.Padding(0)
+        Me.txtATBNraendern.Name = "txtATBNraendern"
+        Me.txtATBNraendern.Size = New System.Drawing.Size(186, 24)
+        Me.txtATBNraendern.TabIndex = 6
+        '
+        'Label32
+        '
+        Me.Label32.AutoSize = True
+        Me.Label32.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label32.Location = New System.Drawing.Point(10, 40)
+        Me.Label32.Name = "Label32"
+        Me.Label32.Size = New System.Drawing.Size(61, 20)
+        Me.Label32.TabIndex = 5
+        Me.Label32.Text = "ATB-Nr"
+        '
+        'FlatButton2
+        '
+        Me.FlatButton2.allowBorder = False
+        Me.FlatButton2.BackColor = System.Drawing.Color.White
+        Me.FlatButton2.BackgroundImage = Global.AVISO.My.Resources.Resources.del2
+        Me.FlatButton2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.FlatButton2.DialogResult = System.Windows.Forms.DialogResult.Cancel
+        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(261, 3)
+        Me.FlatButton2.Name = "FlatButton2"
+        Me.FlatButton2.Size = New System.Drawing.Size(24, 24)
+        Me.FlatButton2.TabIndex = 0
+        Me.FlatButton2.UseVisualStyleBackColor = False
+        '
         'panOverlay
         '
         Me.panOverlay.BackColor = System.Drawing.SystemColors.ButtonHighlight
@@ -167,7 +333,7 @@ Partial Class frmGesamtsicherheitenNEU
         Me.panOverlay.Controls.Add(Me.Label17)
         Me.panOverlay.Controls.Add(Me.Label16)
         Me.panOverlay.Controls.Add(Me.btnClosePanOverlay)
-        Me.panOverlay.Location = New System.Drawing.Point(493, 15)
+        Me.panOverlay.Location = New System.Drawing.Point(485, 15)
         Me.panOverlay.Name = "panOverlay"
         Me.panOverlay.Size = New System.Drawing.Size(527, 297)
         Me.panOverlay.TabIndex = 2
@@ -338,7 +504,7 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvGesamtsicherheit.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
         Me.dgvGesamtsicherheit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStrip1
+        Me.dgvGesamtsicherheit.ContextMenuStrip = Me.ContextMenuStripGesSicherh
         DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
         DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
         DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -377,6 +543,7 @@ Partial Class frmGesamtsicherheitenNEU
         DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
         Me.dgvSicherheitsPos.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4
         Me.dgvSicherheitsPos.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvSicherheitsPos.ContextMenuStrip = Me.ContextMenuStripPosSicherheiten
         DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
         DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window
         DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -393,6 +560,19 @@ Partial Class frmGesamtsicherheitenNEU
         Me.dgvSicherheitsPos.Size = New System.Drawing.Size(636, 454)
         Me.dgvSicherheitsPos.TabIndex = 1
         '
+        'ContextMenuStripPosSicherheiten
+        '
+        Me.ContextMenuStripPosSicherheiten.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATCMRNNraendernToolStripMenuItem})
+        Me.ContextMenuStripPosSicherheiten.Name = "ContextMenuStrip"
+        Me.ContextMenuStripPosSicherheiten.Size = New System.Drawing.Size(185, 26)
+        '
+        'ATCMRNNraendernToolStripMenuItem
+        '
+        Me.ATCMRNNraendernToolStripMenuItem.Name = "ATCMRNNraendernToolStripMenuItem"
+        Me.ATCMRNNraendernToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
+        Me.ATCMRNNraendernToolStripMenuItem.Text = "ATC/MRN-Nr ändern"
+        Me.ATCMRNNraendernToolStripMenuItem.Visible = False
+        '
         'pnlSummeGes
         '
         Me.pnlSummeGes.BackColor = System.Drawing.SystemColors.ButtonHighlight
@@ -1091,7 +1271,6 @@ Partial Class frmGesamtsicherheitenNEU
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Enabled = False
         Me.Label14.ForeColor = System.Drawing.SystemColors.ButtonHighlight
         Me.Label14.Location = New System.Drawing.Point(194, 237)
         Me.Label14.Name = "Label14"
@@ -1112,7 +1291,6 @@ Partial Class frmGesamtsicherheitenNEU
         'Label13
         '
         Me.Label13.AutoSize = True
-        Me.Label13.Enabled = False
         Me.Label13.ForeColor = System.Drawing.SystemColors.ButtonHighlight
         Me.Label13.Location = New System.Drawing.Point(76, 234)
         Me.Label13.Name = "Label13"
@@ -1312,12 +1490,17 @@ Partial Class frmGesamtsicherheitenNEU
         Me.Name = "frmGesamtsicherheitenNEU"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "frmGesSich"
-        Me.ContextMenuStrip1.ResumeLayout(False)
+        Me.ContextMenuStripGesSicherh.ResumeLayout(False)
         Me.Panel2.ResumeLayout(False)
+        Me.pnlChangeATCNr.ResumeLayout(False)
+        Me.pnlChangeATCNr.PerformLayout()
+        Me.pnlChangeATBNr.ResumeLayout(False)
+        Me.pnlChangeATBNr.PerformLayout()
         Me.panOverlay.ResumeLayout(False)
         Me.panOverlay.PerformLayout()
         CType(Me.dgvGesamtsicherheit, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvSicherheitsPos, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ContextMenuStripPosSicherheiten.ResumeLayout(False)
         Me.pnlSummeGes.ResumeLayout(False)
         Me.pnlSummeGes.PerformLayout()
         Me.panOben.ResumeLayout(False)
@@ -1384,8 +1567,8 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents btnDeleteSicherheit As VERAG_PROG_ALLGEMEIN.FlatButton
     Friend WithEvents cboWarenort As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents lblWarenort As Label
-    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
+    Friend WithEvents ContextMenuStripGesSicherh As ContextMenuStrip
-    Friend WithEvents ClosedErzeugenToolStripMenuItem As ToolStripMenuItem
+    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
@@ -1417,4 +1600,18 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents txtPosSicherheitsbGes As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents Label23 As Label
     Friend WithEvents txtlkwIdSearch As VERAG_PROG_ALLGEMEIN.MySearchBox
+    Friend WithEvents ContextMenuStripPosSicherheiten As ContextMenuStrip
+    Friend WithEvents ATCMRNNraendernToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents pnlChangeATBNr As Panel
+    Friend WithEvents FlatButton1 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents txtATBNraendern As TextBox
+    Friend WithEvents Label32 As Label
+    Friend WithEvents FlatButton2 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents lblWarningATB As Label
+    Friend WithEvents pnlChangeATCNr As Panel
+    Friend WithEvents lblATCwarning As Label
+    Friend WithEvents FlatButton3 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents txtATCaendern As TextBox
+    Friend WithEvents Label34 As Label
+    Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
 End Class

Aviso/frmGesamtsicherheitenNEU.resx

@@ -117,9 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ContextMenuStripGesSicherh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="ContextMenuStripPosSicherheiten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>268, 15</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Aviso/frmGesamtsicherheitenNEU.vb

@@ -1,4 +1,7 @@
 
+Imports System.Linq.Expressions
+Imports GrapeCity.Viewer.Common.Model
+Imports Org.BouncyCastle.Cms
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
@@ -58,7 +61,7 @@ Public Class frmGesamtsicherheitenNEU
             panOverlay.Visible = True
 
             cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-            cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+            cboWarenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_BezeichnungCBO] ", True, "AVISO", True)
 
             If datum = Nothing Then datum = Date.Now
             nextGessicherheitID = -1
@@ -114,7 +117,7 @@ Public Class frmGesamtsicherheitenNEU
                     Case True
                         .Columns("gs_ATBNr").HeaderText = "ATB"
                         .Columns("gs_ATBNr").Width = 130
-                        .Columns("gs_atr").HeaderText = "MRN"
+                        .Columns("gs_atr").HeaderText = "ATR"
                         .Columns("gs_atr").Visible = True
                         .Columns("gs_atr").Width = 35
                         .Columns("gs_ust").Width = 70
@@ -146,6 +149,33 @@ Public Class frmGesamtsicherheitenNEU
 
     End Sub
 
+    Public Sub LoadDGVSicherheitenForExport(list As List(Of Integer))
+
+        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_gsId] as Id, [gs_ATBNr] as 'ATB Verwahrlager', CAST(gs_datum as Date) as Datum, CONVERT(VARCHAR(5),gs_datum, 108) as Uhrzeit, [gs_warenwert] as Warenwert, [gs_sicherheitsbetrag] as Sicherheitbetrag, [gs_freitext] as Freitext, [gs_atr] as 'ATR ja/nein', [gs_ust] as '19% EUSt',  
+                                            [gsp_ATCNr] as 'ATCNr oder MRN eroeffnet', CAST(gsp_erstellungsdatum as Date) as Datum, CONVERT(VARCHAR(5),gsp_erstellungsdatum, 108) as Uhrzeit, [gsp_warenwert] as Warenwert, [gsp_sicherheitsbetrag] as Sicherheitsbetrag, [gsp_freitext] as Freitext, [gs_saldo] as Saldo
+                                            from [tblGesamtsicherheit]
+                                            inner join [tblGesamtsicherheitsPositionen] on [tblGesamtsicherheit].gs_gsId = [tblGesamtsicherheitsPositionen].gsp_gsId
+                                             where [gs_gsnr] IN (" & gsnr & ")
+                                            order by gs_gsId"
+
+        dgvGesamtsicherheit.SET_SQL(SQLStringSicherheit, "AVISO", ,)
+        dgvGesamtsicherheit.LOAD()
+
+    End Sub
+
+
+
     Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged
         If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
 
@@ -156,9 +186,11 @@ Public Class frmGesamtsicherheitenNEU
             setSaldo()
 
             If dgvGesamtsicherheit.Enabled = False Then Exit Sub
+            ATBNraendernToolStripMenuItem.Visible = True
 
         Else
             LoadDGVSicherheitsPos(-1, True)
+            ATBNraendernToolStripMenuItem.Visible = False
 
         End If
     End Sub
@@ -216,6 +248,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
 
@@ -270,6 +303,24 @@ Public Class frmGesamtsicherheitenNEU
     End Sub
 
     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
+        Else
+            txtSicherheitWarenwert.ForeColor = Color.Black
+
+        End If
+
+
+        If Not IsNumeric(txtPosWarenwert.Text) And sender.name = "txtPosWarenwert" Then
+            txtPosWarenwert.ForeColor = Color.Red
+            Exit Sub
+        Else
+            txtPosWarenwert.ForeColor = Color.Black
+
+        End If
+
         Try
             Select Case sender.name
                 Case "txtSicherheitWarenwert"
@@ -284,7 +335,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtSicherheitWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtAnzahlPos.KeyPress, txtZollsatzueberschreiben.KeyPress
         Select Case Asc(e.KeyChar)
-            Case 48 To 57, 8, 44
+            Case 48 To 57, 8, 44, 22
                 ' Zahlen, Backspace und , zulassen
 
             Case Else
@@ -296,6 +347,7 @@ Public Class frmGesamtsicherheitenNEU
     Private Sub DateTime_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtPosDate.KeyPress, txtPosTime.KeyPress, txtSicherheitDate.KeyPress, txtSicherheitTime.KeyPress
         Select Case Asc(e.KeyChar)
             Case 48 To 57, 8, 46, 58
+
                 ' Zahlen, Backspace, . und : zulassen
 
             Case Else
@@ -405,7 +457,6 @@ Public Class frmGesamtsicherheitenNEU
                     .gsp_ust = ""
                     .gsp_avisoId = Me.avisioID
                     '.gsp_ATCNr = ""
-                    '.gsp_MRNNr = ""
                     .gsp_gsNr = OPEN.gs_gsNr
                 End With
 
@@ -470,7 +521,6 @@ Public Class frmGesamtsicherheitenNEU
                 .gsp_erstellungsdatum = DateTimeString2DateTimeKonvertinator(txtPosDate.Text, txtPosTime.Text)
                 .gsp_ust = currentSicherheit.gs_ust
                 .gsp_ATCNr = txtPositionenCRN.Text
-                .gsp_MRNNr = txtPositionenCRN.Text
                 .gsp_avisoId = Me.avisioID
             End With
 
@@ -1107,7 +1157,7 @@ Public Class frmGesamtsicherheitenNEU
 
 
         For i As Integer = 0 To dt.Rows.Count - 1
-            MsgBox("gs_gsId: " & dt.Rows(i).Item("gs_gsId").ToString & " " & "gs_posNr: " & dt.Rows(i).Item("gs_posNr").ToString)
+            'MsgBox("gs_gsId: " & dt.Rows(i).Item("gs_gsId").ToString & " " & "gs_posNr: " & dt.Rows(i).Item("gs_posNr").ToString)
             Dim sicherheit = New cSicherheiten(dt.Rows(i).Item("gs_gsId"), dt.Rows(i).Item("gs_posNr"))
             Dim currentPos = sicherheit.gs_posNr
             sicherheit.gs_posNr = currentPos - 1
@@ -1127,5 +1177,118 @@ Public Class frmGesamtsicherheitenNEU
             txtLKWID.ReadOnly = False
         End If
     End Sub
-End Class
 
+    Private Sub ATBNraendernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATBNraendernToolStripMenuItem.Click
+        Dim ATBNr As String
+        Dim mutlitpleATBNr As Boolean = False
+
+        ATBNr = dgvGesamtsicherheit.SelectedRows(0).Cells("gs_ATBNr").Value.ToString
+
+        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+            For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+                If row.Cells("gs_ATBNr").Value.ToString <> ATBNr Then
+                    mutlitpleATBNr = True
+                End If
+            Next
+        End If
+
+        If mutlitpleATBNr Then
+            lblWarningATB.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATB-Nummern markiert!"
+        Else
+            lblWarningATB.Text = ""
+        End If
+        dgvGesamtsicherheit.Enabled = False
+        txtATBNraendern.Text = ATBNr
+        pnlChangeATBNr.Visible = True
+
+    End Sub
+
+    Private Sub ATCMRNNraendernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATCMRNNraendernToolStripMenuItem.Click
+        Dim ATCNr As String
+        Dim mutlitpleATCNr As Boolean = False
+
+        ATCNr = dgvSicherheitsPos.SelectedRows(0).Cells("gsp_ATCNr").Value.ToString
+
+        If dgvSicherheitsPos.SelectedRows.Count > 0 Then
+
+            For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows
+                If row.Cells("gsp_ATCNr").Value.ToString <> ATCNr Then
+                    mutlitpleATCNr = True
+                End If
+            Next
+        End If
+
+        If mutlitpleATCNr Then
+            lblATCwarning.Text = "ACHTUNG!" & vbCrLf & "Es wurden unterschiedl. ATC-Nummern markiert!"
+        Else
+            lblATCwarning.Text = ""
+        End If
+        dgvSicherheitsPos.Enabled = False
+        txtATCaendern.Text = ATCNr
+        pnlChangeATCNr.Visible = True
+
+
+    End Sub
+
+    Private Sub dgvSicherheitsPos_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSicherheitsPos.SelectionChanged
+        If dgvSicherheitsPos.SelectedRows.Count > 0 Then
+            ATCMRNNraendernToolStripMenuItem.Visible = True
+        Else
+            ATCMRNNraendernToolStripMenuItem.Visible = False
+        End If
+    End Sub
+
+    Private Sub FlatButton1_Click(sender As Object, e As EventArgs) Handles FlatButton1.Click
+        If txtATBNraendern.Text = "" Then
+            MsgBox("Bitte ATR-Nr angeben!")
+            Exit Sub
+        End If
+        If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
+
+            For Each row As DataGridViewRow In dgvGesamtsicherheit.SelectedRows
+                Dim sicherh As New cSicherheiten(row.Cells("gs_gsId").Value, row.Cells("gs_posNr").Value)
+                sicherh.gs_ATBNr = txtATBNraendern.Text
+                sicherh.SAVE()
+
+            Next
+        End If
+
+
+        pnlChangeATBNr.Visible = False
+        dgvGesamtsicherheit.Enabled = True
+        AfterButton()
+    End Sub
+
+    Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles FlatButton2.Click
+        pnlChangeATBNr.Visible = False
+        dgvGesamtsicherheit.Enabled = True
+    End Sub
+
+
+
+    Private Sub FlatButton3_Click(sender As Object, e As EventArgs) Handles FlatButton3.Click
+        If txtATCaendern.Text = "" Then
+            MsgBox("Bitte ATC/MRN-Nr angeben!")
+            Exit Sub
+        End If
+        If dgvSicherheitsPos.SelectedRows.Count > 0 Then
+
+            For Each row As DataGridViewRow In dgvSicherheitsPos.SelectedRows
+
+                Dim SicherhPos As New cGesamtsicherheitsPositionen(row.Cells("gsp_gsId").Value, row.Cells("gsp_gspPosId").Value)
+                SicherhPos.gsp_ATCNr = txtATCaendern.Text
+                SicherhPos.SAVE()
+            Next
+        End If
+
+        pnlChangeATCNr.Visible = False
+        dgvSicherheitsPos.Enabled = True
+        AfterButton()
+    End Sub
+
+    Private Sub FlatButton4_Click(sender As Object, e As EventArgs) Handles FlatButton4.Click
+        pnlChangeATCNr.Visible = False
+        dgvSicherheitsPos.Enabled = True
+    End Sub
+End Class