Bugfix Gesamtsicherheiten, Sendungsdetails -> ReplyAll

Aviso/My Project/AssemblyInfo.vb

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

Aviso/frmGesamtsicherheitenNEU.Designer.vb

@@ -132,6 +132,7 @@ 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.btnNew = New System.Windows.Forms.Button()
         Me.ContextMenuStripGesSicherh.SuspendLayout()
         Me.Panel2.SuspendLayout()
         Me.pnlChangeATCNr.SuspendLayout()
@@ -1092,6 +1093,7 @@ Partial Class frmGesamtsicherheitenNEU
         'Panel1
         '
         Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight
+        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)
@@ -1477,6 +1479,15 @@ Partial Class frmGesamtsicherheitenNEU
         Me.btnAddSicherheit.TabIndex = 36
         Me.btnAddSicherheit.UseVisualStyleBackColor = False
         '
+        'btnNew
+        '
+        Me.btnNew.Location = New System.Drawing.Point(1265, 13)
+        Me.btnNew.Name = "btnNew"
+        Me.btnNew.Size = New System.Drawing.Size(93, 30)
+        Me.btnNew.TabIndex = 50
+        Me.btnNew.Text = "Neu"
+        Me.btnNew.UseVisualStyleBackColor = True
+        '
         'frmGesamtsicherheitenNEU
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1614,4 +1625,5 @@ Partial Class frmGesamtsicherheitenNEU
     Friend WithEvents txtATCaendern As TextBox
     Friend WithEvents Label34 As Label
     Friend WithEvents FlatButton4 As VERAG_PROG_ALLGEMEIN.FlatButton
+    Friend WithEvents btnNew As Button
 End Class

Aviso/frmGesamtsicherheitenNEU.vb

@@ -3,6 +3,7 @@ Imports System.Data.SqlTypes
 Imports System.Linq.Expressions
 Imports GrapeCity.Viewer.Common.Model
 Imports Org.BouncyCastle.Cms
+Imports Spire.PdfViewer.Forms
 Imports VERAG_PROG_ALLGEMEIN
 
 Public Class frmGesamtsicherheitenNEU
@@ -36,6 +37,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Dim indexGsId As Integer
 
+    Dim indexGsNr As Integer
+
     Dim indexGspPosId As Integer
 
     Dim isOpen As Boolean = False
@@ -220,9 +223,10 @@ Public Class frmGesamtsicherheitenNEU
     Private Sub dgvGesamtsicherheit_SelectionChanged(sender As Object, e As EventArgs) Handles dgvGesamtsicherheit.SelectionChanged
         If dgvGesamtsicherheit.SelectedRows.Count > 0 Then
 
-            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value)
-            currentSicherheit = New cSicherheiten(indexGsId)
-            LoadDGVSicherheitsPos(indexGsId, True)
+            indexGsId = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsId").Value)
+            indexGsNr = CInt(dgvGesamtsicherheit.SelectedRows(0).Cells("gs_gsNr").Value)
+            currentSicherheit = New cSicherheiten(indexGsNr)
+            LoadDGVSicherheitsPos(indexGsNr, True)
             loadTitle()
             setSaldo()
 
@@ -306,7 +310,7 @@ Public Class frmGesamtsicherheitenNEU
 
         lblGestellungNr.Text = ""
         lblId.Text = ""
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'"
+        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & indexGsNr & "'"
 
 
         Dim dt As New DataTable
@@ -670,11 +674,13 @@ Public Class frmGesamtsicherheitenNEU
         End Try
 
         Me.Abfertigungsnummer = txtAbfertNum.Text
-        Me.LKWKZ = txtLKWKZ.Text
+
         If txtlkwIdSearch.Text IsNot "" Then
             Me.avisoID = CInt(txtlkwIdSearch.Text)
         End If
 
+        Me.LKWKZ = txtLKWKZ.Text
+
 
         If setNullToZero(Me.gessicherheitID) > 0 Then
             Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "',  [gs_avisoId] = '" & Me.avisoID & "',[gs_LKWKZ] = '" & Me.LKWKZ & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' "
@@ -697,17 +703,17 @@ Public Class frmGesamtsicherheitenNEU
                     Return obj.value.ToString
                 End If
             Case "Integer"
-                If obj Is Nothing Or obj Is DBNull.Value Or obj = "" Then
+                If obj Is Nothing Or obj Is DBNull.Value Then
                     Return Nothing
                 Else
-                    Return Integer.Parse(CStr(obj))
+                    Return Integer.Parse(CInt(obj.value))
                 End If
 
             Case "Double"
-                If obj Is Nothing Or obj Is DBNull.Value Or obj = "" Then
+                If obj Is Nothing Or obj Is DBNull.Value Then
                     Return Nothing
                 Else
-                    Return Double.Parse(CStr(obj))
+                    Return Double.Parse(CDbl(obj.value))
                 End If
 
         End Select
@@ -842,7 +848,8 @@ Public Class frmGesamtsicherheitenNEU
         cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1'  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.Text = Me.avisoID
+
+        txtlkwIdSearch.Text = Me.avisoID.ToString
         txtAbfertNum.Text = Me.Abfertigungsnummer
         txtLKWKZ.Text = Me.LKWKZ
         panOben.Enabled = False
@@ -850,6 +857,7 @@ Public Class frmGesamtsicherheitenNEU
 
     Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click
         panOverlay.Visible = False
+        Me.Close()
     End Sub
 
     Private Function checkMandatoryFieldsAreFilled() As Boolean
@@ -1426,4 +1434,13 @@ Public Class frmGesamtsicherheitenNEU
 
         End If
     End Sub
+
+    Private Sub btnNew_Click(sender As Object, e As EventArgs) Handles btnNew.Click
+        Me.Close()
+
+        'Dim frm As New frmGesamtsicherheitenMenuNEU
+        'frm.Standort = Me.Standort
+        'frm.btnNeu.PerformClick()
+
+    End Sub
 End Class

Aviso/frmSendungsdetailsNEU.vb

@@ -5435,7 +5435,7 @@ Public Class frmSendungsdetailsNEU
 
                         Mail = CType(olSess.OpenSharedItem(PathTmpANH), Outlook.MailItem)
 
-                        Mail = Mail.Reply()
+                        Mail = Mail.ReplyAll
                         isReply = True
 
                     Else