Feature_Gesamtsicherheiten

Aviso/frmGesamtsicherheitenNEU.vb

@@ -7,14 +7,13 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class frmGesamtsicherheitenNEU
 
 
+    'Dim openopened As cSicherheiten
 
-    Dim openopened As cSicherheiten
+    'Dim closedopened As cSicherheiten
 
-    Dim closedopened As cSicherheiten
-
-    Dim sicherheiten As cSicherheiten
-    Property GesSichRef As cGesamtsicherheitsReferenz
-    Property GesSichPos As cGesamtsicherheitsPositionen
+    Dim currentSicherheit As cSicherheiten
+    Property currentSPos As cGesamtsicherheitsPositionen
+    Property currentGesSichRef As cGesamtsicherheitsReferenz
     Public Property gessicherheitID As Integer
     Public Property datum As DateTime = Nothing
     Property Standort As String = ""
@@ -35,6 +34,8 @@ Public Class frmGesamtsicherheitenNEU
 
     Public warenortID As String
 
+    Dim indexGsId As Integer = 0
+
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
     Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1)
@@ -43,85 +44,78 @@ Public Class frmGesamtsicherheitenNEU
 
     Dim JAHR As Date = CDate("01.01." & Now.Year)
 
-    Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click
 
-        Dim dgv As String = ""
-        For Each c As DataGridViewColumn In dgvGesamtsicherheitMRN.Columns
-            dgv &= c.Width & c.HeaderText & vbCrLf
-        Next
 
-        LoadDGV()
-        GesSichRef.LOAD()
+    Private Sub frmGesamtsicherheitNEU_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cGesamtsicherheitsReferenz(Standort)
+        lblSaldo.Text = "Saldo: €" & Decimal.Parse(currentGesSichRef.CalcSaldo()).ToString("N")
+
+
+
+        If setNullToZero(gessicherheitID) = 0 Or Neu = True Then
+            'panOben.Enabled = False : panOben.Enabled = False
+            Panel1.Enabled = True
+            '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)
+
+            cbx_Suche_Filiale.Items.AddRange(cboFiliale.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+            cbx_Suche_Warenort.Items.AddRange(cboWarenort.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+
+            If datum = Nothing Then datum = Date.Now
+        Else
+            LoadDGVSicherheiten()
+        End If
         LoadStandort()
-    End Sub
+        cboATR.Enabled = currentGesSichRef.gsr_ATR
+        Zollsatz = currentGesSichRef.gsr_zollsatz
 
-    Private Sub frmGesamtsicherheit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        txtDatVon.Text = Date.Today.ToString("dd.MM.yyyy")
+        txtDatBis.Text = Date.Today.ToString("dd.MM.yyyy")
 
         btnMonat.Text = MONAT.ToString("MMMM")
         btnJahr.Text = JAHR.Year
 
-        If setNullToZero(gessicherheitID) = "" Or Neu = True Then
-            panOben.Enabled = False : panOben.Enabled = False
-            'panOverlay.Visible = True
-            cbxFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True)
-            cbxFiliale.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
-            If datum = Nothing Then datum = Date.Now
-        Else
-            LoadDGV()
-        End If
-        LoadStandort()
-        cboATR.Enabled = GesSichRef.gsr_ATR
-        Zollsatz = GesSichRef.gsr_zollsatz
-
         Me.Text = "Gesamtsicherheit " & Standort
-        frmHauptfenster.EnableDoubleBuffered(dgvGesamtsicherheitPositionen)
+        frmHauptfenster.EnableDoubleBuffered(dgvSicherheitsPos)
     End Sub
 
 
-    Public Sub LoadDGV()
+    Public Sub LoadDGVSicherheiten()
 
-        lblSaldo.Text = "Saldo: € " & GesSichRef.gsr_Saldo.ToString()
+        lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString()
         lblGestellungNr.Text = ""
         Dim sqladd1 As String = ""
-        If GesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & GesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust"
-        If GesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]"
+        If currentGesSichRef.gsr_ustEnabled Then sqladd1 &= ", FORMAT((([gs_warenwert] + [gs_sicherheitsbetrag]) * " & currentGesSichRef.gsr_ust & "/100), 'C', 'de-DE') as gs_ust"
+        If currentGesSichRef.gsr_ATR Then sqladd1 &= ", [gs_atr]"
 
 
         Dim addtosqlstring As String = ""
-        Dim SQLStringMRN As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "' order by [gs_datum]"
-        dgvGesamtsicherheitMRN.SET_SQL(SQLStringMRN, "AVISO", ,)
-        dgvGesamtsicherheitMRN.LOAD()
+        Dim SQLStringMRN As String = "select [gs_gsId], [gs_ATBNr], [gs_posNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " &
+                                        sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] 
+                                        where gs_standort = '" & Standort & "'And gs_datum > '" & Date.Parse(txtDatVon.Text) & "' And gs_datum < '" & Date.Parse(txtDatBis.Text).AddDays(1).AddSeconds(-1) & "'" &
+                                        "AND (gs_abfertigungsNr Like '%" & txt_Suche.Text & "%' OR" &
+                                        " gs_ATBNr like '%" & txt_Suche.Text & "%' OR" &
+                                        " gs_LKWID like '%" & txt_Suche.Text & "%' OR" &
+                                        " gs_warenort like '%" & cbx_Suche_Warenort.Text & "%') order by [gs_datum]"
 
-        Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gessicherheitID & "' order by [gsp_gspPosId]"
-        dgvGesamtsicherheitPositionen.SET_SQL(SQLStringCRN, "AVISO", ,)
-        dgvGesamtsicherheitPositionen.LOAD()
-
-        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"
-        Dim dt As New DataTable
-        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
-
-        If dt.Rows.Count > 0 Then
-            Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID"))
-            Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
-            Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr"))
-            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
-
-            If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " "
-            If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
-            If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
-            If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
-        End If
+        dgvGesamtsicherheit.SET_SQL(SQLStringMRN, "AVISO", ,)
+        dgvGesamtsicherheit.LOAD()
 
 
-        If dgvGesamtsicherheitMRN.Columns.Count > 0 Then
-            With dgvGesamtsicherheitMRN
+
+
+
+        If dgvGesamtsicherheit.Columns.Count > 0 Then
+            With dgvGesamtsicherheit
                 .RowHeadersWidth = 10
                 .Columns("gs_gsId").Visible = False
                 .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
                 .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").DefaultCellStyle.Format = "c"
                 .Columns("gs_saldo").Visible = False
-                Select Case GesSichRef.gsr_ATR
+                Select Case currentGesSichRef.gsr_ATR
                     Case True
                         .Columns("gs_ATBNr").HeaderText = "ATB"
                         .Columns("gs_atr").HeaderText = "ATR"
@@ -141,71 +135,113 @@ Public Class frmGesamtsicherheitenNEU
                 .Columns("gs_freitext").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             End With
 
+
+            'For Each row As DataGridViewRow In dgvGesamtsicherheit.Rows
+            '    If row.Cells("gs_SicherheitsSaldo").Value <> 0 Then
+            '        row.DefaultCellStyle.BackColor = Color.Red
+            '    Else
+            '        row.DefaultCellStyle.BackColor = Color.Green
+            '    End If
+            'Next
+
         End If
 
-        If dgvGesamtsicherheitPositionen.Columns.Count > 0 Then
-            With dgvGesamtsicherheitPositionen
+
+    End Sub
+
+    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_gsId").Value)
+            currentSicherheit = New cSicherheiten(indexGsId)
+
+            LoadDGVSicherheitsPos(indexGsId)
+            loadTitle(indexGsId)
+
+            If dgvGesamtsicherheit.Enabled = False Then Exit Sub
+
+        End If
+    End Sub
+
+    Public Sub LoadDGVSicherheitsPos(gsId As Integer)
+
+        If gsId = 0 Then Exit Sub
+
+        Dim SQLStringCRN As String = "select [gsp_gspPosId] ,[gsp_gsId],[gsp_warenwert],[gsp_sicherheitsbetrag],[gsp_freitext],[gsp_art] ,[gsp_avisoId] ,[gsp_ust] ,[gsp_filialenNr],[gsp_abfertigungsNr] ,[gsp_ATCNr] ,[gsp_MRNNr] from [tblGesamtsicherheitsPositionen] where [gsp_gsId] = '" & gsId & "' order by [gsp_gspPosId]"
+        dgvSicherheitsPos.SET_SQL(SQLStringCRN, "AVISO", ,)
+        dgvSicherheitsPos.LOAD()
+
+        If dgvSicherheitsPos.Columns.Count > 0 Then
+            With dgvSicherheitsPos
                 .RowHeadersWidth = 10
                 .Columns("gsp_gsId").Visible = False
-                .Columns("gs_warenwert").DefaultCellStyle.Format = "c"
-                .Columns("gs_sicherheitsbetrag").DefaultCellStyle.Format = "c"
-                .Columns("gs_saldo").DefaultCellStyle.Format = "c"
-                .Columns("gs_saldo").Visible = False
-                Select Case GesSichRef.gsr_ATR
+                .Columns("gsp_warenwert").DefaultCellStyle.Format = "c"
+                .Columns("gsp_sicherheitsbetrag").DefaultCellStyle.Format = "c"
+                '.Columns("gs_saldo").DefaultCellStyle.Format = "c"
+                '.Columns("gs_saldo").Visible = False
+                Select Case currentGesSichRef.gsr_ATR
                     Case True
-                        .Columns("gs_ATBNr").HeaderText = "ATC / MRN"
+                        .Columns("gsp_ATCNr").HeaderText = "ATC / MRN"
                     Case Else
-                        .Columns("gs_ATBNr").HeaderText = "CRN"
+                        .Columns("gsp_ATCNr").HeaderText = "CRN"
                 End Select
-                .Columns("gs_ATBNr").Width = 120
-                .Columns("gs_datum").Width = 140
-                .Columns("gs_warenwert").Width = 100
-                .Columns("gs_sicherheitsbetrag").Width = 100
-                .Columns("gs_freitext").Width = 220
+                .Columns("gsp_ATCNr").Width = 120
+                '.Columns("gs_datum").Width = 140
+                .Columns("gsp_warenwert").Width = 100
+                .Columns("gsp_sicherheitsbetrag").Width = 100
+                .Columns("gsp_freitext").Width = 220
             End With
 
         End If
 
+    End Sub
 
+    Sub loadTitle(indexGsId As Integer)
+        'Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsNr] = '" & gessicherheitID & "'"
+
+        lblGestellungNr.Text = ""
+
+        Dim StandortSqlString As String = "select * from [tblGesamtsicherheit] where [gs_gsId] = '" & indexGsId & "'"
+
+
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(StandortSqlString, "AVISO", 100, True)
+
+        If dt.Rows.Count > 0 Then
+            Me.LKWID = setNullToZero(dt.Rows(0).Item("gs_LKWID"))
+            Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr"))
+            Me.Abfertigungsnummer = setNullToZero(dt.Rows(0).Item("gs_abfertigungsNr"))
+            Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort"))
+
+            If Me.LKWID.ToString.Length > 0 Then lblGestellungNr.Text &= "LKW-ID: " & Me.LKWID & " "
+            If Me.FilialNummer.ToString.Length > 0 Then lblGestellungNr.Text &= "FilialNr: " & Me.FilialNummer & " "
+            If Me.Abfertigungsnummer.Length > 0 Then lblGestellungNr.Text &= "AbfNr: " & Me.Abfertigungsnummer & " "
+            If Me.warenortID.Length > 0 Then lblGestellungNr.Text &= "Warenort: " & Me.warenortID & " "
+        End If
     End Sub
 
 
     Public Sub LoadStandort()
 
-        lblReferenzwert.Text = "Referenzwert: €" & GesSichRef.gsr_referenzwert.ToString()
-        lblZollsatz.Text = "Zollsatz: " & GesSichRef.gsr_zollsatz & "%"
-        ZollsatzMulti = GesSichRef.gsr_zollsatz / 100
+        lblReferenzwert.Text = "Referenzwert: €" & currentGesSichRef.gsr_referenzwert.ToString()
+        lblZollsatz.Text = "Zollsatz: " & currentGesSichRef.gsr_zollsatz & "%"
+        ZollsatzMulti = currentGesSichRef.gsr_zollsatz / 100
     End Sub
 
-
-
-    'Private Sub CalcSaldo()
-    '    Dim SaldoString As String = "select SUM([MRN_Sicherheitsbetrag]) as sumone, SUM([CRN_Sicherheitsbetrag]) As sumtwo from [tblGesamtsicherheit]"
-    '    Dim dt As New DataTable
-    '    dt = SQL.loadDgvBySql(SaldoString, "AVISO", 100, True)
-    '    Dim mrn As Integer = dt.Rows(0).Item(0)
-    '    Dim crn As Integer = dt.Rows(0).Item(1)
-
-    '    Saldo = Referenzwert - mrn + crn
-
-    '    lblSaldo.Text = "Saldo: €" & Saldo.ToString("N")
-    'End Sub
-
-
-    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtCRNWarenwert.TextChanged
+    Private Sub Warenwert_TextChanged(sender As Object, e As EventArgs) Handles txtMRNWarenwert.TextChanged, txtPosWarenwert.TextChanged
         Try
             Select Case sender.name
                 Case "txtMRNWarenwert"
                     txtMRNSicherheitsbetrag.Text = (txtMRNWarenwert.Text * ZollsatzMulti).ToString("N")
-                    If GesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (GesSichRef.gsr_ust / 100)
+                    If currentGesSichRef.gsr_ustEnabled Then txtEust.Text = (Double.Parse(txtMRNWarenwert.Text) + Double.Parse(txtMRNSicherheitsbetrag.Text)) * (currentGesSichRef.gsr_ust / 100)
                 Case "txtCRNWarenwert"
-                    txtCRNSicherheitsbetrag.Text = (txtCRNWarenwert.Text * ZollsatzMulti).ToString("N")
+                    txtPosSicherheitsbetrag.Text = (txtPosWarenwert.Text * ZollsatzMulti).ToString("N")
             End Select
         Catch
         End Try
     End Sub
 
-    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtCRNWarenwert.KeyPress, txtPos.KeyPress
+    Private Sub Warenwert_Keypresses(sender As Object, e As System.Windows.Forms.KeyPressEventArgs) Handles txtMRNWarenwert.KeyPress, txtPosWarenwert.KeyPress, txtPos.KeyPress
         Select Case Asc(e.KeyChar)
             Case 48 To 57, 8, 44
                 ' Zahlen, Backspace und , zulassen
@@ -253,7 +289,7 @@ Public Class frmGesamtsicherheitenNEU
         End Select
     End Sub
 
-    Private Sub btnAddMRN_Click(sender As Object, e As EventArgs) Handles btnAddOpen.Click
+    Private Sub btnAddSicherheit_Click(sender As Object, e As EventArgs) Handles btnAddSicherheit.Click
         Try
 
 
@@ -272,50 +308,56 @@ Public Class frmGesamtsicherheitenNEU
                 .gs_gsNr = Me.gessicherheitID
                 .gs_erstellungsdatum = Me.datum
                 .gs_freitext = Me.txtFreitextOpen.Text
-                .gs_saldo = GesSichRef.gsr_Saldo
+                .gs_saldo = currentGesSichRef.gsr_Saldo
                 .gs_atr = setNullToZero(cboATR.SelectedItem)
                 setEnviromentDataToObject(OPEN, Me)
             End With
+            indexGsId = OPEN.SAVEOBJECT()
 
 
             For count As Integer = 1 To limit
-                    If (count > 1) Then txtMRNWarenwert.Text = 0
+                'If (count > 1) Then txtMRNWarenwert.Text = 0
 
-                Dim OPENPos As New cGesamtsicherheitsPositionen()
+                Dim OPENPos As New cGesamtsicherheitsPositionen(indexGsId, count)
 
                 With OPENPos
-                    .gsp_gsId = OPEN.gs_gsId
-                    .gsp_gspPosId = count
+                    '.gsp_gsId =
+                    '.gsp_gspPosId = count
                     .gsp_warenwert = 0
                     .gsp_sicherheitsbetrag = 0
                     .gsp_freitext = ""
                     .gsp_filialenNr = OPEN.gs_filialenNr
                     .gsp_art = "OPEN"
-                    .gsp_abfertigungsNr = ""
-                    .gsp_avisoId = ""
-                    .gsp_ust = OPEN.gs_ust
+                    .gsp_abfertigungsNr = OPEN.gs_filialenNr
+                    .gsp_avisoId = OPEN.gs_ATBNr
+                    .gsp_ust = ""
                     .gsp_ATCNr = ""
                     .gsp_MRNNr = ""
                 End With
+                OPENPos.SAVE()
 
 
-                If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr()
+                'If Neu = True AndAlso count <= 1 Then OPEN.gs_gsNr = AddNewGesamtSichNr()
 
-                Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
-                    Case "Neu"
-                        OPEN.SAVE()
-                    Case Else
-                        If (count > 1) Then
-                            OPEN.SAVE()
-                        Else
-                            MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE()
-                        End If
+                'Select Case checkIfExist(OPEN.gs_ATBNr, gessicherheitID)
+                '    Case "Neu"
+                '        OPEN.SAVE()
 
-                End Select
+                '    Case Else
+                '        If (count >= 1) Then
+                '            OPEN.SAVE()
+                '            OPENPos.SAVE()
+                '        Else
+                '            MsgBox("INFO: Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(OPEN.gs_ATBNr, gessicherheitID) & "eingetragen") : OPEN.SAVE()
+                '        End If
+
+                'End Select
 
             Next
 
-                AfterButton()
+
+
+            AfterButton()
 
 
         Catch ex As Exception
@@ -323,31 +365,42 @@ Public Class frmGesamtsicherheitenNEU
         End Try
     End Sub
 
-    Private Sub btnAddCRN_Click(sender As Object, e As EventArgs) Handles btnAddClose.Click
+    Private Sub btnAddPos_Click(sender As Object, e As EventArgs) Handles btnAddPos.Click
+
+        If dgvGesamtsicherheit.SelectedRows.Count = 0 Then
+
+            MsgBox("Bitte Sicherheit markieren, zu diese eine Pos hinzugefügt/entfernt/aktualisiert werden soll")
+            Exit Sub
+        End If
+
         Try
-            'Dim Close As New cSicherheiten(Me)
-            Dim Close As New cSicherheiten()
-            With Close
-                .gs_ATBNr = txtCRN.Text
-                .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
-                .gs_warenwert = Integer.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-                .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-                .gs_standort = Me.Standort
-                .gs_art = "CLOSE"
-                .gs_gsNr = Me.gessicherheitID
-                .gs_erstellungsdatum = Me.datum
-                .gs_freitext = Me.txtFreitextClose.Text
-                .gs_saldo = GesSichRef.gsr_Saldo
+
+            Dim SicherheitsPos As New cGesamtsicherheitsPositionen()
+            With SicherheitsPos
+                .gsp_gsId = currentSicherheit.gs_gsId
+                .gsp_gspPosId = Me.getLatestPosNr(currentSicherheit.gs_gsId) + 1
+                .gsp_warenwert = 0
+                .gsp_sicherheitsbetrag = 0
+                .gsp_freitext = ""
+                .gsp_filialenNr = currentSicherheit.gs_filialenNr
+                .gsp_art = "OPEN"
+                .gsp_abfertigungsNr = ""
+                .gsp_avisoId = ""
+                .gsp_ust = currentSicherheit.gs_ust
+                .gsp_ATCNr = ""
+                .gsp_MRNNr = ""
             End With
 
-            If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr()
+            SicherheitsPos.SAVE()
 
-            Select Case checkIfExist(Close.gs_ATBNr, gessicherheitID)
-                Case "Neu"
-                    Close.SAVE()
-                Case Else
-                    MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.gs_ATBNr, gessicherheitID) & "eingetragen") : Exit Sub
-            End Select
+            'If Neu = True Then Close.gs_gsNr = AddNewGesamtSichNr()
+
+            'Select Case checkIfExist(Close.gs_ATBNr, gessicherheitID)
+            '    Case "Neu"
+            '        Close.SAVE()
+            '    Case Else
+            '        MsgBox("Dieser Eintrag wurde bereits bei GesamtsichNr " & checkIfExist(Close.gs_ATBNr, gessicherheitID) & "eingetragen") : Exit Sub
+            'End Select
 
             AfterButton()
         Catch ex As Exception
@@ -366,8 +419,8 @@ Public Class frmGesamtsicherheitenNEU
         End If
     End Function
     Sub AfterButton()
-        GesSichRef.CalcSaldo()
-        LoadDGV()
+        currentGesSichRef.CalcSaldo()
+        LoadDGVSicherheiten()
         EmptyTXT()
     End Sub
 
@@ -434,7 +487,7 @@ Public Class frmGesamtsicherheitenNEU
         End Try
 
         Try
-            Me.warenortID = checkNothingValue(cboWarenort.SelectedItem, "String")
+            Me.warenortID = checkNothingValue(cbx_Suche_Warenort.SelectedItem, "String")
 
         Catch
             Me.warenortID = "-"
@@ -446,7 +499,7 @@ Public Class frmGesamtsicherheitenNEU
         If setNullToZero(Me.gessicherheitID) >= 0 Then
             Dim sqlstring = "Update [tblGesamtsicherheit] set [gs_filialenNr] = '" & Me.FilialNummer & "', [gs_abfertigungsNr] = '" & Me.Abfertigungsnummer & "', [gs_LKWID] = '" & Me.LKWID & "', [gs_warenort] = '" & Me.warenortID & "' WHERE [gs_gsNr] = '" & Me.gessicherheitID & "' "
             SQL.doSQL(sqlstring, "AVISO")
-            LoadDGV()
+            LoadDGVSicherheiten()
         End If
 
         panOben.Enabled = True : panOben.Enabled = True
@@ -472,9 +525,9 @@ Public Class frmGesamtsicherheitenNEU
 
     End Function
 
-    Private Sub dgvGesamtsicherheitMRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitMRN.CellDoubleClick
+    Private Sub dgvGesamtsicherheit_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheit.CellContentClick
 
-        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitMRN.CurrentRow.Cells("gs_gsId").Value)
+        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheit.CurrentRow.Cells("gs_gsId").Value)
 
         txtMRN.Text = Sicherh.gs_ATBNr
         txtPos.Text = Sicherh.gs_posNr
@@ -484,15 +537,15 @@ Public Class frmGesamtsicherheitenNEU
         txtMRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy")
         txtMRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm")
 
-        openopened = Sicherh
+        currentSicherheit = Sicherh
 
-        btnAddOpen.Visible = False
-        btnUpdateOpen.Visible = True
-        btnDeleteOpen.Visible = True
+        btnAddSicherheit.Visible = False
+        btnUpdateSicherheit.Visible = True
+        btnDeleteSicherheit.Visible = True
     End Sub
 
-    Private Sub btnUpdateOpen_Click(sender As Object, e As EventArgs) Handles btnUpdateOpen.Click
-        With openopened
+    Private Sub btnUpdateSicherheit_Click(sender As Object, e As EventArgs) Handles btnUpdateSicherheit.Click
+        With currentSicherheit
             .gs_ATBNr = txtMRN.Text
             .gs_posNr = Double.Parse(setNullToZero(txtPos.Text))
             .gs_datum = DateTimeString2DateTimeKonvertinator(txtMRNDate.Text, txtMRNTime.Text)
@@ -503,68 +556,69 @@ Public Class frmGesamtsicherheitenNEU
             .gs_gsNr = Me.gessicherheitID
             '.MakeDate = Me.MakeDate
             .gs_freitext = Me.txtFreitextOpen.Text
-            '.saldo = GesSichRef.Saldo
+            '.saldo = currentGesSichRef.Saldo
             .gs_atr = setNullToZero(cboATR.SelectedItem)
         End With
-        openopened.SAVE()
-        btnUpdateOpen.Visible = False
-        btnAddOpen.Visible = True
-        btnDeleteOpen.Visible = False
+        currentSicherheit.SAVE()
+        btnUpdateSicherheit.Visible = False
+        btnAddSicherheit.Visible = True
+        btnDeleteSicherheit.Visible = False
         AfterButton()
     End Sub
 
-    Private Sub btnDeleteClose_Click(sender As Object, e As EventArgs) Handles btnUpdateClose.Click
-        With closedopened
-            .gs_ATBNr = txtCRN.Text
-            .gs_datum = DateTimeString2DateTimeKonvertinator(txtCRNDate.Text, txtCRNTime.Text)
-            .gs_warenwert = Double.Parse(txtCRNWarenwert.Text) '.Replace(".", "").Replace(",", ".")
-            .gs_sicherheitsbetrag = Double.Parse(txtCRNSicherheitsbetrag.Text) '.Replace(".", "").Replace(",", ".")
-            .gs_standort = Me.Standort
-            .gs_art = "CLOSE"
-            .gs_freitext = Me.txtFreitextClose.Text
+    Private Sub btnUpdatePos_Click(sender As Object, e As EventArgs) Handles btnUpdatePos.Click
+        With currentSPos
+
+            .gsp_art = "CLOSE"
+            .gsp_gspPosId = txtPos.Text
+            .gsp_freitext = txtPosFreitext.Text
+            .gsp_sicherheitsbetrag = txtPosSicherheitsbetrag.Text
+            .gsp_warenwert = txtPosWarenwert.Text
+            .gsp_ATCNr = txtPositionenCRN.Text
+
         End With
-        closedopened.SAVE()
-        btnAddClose.Visible = True
-        btnUpdateClose.Visible = False
-        btnDeleteClose.Visible = False
+        currentSPos.SAVE()
+        btnAddPos.Visible = True
+        btnUpdatePos.Visible = False
+        btnDeletePos.Visible = False
         AfterButton()
     End Sub
 
-    Private Sub dgvGesamtsicherheitCRN_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvGesamtsicherheitPositionen.CellDoubleClick
+    Private Sub dgvGesamtsicherheitPositionen_CellContentClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvSicherheitsPos.CellContentClick
 
-        Dim Sicherh As New cSicherheiten(dgvGesamtsicherheitPositionen.CurrentRow.Cells("gs_gsId").Value)
+        Dim sPos As New cGesamtsicherheitsPositionen(indexGsId, dgvSicherheitsPos.CurrentRow.Cells("gsp_gspPosId").Value)
 
-        txtCRN.Text = Sicherh.gs_ATBNr
-        txtCRNWarenwert.Text = Sicherh.gs_warenwert
-        txtFreitextClose.Text = Sicherh.gs_freitext
-        txtCRNDate.Text = Sicherh.gs_erstellungsdatum.ToString("dd.MM.yyyy")
-        txtCRNTime.Text = Sicherh.gs_erstellungsdatum.ToString("HH:mm")
+        txtPos.Text = sPos.gsp_gspPosId
+        txtPosFreitext.Text = sPos.gsp_freitext
+        txtPosSicherheitsbetrag.Text = sPos.gsp_sicherheitsbetrag
+        txtPosWarenwert.Text = sPos.gsp_sicherheitsbetrag
+        txtPositionenCRN.Text = sPos.gsp_ATCNr
 
-        closedopened = Sicherh
+        currentSPos = sPos
 
-        btnDeleteClose.Visible = True
-        btnAddClose.Visible = False
-        btnUpdateClose.Visible = True
+        btnDeletePos.Visible = True
+        btnAddPos.Visible = False
+        btnUpdatePos.Visible = True
     End Sub
 
-    Private Sub btnDeleteOpen_Click(sender As Object, e As EventArgs) Handles btnDeleteOpen.Click
+    Private Sub btnDeleteSicherheit_Click(sender As Object, e As EventArgs) Handles btnDeleteSicherheit.Click
         Try
-            openopened.Delete()
-            btnUpdateOpen.Visible = False
-            btnAddOpen.Visible = True
-            btnDeleteOpen.Visible = False
+            currentSicherheit.Delete()
+            btnUpdateSicherheit.Visible = False
+            btnAddSicherheit.Visible = True
+            btnDeleteSicherheit.Visible = False
             AfterButton()
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try
     End Sub
 
-    Private Sub btnDeleteClose_Click_1(sender As Object, e As EventArgs) Handles btnDeleteClose.Click
+    Private Sub btnDeletePos_Click(sender As Object, e As EventArgs) Handles btnDeletePos.Click
         Try
-            closedopened.Delete()
-            btnUpdateClose.Visible = False
-            btnAddClose.Visible = True
-            btnDeleteClose.Visible = False
+            currentSPos.Delete()
+            btnUpdatePos.Visible = False
+            btnAddPos.Visible = True
+            btnDeletePos.Visible = False
             AfterButton()
         Catch ex As Exception
             MsgBox(ex.Message)
@@ -575,15 +629,15 @@ 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)
         cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer)
-        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.SelectedIndex = cboWarenort.FindString(Me.warenortID)
+        cbx_Suche_Warenort.fillWithSQL("SELECT [grz_Grenzstelle], [grz_Bezeichnung] FROM [tblGrenzstelle] WHERE [grz_Aktiv] ='1' AND [grz_Warenort] ='1' ORDER BY [grz_Reihenfolge] ", True, "AVISO", True)
+        cbx_Suche_Warenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID)
         txtAbfertNum.Text = Me.Abfertigungsnummer
         txtLKWID.Text = Me.LKWID
         panOben.Enabled = False
     End Sub
 
     Private Sub btnClosePanOverlay_Click(sender As Object, e As EventArgs) Handles btnClosePanOverlay.Click
-        Close()
+        panOverlay.Visible = False
     End Sub
 
     Private Function checkMandatoryFieldsAreFilled() As Boolean
@@ -607,9 +661,28 @@ Public Class frmGesamtsicherheitenNEU
         sicherheiten.gs_warenort = gessich.warenortID
     End Sub
 
-    Private Sub ClosedErzeugenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ClosedErzeugenToolStripMenuItem.Click
-        MsgBox("")
-    End Sub
+
+
+    Private Function getLatestPosNr(gs_gsId As Integer) As Integer
+        Dim posNr As Integer = 0
+        Dim sqlq As String = "select MAX([gsp_gspPosId]) as MaxPosNr from tblGesamtsicherheitsPositionen where gsp_gsId = " & gs_gsId
+        Dim dt As New DataTable
+        dt = SQL.loadDgvBySql(sqlq, "AVISO", 100, True)
+
+        If (dt.Rows(0).Item(0) IsNot DBNull.Value) Then
+
+            posNr = dt.Rows(0).Item(0)
+
+        End If
+
+        Return posNr
+
+    End Function
+
+
+    'Kalenderhandling
+
+
     Sub initBtns(MonatJahr)
         btnMonat.Text = MONAT.ToString("MMMM")
         btnJahr.Text = JAHR.Year
@@ -627,13 +700,13 @@ Public Class frmGesamtsicherheitenNEU
                 DateTimePicker1.Value = srcTAG
                 DateTimePicker2.Value = srcTAG
                 If srcTAG = Now.ToShortDateString Then
-                    Button5.Text = "Heute"
+                    btnTag.Text = "Heute"
                 ElseIf srcTAG = Now.AddDays(-1).ToShortDateString Then
-                    Button5.Text = "Gestern"
+                    btnTag.Text = "Gestern"
                 ElseIf srcTAG = Now.AddDays(-2).ToShortDateString Then
-                    Button5.Text = "Vorgestern"
+                    btnTag.Text = "Vorgestern"
                 Else
-                    Button5.Text = srcTAG.ToString("dd.MM")
+                    btnTag.Text = srcTAG.ToString("dd.MM")
                 End If
 
                 'End If
@@ -649,6 +722,20 @@ Public Class frmGesamtsicherheitenNEU
         initBtns("Jahr")
     End Sub
 
+    Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click
+        JAHR = JAHR.AddYears(1)
+        initBtns("Jahr")
+    End Sub
+
+    Private Sub btnVonJahr_Click(sender As Object, e As EventArgs) Handles btnVonJahr.Click
+        JAHR = JAHR.AddYears(-1)
+        initBtns("Jahr")
+    End Sub
+
+    Private Sub btnMonat_Click(sender As Object, e As EventArgs) Handles btnMonat.Click
+        initBtns("Monat")
+    End Sub
+
     Private Sub btnBisMonat_Click(sender As Object, e As EventArgs) Handles btnBisMonat.Click
         MONAT = MONAT.AddMonths(1)
         initBtns("Monat")
@@ -659,9 +746,19 @@ Public Class frmGesamtsicherheitenNEU
         initBtns("Monat")
     End Sub
 
-    Private Sub btnBisJahr_Click(sender As Object, e As EventArgs) Handles btnBisJahr.Click
-        JAHR = JAHR.AddYears(1)
-        initBtns("Jahr")
+
+    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles btnTag.Click
+        initBtns("Tag")
+    End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles btnVonTag.Click
+        srcTAG = srcTAG.AddDays(-1)
+        initBtns("Tag")
+    End Sub
+
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles btnBisTag.Click
+        srcTAG = srcTAG.AddDays(1)
+        initBtns("Tag")
     End Sub
 
     Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged
@@ -672,12 +769,40 @@ Public Class frmGesamtsicherheitenNEU
         txtDatBis._value = CDate(sender.value).ToShortDateString
     End Sub
 
-    Private Sub FlatButton2_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
-
-    End Sub
-
     Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click
-
+        Try
+            Date.Parse(txtDatVon.Text)
+            Date.Parse(txtDatBis.Text)
+            If Me.Visible Then LoadDGVSicherheiten()
+        Catch ex As Exception
+            MsgBox("Datum VON und/oder BIS konnte nicht konvertiert werden.")
+        End Try
     End Sub
+
+    Private Sub btnNeu_Click(sender As Object, e As EventArgs) Handles btnNeu.Click
+        panOverlay.Visible = True
+    End Sub
+
+    Private Sub btn_resetSearch_Click(sender As Object, e As EventArgs) Handles btn_resetSearch.Click
+
+        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("")
+        cbx_Suche_Filiale.changeItem("")
+        txt_Suche.Clear()
+    End Sub
+
+
 End Class