Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

2025-04-30 11:32:40 +02:00
parent 1eabf4364d 1e61349ea7
commit 9ebf29e1e5
4 changed files with 136 additions and 67 deletions
--- a/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
+++ b/SDL/Fakturierung/usrCntlFaktAbrechnung.vb
@@ -1735,54 +1735,57 @@ Public Class usrCntlFaktAbrechnung

            'Anhänge aus USTVA -> SPED-BUCH + Excel Pos-Liste
            If SPEDBUCH IsNot Nothing Then
-                If FIRMA.Firma_ID = 19 And SPEDBUCH.Abfertigungsart = 10 AndAlso SPEDBUCH.ErfassungsNr > 0 Then
+                If FIRMA IsNot Nothing Then
+                    If FIRMA.Firma_ID = 19 And SPEDBUCH.Abfertigungsart = 10 AndAlso SPEDBUCH.ErfassungsNr > 0 Then

-                    Dim func As New cMDMFunctionsAllgemein()
-                    Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' AND UStVPo_SchnittstellenNr <> 1 order by UStVPo_ID", "FMZOLL")
-                    Dim USTV As New cUSTVAntrag(SPEDBUCH.ErfassungsNr)
-                    If dt IsNot Nothing Then
-                        For Each r In dt.Rows
+                        Dim func As New cMDMFunctionsAllgemein()
+                        Dim dt = SQL.loadDgvBySql("SELECT UStVPo_daId, UStVPo_ID,UStVPo_SchnittstellenNr, UStVPo_ReNr, UStVPo_ReDat FROM tblUStVPositionen where UStVAn_ID='" & SPEDBUCH.ErfassungsNr & "' AND UStVPo_SchnittstellenNr <> 1 order by UStVPo_ID", "FMZOLL")
+                        Dim USTV As New cUSTVAntrag(SPEDBUCH.ErfassungsNr)
+                        If dt IsNot Nothing Then
+                            For Each r In dt.Rows

-                            Dim DAID As String = ""
-                            DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, USTV.UStVAn_LandKz, USTV, New cFakturierung, True)
+                                Dim DAID As String = ""
+                                DAID = func.getPDF(r("UStVPo_SchnittstellenNr"), r("UStVPo_ReNr"), r("UStVPo_ReDat"), r("UStVPo_daId"), False, True, USTV.UStVAn_LandKz, USTV, New cFakturierung, True)

-                            Dim nameLief As String = ""
+                                Dim nameLief As String = ""

-                            Select Case r("UStVPo_SchnittstellenNr")
-                                Case 1 : nameLief = "VERAG-" 'Verag360
-                                Case 2, 8, 12 : nameLief = "IDS-"
-                                Case 3 : nameLief = "IT-"
-                                Case 4, 9 : nameLief = "MSE-"
-                                Case 5, 10 : nameLief = "UTA-"
-                                Case 6, 11 : nameLief = "PLOSE-"
-                                Case 7 : nameLief = "RMC-"
-                            End Select
+                                Select Case r("UStVPo_SchnittstellenNr")
+                                    Case 1 : nameLief = "VERAG-" 'Verag360
+                                    Case 2, 8, 12 : nameLief = "IDS-"
+                                    Case 3 : nameLief = "IT-"
+                                    Case 4, 9 : nameLief = "MSE-"
+                                    Case 5, 10 : nameLief = "UTA-"
+                                    Case 6, 11 : nameLief = "PLOSE-"
+                                    Case 7 : nameLief = "RMC-"
+                                End Select

-                            nameLief &= "RE"
+                                nameLief &= "RE"

-                            If DAID <> "" AndAlso IsNumeric(DAID) Then
-                                Dim daidno As Integer = CInt(DAID)
-                                Dim ds As New cDATENSERVER(daidno)
-                                .Rows.Add(0, nameLief, ds.da_name, ds.da_id, ds.da_id)
-                            End If
+                                If DAID <> "" AndAlso IsNumeric(DAID) Then
+                                    Dim daidno As Integer = CInt(DAID)
+                                    Dim ds As New cDATENSERVER(daidno)
+                                    .Rows.Add(0, nameLief, ds.da_name, ds.da_id, ds.da_id)
+                                End If

-                        Next
+                            Next
+                        End If
+
+
+                        Dim pfadExcel As String = func.generateExcelPosList(USTV, "", "", "", False) 'soll immer alle POS bekommen! laut Lidya! 28.04.2025
+                        If pfadExcel <> "" Then
+
+                            Dim FI As New FileInfo(pfadExcel)
+                            Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", FI.Name, USTV.UStVAn_KuNr, False)
+                            DS.uploadDataToDATENSERVER(pfadExcel, FI.Name, FI.Extension,,,, True)
+                            .Rows.Add(0, "POS-LIST", DS.da_name, DS.da_id, DS.da_id)
+                        End If
                    End If

-
-                    Dim pfadExcel As String = func.generateExcelPosList(USTV, "", "", "", False) 'soll immer alle POS bekommen! laut Lidya! 28.04.2025
-                    If pfadExcel <> "" Then
-
-                        Dim FI As New FileInfo(pfadExcel)
-                        Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "MDM", "POS_LISTE", "", "", FI.Name, USTV.UStVAn_KuNr, False)
-                        DS.uploadDataToDATENSERVER(pfadExcel, FI.Name, FI.Extension,,,, True)
-                        .Rows.Add(0, "POS-LIST", DS.da_name, DS.da_id, DS.da_id)
-                    End If
                End If
-
            End If


+
        End With
        dgvAnhaenge.ClearSelection()
    End Sub
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Windows.Documents
-Imports itextsharp.text.pdf
+Imports iTextSharp.text.pdf
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN

--- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
@@ -140,8 +140,8 @@ Partial Class frmKundenUebersichtZOLL
        Me.HochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ScannenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
-        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.lblAvgTnr = New System.Windows.Forms.Label()
        Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.dgvRg = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
@@ -151,10 +151,13 @@ Partial Class frmKundenUebersichtZOLL
        Me.Button10 = New System.Windows.Forms.Button()
        Me.Button11 = New System.Windows.Forms.Button()
        Me.Label40 = New System.Windows.Forms.Label()
-        Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht()
        Me.KdSearchBox1 = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.lbAvgTnrGesPos = New System.Windows.Forms.Label()
+        Me.usrcntlKundenuebersicht = New SDL.usrCntlKundenuebersicht()
+        Me.UsrCntlOfferte1 = New SDL.usrCntlOfferte()
+        Me.UsrcntlFiskaluebersicht1 = New SDL.usrcntlFiskaluebersicht()
        Me.ContextMenuStrip1.SuspendLayout()
        Me.tabZolltarife.SuspendLayout()
        Me.tabKundendaten.SuspendLayout()
@@ -401,6 +404,9 @@ Partial Class frmKundenUebersichtZOLL
        '
        'grpFilter
        '
+        Me.grpFilter.Controls.Add(Me.lbAvgTnrGesPos)
+        Me.grpFilter.Controls.Add(Me.lblAvgTnr)
+        Me.grpFilter.Controls.Add(Me.Button4)
        Me.grpFilter.Controls.Add(Me.Label24)
        Me.grpFilter.Controls.Add(Me.MyListBox1)
        Me.grpFilter.Controls.Add(Me.Label25)
@@ -439,7 +445,7 @@ Partial Class frmKundenUebersichtZOLL
        'Button2
        '
        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(9, 299)
+        Me.Button2.Location = New System.Drawing.Point(9, 225)
        Me.Button2.Margin = New System.Windows.Forms.Padding(0)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(239, 26)
@@ -1345,26 +1351,26 @@ Partial Class frmKundenUebersichtZOLL
        Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(147, 30)
        Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen"
        '
-        'usrcntlKundenuebersicht
+        'Button4
        '
-        Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
-        Me.usrcntlKundenuebersicht.BER_STUFE = 0
-        Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
-        Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
-        Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
-        Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
-        Me.usrcntlKundenuebersicht.TabIndex = 0
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Location = New System.Drawing.Point(9, 277)
+        Me.Button4.Margin = New System.Windows.Forms.Padding(0)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(239, 25)
+        Me.Button4.TabIndex = 166
+        Me.Button4.Text = "Durchschnitt Positionsanzahl"
+        Me.Button4.UseVisualStyleBackColor = True
        '
-        'UsrCntlOfferte1
+        'lblAvgTnr
        '
-        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
-        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
-        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
-        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
-        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
-        Me.UsrCntlOfferte1.TabIndex = 0
+        Me.lblAvgTnr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAvgTnr.Location = New System.Drawing.Point(9, 312)
+        Me.lblAvgTnr.Name = "lblAvgTnr"
+        Me.lblAvgTnr.Size = New System.Drawing.Size(239, 12)
+        Me.lblAvgTnr.TabIndex = 172
+        Me.lblAvgTnr.Text = "0"
+        Me.lblAvgTnr.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
        'cboKundenblattFirma
        '
@@ -1384,7 +1390,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.MyListBox1.Location = New System.Drawing.Point(9, 88)
        Me.MyListBox1.Name = "MyListBox1"
        Me.MyListBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple
-        Me.MyListBox1.Size = New System.Drawing.Size(239, 199)
+        Me.MyListBox1.Size = New System.Drawing.Size(239, 134)
        Me.MyListBox1.TabIndex = 165
        '
        'dgvRg
@@ -1487,15 +1493,6 @@ Partial Class frmKundenUebersichtZOLL
        Me.Label40.TabIndex = 39
        Me.Label40.Text = "Rechnungen"
        '
-        'UsrcntlFiskaluebersicht1
-        '
-        Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White
-        Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0)
-        Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1"
-        Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697)
-        Me.UsrcntlFiskaluebersicht1.TabIndex = 0
-        '
        'KdSearchBox1
        '
        Me.KdSearchBox1._AlleFirmenCLUSTER = False
@@ -1540,6 +1537,46 @@ Partial Class frmKundenUebersichtZOLL
        Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
+        'lbAvgTnrGesPos
+        '
+        Me.lbAvgTnrGesPos.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
+        Me.lbAvgTnrGesPos.Location = New System.Drawing.Point(9, 325)
+        Me.lbAvgTnrGesPos.Name = "lbAvgTnrGesPos"
+        Me.lbAvgTnrGesPos.Size = New System.Drawing.Size(239, 12)
+        Me.lbAvgTnrGesPos.TabIndex = 173
+        Me.lbAvgTnrGesPos.Text = "-"
+        Me.lbAvgTnrGesPos.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'usrcntlKundenuebersicht
+        '
+        Me.usrcntlKundenuebersicht.BackColor = System.Drawing.Color.White
+        Me.usrcntlKundenuebersicht.BER_STUFE = 0
+        Me.usrcntlKundenuebersicht.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.usrcntlKundenuebersicht.Location = New System.Drawing.Point(3, 3)
+        Me.usrcntlKundenuebersicht.Margin = New System.Windows.Forms.Padding(2)
+        Me.usrcntlKundenuebersicht.Name = "usrcntlKundenuebersicht"
+        Me.usrcntlKundenuebersicht.Size = New System.Drawing.Size(1176, 691)
+        Me.usrcntlKundenuebersicht.TabIndex = 0
+        '
+        'UsrCntlOfferte1
+        '
+        Me.UsrCntlOfferte1.BackColor = System.Drawing.Color.White
+        Me.UsrCntlOfferte1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrCntlOfferte1.Location = New System.Drawing.Point(3, 3)
+        Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(2)
+        Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
+        Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1176, 691)
+        Me.UsrCntlOfferte1.TabIndex = 0
+        '
+        'UsrcntlFiskaluebersicht1
+        '
+        Me.UsrcntlFiskaluebersicht1.BackColor = System.Drawing.Color.White
+        Me.UsrcntlFiskaluebersicht1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.UsrcntlFiskaluebersicht1.Location = New System.Drawing.Point(0, 0)
+        Me.UsrcntlFiskaluebersicht1.Name = "UsrcntlFiskaluebersicht1"
+        Me.UsrcntlFiskaluebersicht1.Size = New System.Drawing.Size(1182, 697)
+        Me.UsrcntlFiskaluebersicht1.TabIndex = 0
+        '
        'frmKundenUebersichtZOLL
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1714,4 +1751,7 @@ Partial Class frmKundenUebersichtZOLL
    Friend WithEvents TOBBKdNrÄndernToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents VollmachtFinanzamtToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents btnlblLinkedFirmenGruppe As Label
+    Friend WithEvents lblAvgTnr As Label
+    Friend WithEvents Button4 As Button
+    Friend WithEvents lbAvgTnrGesPos As Label
 End Class
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -321,6 +321,9 @@ Public Class frmKundenUebersichtZOLL
        mnueFiskal.Enabled = True
        mnueCBAM.Enabled = True

+        lblAvgTnr.Text = "0"
+        lbAvgTnrGesPos.Text = "-"
+
        btnlblLinkedFirmenGruppe.Enabled = True

        If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then
@@ -1492,6 +1495,29 @@ Public Class frmKundenUebersichtZOLL
        End If

    End Sub
+
+    Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click
+        lblAvgTnr.Text = "0"
+        lbAvgTnrGesPos.Text = "-"
+
+        Dim sqlstr = "SELECT avg(cast(REPLACE(Vermerk,'Pos-Anzahl: ','')as decimal(10,2))) avg,count(*)cnt  FROM [Speditionsbuch]  where
+                  (VermittlerKundenNr='" & kdNr & "' OR EmpfängerKundenNr='" & kdNr & "') 
+                     and Vermerk is not null  and vermerk LIKE 'Pos-Anzahl: %'  and ISNUMERIC(REPLACE(Vermerk,'Pos-Anzahl: ','')) =1
+                     and Abfertigungsdatum between '" & datVon.Value & "' and '" & datBis.Value & "'  "
+
+        If getValues() <> "" Then
+            sqlstr &= "  and Abfertigungsart IN (" & getValues() & ") "
+        End If
+
+        Dim dt = SQL.loadDgvBySql(sqlstr, "FMZOLL")
+        If dt IsNot Nothing Then
+            If dt(0)("avg") IsNot DBNull.Value Then
+                lblAvgTnr.Text = "Durchschn.Pos: " & CDbl(dt(0)("avg")).ToString("N2")
+                lbAvgTnrGesPos.Text = "(bei " & dt(0)("cnt") & " Abfertigungen)"
+            End If
+        End If
+
+    End Sub
 End Class