Gesamtsicherheiten - Excelexport.

2023-06-20 17:47:12 +02:00
parent 81dcbb209a
commit 4c6d9eb959
3 changed files with 79 additions and 45 deletions
--- a/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.Designer.vb
@@ -27,7 +27,8 @@ 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.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()
@@ -88,21 +89,28 @@ 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)
        '
        'ExportCSVToolStripMenuItem
        '
+        Me.ExportCSVToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListeToolStripMenuItem, 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"
+        '
+        'ReferenzlisteZollamtToolStripMenuItem
+        '
+        Me.ReferenzlisteZollamtToolStripMenuItem.Name = "ReferenzlisteZollamtToolStripMenuItem"
+        Me.ReferenzlisteZollamtToolStripMenuItem.Size = New System.Drawing.Size(186, 22)
+        Me.ReferenzlisteZollamtToolStripMenuItem.Text = "Referenzliste-Zollamt"
        '
        'SaldenNeuBerechnenToolStripMenuItem
        '
@@ -740,7 +748,8 @@ 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
 End Class
--- a/Aviso/frmGesamtsicherheitenMenuNEU.vb
+++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb
@@ -383,31 +383,34 @@ 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

+        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 String = DateTimePicker1.Value.AddDays(-1)
+
+        frm.LoadDataTableSicherheitenForExport(list, datumVon, txtDatBis.Text)
+
+        SDL.cProgramFunctions.genExcelFromDT_NEW(frm.dtSicherheiten)
+
    End Sub

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

    End Sub
+
+
 End Class
--- a/Aviso/frmGesamtsicherheitenNEU.vb
+++ b/Aviso/frmGesamtsicherheitenNEU.vb
@@ -187,6 +187,9 @@ Public Class frmGesamtsicherheitenNEU

        Me.Cursor = Cursors.WaitCursor

+        Dim Firma As New VERAG_PROG_ALLGEMEIN.cFirmen(firmaId)
+
+
        Dim gsnr As String
        Dim counter = 0
        For Each n In list
@@ -198,51 +201,68 @@ Public Class frmGesamtsicherheitenNEU

        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 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 " & Firma.Firma_Bez & "','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] 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 & ")
+
+											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]*-1, [gsp_freitext],[gsp_art],[gsp_ust]
+                                            From [tblGesamtsicherheitsPositionen] 
+
+                                            where [gsp_gsnr] In (" & gsnr & ")
+											order by Datum, Uhrzeit"
+


        dtSicherheiten = SQL.loadDgvBySql(SQLStringSicherheit, "AVISO", 100, True)


-        dtSicherheiten.Columns.Add("SSaldo")
+        dtSicherheiten.Columns.Add("Saldo")

        Dim drFirst = dtSicherheiten.NewRow
-        drFirst.Item("ATB Verwahrlager") = "Uebertrag vom " & datumVon
-        drFirst.Item("SSaldo") = CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+        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_datum='" & CDate(datumVon).ToShortDateString & "' order by gs_datum asc", "AVISO",,, 500000) 'CDbl(dtSicherheiten.Rows(0).Item("Saldo"))

        dtSicherheiten.Rows.InsertAt(drFirst, 0)


-        Dim sicherheitsbetragATBs As Double
-        Dim sicherheitsbetragATCs As Double
+        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("SSaldo"))
-            saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("SSaldo"))
-            sicherheitsbetragATCs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag"))
-            sicherheitsbetragATBs = CDbl(dtSicherheiten.Rows(i).Item("Sicherheitsbetrag2"))
+            saldoStart = CDbl(dtSicherheiten.Rows(0).Item("Saldo"))
+            saldo = CDbl(dtSicherheiten.Rows(i - 1).Item("Saldo"))

-            c1 = saldo - sicherheitsbetragATCs + sicherheitsbetragATBs
+            sicherheitsbetrag = IIf(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc") IsNot Nothing, CDbl(dtSicherheiten.Rows(i).Item("Sicherheitbetrag_Calc")), 0)

-            dtSicherheiten.Rows(i)("SSaldo") = c1
+            c1 = saldo + sicherheitsbetrag
+
+            dtSicherheiten.Rows(i)("Saldo") = c1
        Next

        Dim drLast = dtSicherheiten.NewRow
-        drLast.Item("ATB Verwahrlager") = "Saldo zum " & datumBis
-        drLast.Item("SSaldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("SSaldo"))
+
+        drLast.Item("Nr") = 0
+        drLast.Item("Typ") = "Saldo zum"
+        drLast.Item("Saldo") = CDbl(dtSicherheiten.Rows(dtSicherheiten.Rows.Count - 1).Item("Saldo"))

        dtSicherheiten.Rows.InsertAt(drLast, dtSicherheiten.Rows.Count)

-        dtSicherheiten.Columns.Remove("Saldo")
+
+        'dtSicherheiten.Columns.Remove("Sicherheitbetrag_Calc")

        Me.Cursor = Cursors.Default