neu

2020-10-02 10:37:26 +02:00
parent ce31c2c398
commit 75b12f314d
42 changed files with 1131 additions and 510 deletions
--- a/SDL/kunden/Berichte/rptKundeUebersicht.vb
+++ b/SDL/kunden/Berichte/rptKundeUebersicht.vb
@@ -3,15 +3,18 @@ Imports GrapeCity.ActiveReports.Document

 Public Class rptKundeUebersicht

-
+    Dim Firma_ID = "1"
+    Dim Firma = "1"
    Dim KdNr As Integer

-    Sub New(KdNr)
+    Sub New(KdNr, Optional Firma_ID = "1", Optional Firma = "VERAG")

        ' Dieser Aufruf ist f<>r den Designer erforderlich.
        InitializeComponent()

-        Me.KdNr = Kdnr
+        Me.KdNr = KdNr
+        Me.Firma_ID = Firma_ID
+        Me.Firma = Firma
        ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.

    End Sub
@@ -31,7 +34,7 @@ Public Class rptKundeUebersicht
        lblDat.Text = Now.ToString("dddd, dd.MM.yyyy")


-        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
+        Select Case Firma
            Case "IMEX" : Me.picVERAG.Image = My.Resources.IMEX_LOGO_simple : Me.Label28.Text = "IMEX Customs Service GmbH"
            Case "ATILLA" : Me.picVERAG.Image = My.Resources.Atilla : Me.Label28.Text = "ATILLA Spedition"
            Case Else
@@ -63,7 +66,7 @@ Public Class rptKundeUebersicht
        Dim s = New subRptOfferte(0, KdNr)
        subOffert.Report = s

-        Dim s2 = New subRptLeistungen(KdNr)
+        Dim s2 = New subRptLeistungen(KdNr, Firma_ID)
        subRptLeistungen.Report = s2

        Dim s3 = New subRptBonitaetsverlauf(KdNr)
--- a/SDL/kunden/Berichte/subRptLeistungen.vb
+++ b/SDL/kunden/Berichte/subRptLeistungen.vb
@@ -4,11 +4,14 @@ Imports GrapeCity.ActiveReports.Document
 Public Class subRptLeistungen
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
    Dim Kdnr As Integer
-    Sub New(Kdnr As Integer)
+    Dim [Firma_ID] = "1"
+
+    Sub New(Kdnr As Integer, Optional Firma_ID As String = "1")

        ' Dieser Aufruf ist f<>r den Designer erforderlich.
        InitializeComponent()
-         Me.Kdnr = Kdnr
+        Me.Kdnr = Kdnr
+        Me.Firma_ID = Firma_ID
        ' F<>gen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
    End Sub

@@ -41,7 +44,6 @@ Public Class subRptLeistungen
    Private Sub rptAuswertung_ReportStart(sender As System.Object, e As System.EventArgs) Handles MyBase.ReportStart
        If Kdnr <= 0 Then Exit Sub

-        Dim [Firma_ID] = "1"

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX" : [Firma_ID] = "20"
--- a/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.Designer.vb
@@ -118,11 +118,13 @@ Partial Class frmKundenUebersichtZOLL
        Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem()
        Me.mnueFiskal = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem5 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
        Me.toolOptionen = New System.Windows.Forms.ToolStripMenuItem()
        Me.BearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AnDakosyÜbertragenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.AufschubEORIBearbeitenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.cbx = New System.Windows.Forms.CheckBox()
        Me.lblAbfertigungsverbot = New System.Windows.Forms.Label()
@@ -139,8 +141,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.toolNeuerKunde = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.cboKundenblattFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox
        Me.ContextMenuStrip1.SuspendLayout()
        Me.tabZolltarife.SuspendLayout()
        Me.tabKundendaten.SuspendLayout()
@@ -276,6 +277,7 @@ Partial Class frmKundenUebersichtZOLL
        'tbStatistik
        '
        Me.tbStatistik.BackColor = System.Drawing.Color.White
+        Me.tbStatistik.Controls.Add(Me.cboKundenblattFirma)
        Me.tbStatistik.Controls.Add(Me.Button1)
        Me.tbStatistik.Controls.Add(Me.btnUbersicht)
        Me.tbStatistik.Controls.Add(Me.Label27)
@@ -1168,6 +1170,19 @@ Partial Class frmKundenUebersichtZOLL
        Me.ToolStripMenuItem5.TextAlign = System.Drawing.ContentAlignment.BottomCenter
        Me.ToolStripMenuItem5.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
        '
+        'toolNeuerKunde
+        '
+        Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
+        Me.toolNeuerKunde.Image = Global.SDL.My.Resources.Resources.plus
+        Me.toolNeuerKunde.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.toolNeuerKunde.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
+        Me.toolNeuerKunde.Name = "toolNeuerKunde"
+        Me.toolNeuerKunde.Size = New System.Drawing.Size(107, 47)
+        Me.toolNeuerKunde.Text = "Neuer Kunde"
+        Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
        'toolOptionen
        '
        Me.toolOptionen.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BearbeitenToolStripMenuItem, Me.AnDakosyÜbertragenToolStripMenuItem, Me.AufschubEORIBearbeitenToolStripMenuItem})
@@ -1201,6 +1216,20 @@ Partial Class frmKundenUebersichtZOLL
        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(107, 4)
        '
+        'ToolStripMenuItem11
+        '
+        Me.ToolStripMenuItem11.Enabled = False
+        Me.ToolStripMenuItem11.ForeColor = System.Drawing.Color.White
+        Me.ToolStripMenuItem11.Image = Global.SDL.My.Resources.Resources.stift1
+        Me.ToolStripMenuItem11.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+        Me.ToolStripMenuItem11.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
+        Me.ToolStripMenuItem11.Margin = New System.Windows.Forms.Padding(0, 60, 0, 0)
+        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
+        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(107, 44)
+        Me.ToolStripMenuItem11.Text = "Bearbeiten"
+        Me.ToolStripMenuItem11.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+        Me.ToolStripMenuItem11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        '
        'pnlTop
        '
        Me.pnlTop.Controls.Add(Me.cbx)
@@ -1289,6 +1318,7 @@ Partial Class frmKundenUebersichtZOLL
        Me.KdSearchBox1.searchActive = True
        Me.KdSearchBox1.Size = New System.Drawing.Size(504, 30)
        Me.KdSearchBox1.TabIndex = 211
+        Me.KdSearchBox1.TIMER_SEARCH = True
        Me.KdSearchBox1.usrcntl = Nothing
        '
        'rtbInfo
@@ -1360,32 +1390,13 @@ Partial Class frmKundenUebersichtZOLL
        Me.DataGridViewTextBoxColumn2.HeaderText = "KundenNr"
        Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2"
        '
-        'toolNeuerKunde
+        'cboKundenblattFirma
        '
-        Me.toolNeuerKunde.ForeColor = System.Drawing.Color.White
-        Me.toolNeuerKunde.Image = Global.SDL.My.Resources.Resources.plus
-        Me.toolNeuerKunde.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.toolNeuerKunde.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.toolNeuerKunde.Margin = New System.Windows.Forms.Padding(0, 20, 0, 0)
-        Me.toolNeuerKunde.Name = "toolNeuerKunde"
-        Me.toolNeuerKunde.Size = New System.Drawing.Size(107, 47)
-        Me.toolNeuerKunde.Text = "Neuer Kunde"
-        Me.toolNeuerKunde.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.toolNeuerKunde.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
-        '
-        'ToolStripMenuItem11
-        '
-        Me.ToolStripMenuItem11.Enabled = False
-        Me.ToolStripMenuItem11.ForeColor = System.Drawing.Color.White
-        Me.ToolStripMenuItem11.Image = Global.SDL.My.Resources.Resources.stift1
-        Me.ToolStripMenuItem11.ImageAlign = System.Drawing.ContentAlignment.TopCenter
-        Me.ToolStripMenuItem11.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None
-        Me.ToolStripMenuItem11.Margin = New System.Windows.Forms.Padding(0, 60, 0, 0)
-        Me.ToolStripMenuItem11.Name = "ToolStripMenuItem11"
-        Me.ToolStripMenuItem11.Size = New System.Drawing.Size(107, 44)
-        Me.ToolStripMenuItem11.Text = "Bearbeiten"
-        Me.ToolStripMenuItem11.TextAlign = System.Drawing.ContentAlignment.BottomCenter
-        Me.ToolStripMenuItem11.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+        Me.cboKundenblattFirma.FormattingEnabled = True
+        Me.cboKundenblattFirma.Location = New System.Drawing.Point(6, 331)
+        Me.cboKundenblattFirma.Name = "cboKundenblattFirma"
+        Me.cboKundenblattFirma.Size = New System.Drawing.Size(224, 21)
+        Me.cboKundenblattFirma.TabIndex = 171
        '
        'frmKundenUebersichtZOLL
        '
@@ -1546,4 +1557,5 @@ Partial Class frmKundenUebersichtZOLL
    Friend WithEvents cbx As CheckBox
    Friend WithEvents toolNeuerKunde As ToolStripMenuItem
    Friend WithEvents ToolStripMenuItem11 As ToolStripMenuItem
+    Friend WithEvents cboKundenblattFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
 End Class
--- a/SDL/kunden/frmKundenUebersichtZOLL.vb
+++ b/SDL/kunden/frmKundenUebersichtZOLL.vb
@@ -113,7 +113,14 @@ Public Class frmKundenUebersichtZOLL
        End Select

        'End If
-
+        cboKundenblattFirma.Items.Clear()
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (alle)", "1,11,15"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (AG)", "1"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG (CS)", "11"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "7"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG + ATILLA", "1,11,15,7"))
+        cboKundenblattFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "20"))
+        cboKundenblattFirma.SelectedIndex = 0

        KdSearchBox1.initKdBox(Me) ', lblKdNr)

@@ -1155,7 +1162,14 @@ Public Class frmKundenUebersichtZOLL
    End Sub

    Private Sub btnUbersicht_Click(sender As Object, e As EventArgs) Handles btnUbersicht.Click
-        Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr)
+        Dim Firma = "VERAG"
+        Select Case cboKundenblattFirma._value
+            Case "7" : Firma = "ATILLA"
+            Case "20" : Firma = "IMEX"
+        End Select
+
+
+        Dim rptKundeUebersicht As New SDL.rptKundeUebersicht(kdNr, cboKundenblattFirma._value, Firma)
        Dim rpt As New frmPrintLayout
        rpt.Text = ""