neu

2021-02-02 21:16:08 +01:00
parent 2f7746d9ca
commit d22ee3d24c
13 changed files with 336 additions and 58 deletions
--- a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb
+++ b/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb
@@ -25,6 +25,8 @@ Partial Class usrctlStatVERIMEX
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.Panel4 = New System.Windows.Forms.Panel()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.dgvAbklaerungTR = New System.Windows.Forms.DataGridView()
        Me.Label10 = New System.Windows.Forms.Label()
@@ -32,6 +34,7 @@ Partial Class usrctlStatVERIMEX
        Me.Button1 = New System.Windows.Forms.Button()
        Me.datStatBis = New System.Windows.Forms.DateTimePicker()
        Me.datStatVon = New System.Windows.Forms.DateTimePicker()
+        Me.Button3 = New System.Windows.Forms.Button()
        Me.Panel3.SuspendLayout()
        Me.Panel4.SuspendLayout()
        CType(Me.dgvAbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -41,106 +44,153 @@ Partial Class usrctlStatVERIMEX
        '
        Me.Panel3.Controls.Add(Me.Label9)
        Me.Panel3.Controls.Add(Me.Panel4)
-        Me.Panel3.Location = New System.Drawing.Point(15, 17)
+        Me.Panel3.Controls.Add(Me.Button2)
+        Me.Panel3.Controls.Add(Me.Button1)
+        Me.Panel3.Location = New System.Drawing.Point(22, 26)
+        Me.Panel3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(701, 398)
-        Me.Panel3.TabIndex = 15
+        Me.Panel3.Size = New System.Drawing.Size(1052, 651)
+        Me.Panel3.TabIndex = 0
        '
        'Label9
        '
        Me.Label9.AutoSize = True
        Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label9.Location = New System.Drawing.Point(3, 8)
+        Me.Label9.Location = New System.Drawing.Point(4, 12)
+        Me.Label9.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.Label9.Name = "Label9"
-        Me.Label9.Size = New System.Drawing.Size(139, 13)
-        Me.Label9.TabIndex = 18
+        Me.Label9.Size = New System.Drawing.Size(204, 20)
+        Me.Label9.TabIndex = 0
        Me.Label9.Text = "Sendungserfassung TR"
        '
        'Panel4
        '
        Me.Panel4.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.Panel4.Controls.Add(Me.Button2)
+        Me.Panel4.Controls.Add(Me.Button3)
+        Me.Panel4.Controls.Add(Me.Label1)
+        Me.Panel4.Controls.Add(Me.cboFirma)
        Me.Panel4.Controls.Add(Me.dgvAbklaerungTR)
        Me.Panel4.Controls.Add(Me.Label10)
        Me.Panel4.Controls.Add(Me.Label6)
-        Me.Panel4.Controls.Add(Me.Button1)
        Me.Panel4.Controls.Add(Me.datStatBis)
        Me.Panel4.Controls.Add(Me.datStatVon)
-        Me.Panel4.Location = New System.Drawing.Point(3, 24)
+        Me.Panel4.Location = New System.Drawing.Point(4, 37)
+        Me.Panel4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Panel4.Name = "Panel4"
-        Me.Panel4.Size = New System.Drawing.Size(670, 359)
-        Me.Panel4.TabIndex = 15
+        Me.Panel4.Size = New System.Drawing.Size(1005, 552)
+        Me.Panel4.TabIndex = 1
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(519, 20)
+        Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(53, 20)
+        Me.Label1.TabIndex = 0
+        Me.Label1.Text = "Firma:"
+        '
+        'cboFirma
+        '
+        Me.cboFirma._allowedValuesFreiText = Nothing
+        Me.cboFirma._allowFreiText = False
+        Me.cboFirma._value = ""
+        Me.cboFirma.FormattingEnabled = True
+        Me.cboFirma.Location = New System.Drawing.Point(579, 17)
+        Me.cboFirma.Name = "cboFirma"
+        Me.cboFirma.Size = New System.Drawing.Size(164, 28)
+        Me.cboFirma.TabIndex = 5
        '
        'Button2
        '
        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Location = New System.Drawing.Point(592, 11)
+        Me.Button2.Location = New System.Drawing.Point(897, 599)
+        Me.Button2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(75, 23)
-        Me.Button2.TabIndex = 20
+        Me.Button2.Size = New System.Drawing.Size(112, 35)
+        Me.Button2.TabIndex = 3
        Me.Button2.Text = "Bericht"
        Me.Button2.UseVisualStyleBackColor = True
        '
        'dgvAbklaerungTR
        '
        Me.dgvAbklaerungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvAbklaerungTR.Location = New System.Drawing.Point(6, 38)
+        Me.dgvAbklaerungTR.Location = New System.Drawing.Point(9, 58)
+        Me.dgvAbklaerungTR.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.dgvAbklaerungTR.Name = "dgvAbklaerungTR"
-        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(661, 318)
-        Me.dgvAbklaerungTR.TabIndex = 19
+        Me.dgvAbklaerungTR.RowHeadersWidth = 62
+        Me.dgvAbklaerungTR.Size = New System.Drawing.Size(992, 489)
+        Me.dgvAbklaerungTR.TabIndex = 7
        '
        'Label10
        '
        Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(181, 17)
+        Me.Label10.Location = New System.Drawing.Point(269, 23)
+        Me.Label10.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.Label10.Name = "Label10"
-        Me.Label10.Size = New System.Drawing.Size(10, 13)
-        Me.Label10.TabIndex = 18
+        Me.Label10.Size = New System.Drawing.Size(14, 20)
+        Me.Label10.TabIndex = 3
        Me.Label10.Text = "-"
        '
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(3, 18)
+        Me.Label6.Location = New System.Drawing.Point(4, 23)
+        Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(51, 13)
-        Me.Label6.TabIndex = 6
+        Me.Label6.Size = New System.Drawing.Size(76, 20)
+        Me.Label6.TabIndex = 1
        Me.Label6.Text = "Zeitraum:"
        '
        'Button1
        '
        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button1.Location = New System.Drawing.Point(511, 11)
+        Me.Button1.Location = New System.Drawing.Point(775, 599)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 11
+        Me.Button1.Size = New System.Drawing.Size(112, 35)
+        Me.Button1.TabIndex = 2
        Me.Button1.Text = "Excel"
        Me.Button1.UseVisualStyleBackColor = True
        '
        'datStatBis
        '
        Me.datStatBis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datStatBis.Location = New System.Drawing.Point(197, 11)
+        Me.datStatBis.Location = New System.Drawing.Point(291, 18)
+        Me.datStatBis.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.datStatBis.Name = "datStatBis"
-        Me.datStatBis.Size = New System.Drawing.Size(105, 20)
-        Me.datStatBis.TabIndex = 7
+        Me.datStatBis.Size = New System.Drawing.Size(156, 26)
+        Me.datStatBis.TabIndex = 4
        '
        'datStatVon
        '
        Me.datStatVon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
-        Me.datStatVon.Location = New System.Drawing.Point(70, 12)
+        Me.datStatVon.Location = New System.Drawing.Point(105, 18)
+        Me.datStatVon.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.datStatVon.Name = "datStatVon"
-        Me.datStatVon.Size = New System.Drawing.Size(105, 20)
-        Me.datStatVon.TabIndex = 8
+        Me.datStatVon.Size = New System.Drawing.Size(156, 26)
+        Me.datStatVon.TabIndex = 2
+        '
+        'Button3
+        '
+        Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button3.Location = New System.Drawing.Point(798, 13)
+        Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
+        Me.Button3.Name = "Button3"
+        Me.Button3.Size = New System.Drawing.Size(203, 35)
+        Me.Button3.TabIndex = 6
+        Me.Button3.Text = "Auswerten"
+        Me.Button3.UseVisualStyleBackColor = True
        '
        'usrctlStatVERIMEX
        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.Controls.Add(Me.Panel3)
+        Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.Name = "usrctlStatVERIMEX"
-        Me.Size = New System.Drawing.Size(844, 510)
+        Me.Size = New System.Drawing.Size(1266, 785)
        Me.Panel3.ResumeLayout(False)
        Me.Panel3.PerformLayout()
        Me.Panel4.ResumeLayout(False)
@@ -160,4 +210,7 @@ Partial Class usrctlStatVERIMEX
    Friend WithEvents datStatBis As DateTimePicker
    Friend WithEvents datStatVon As DateTimePicker
    Friend WithEvents Button2 As Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button3 As Button
 End Class
--- a/Aviso/Auswertung/usrctlStatVERIMEX.vb
+++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb
@@ -7,10 +7,22 @@ Public Class usrctlStatVERIMEX
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

    Sub init()
+        Dim whereFiliale = ""
+        Dim innerJoinFiliale = ""
+        Select Case cboFirma._value
+            Case ""
+            Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
+            Case Else
+                whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' "
+                innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
+        End Select
+
        With dgvAbklaerungTR
            Dim sqlstr = "SELECT  mit_vname + ' ' + mit_nname as Mitarbeiter ,count(*) as Sendungen ,count(distinct(avisoid)) as LKW
-                  FROM [tblSendungen] inner join aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
+                  FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbklaerungTR_MA
+                  " & innerJoinFiliale & "
                  where cast(Datum as date) BETWEEN '" & datStatVon.Value & "' and '" & datStatBis.Value & "'  and tblSnd_AbklaerungTR_MA is not null
+                  " & whereFiliale & "
                  group by mit_vname,mit_nname"

            dgvAbklaerungTR.DataSource = SQL.loadDgvBySql(sqlstr, "AVISO")
@@ -23,9 +35,9 @@ Public Class usrctlStatVERIMEX



-    Private Sub datStatVon_ValueChanged(sender As Object, e As EventArgs) Handles datStatVon.ValueChanged, datStatBis.ValueChanged
-        init()
-    End Sub
+    'Private Sub datStatVon_ValueChanged(sender As Object, e As EventArgs) Handles datStatVon.ValueChanged, datStatBis.ValueChanged
+
+    'End Sub

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
        Me.Cursor = Cursors.WaitCursor
@@ -88,4 +100,26 @@ Public Class usrctlStatVERIMEX
            print.Viewer.ViewType = GrapeCity.Viewer.Common.Model.ViewType.Continuous
        print.Show()
    End Sub
+
+    Private Sub usrctlStatVERIMEX_Load(sender As Object, e As EventArgs) Handles Me.Load
+        cboFirma.Items.Clear()
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", ""))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*Nicht zugeordnet", "0"))
+        cboFirma.changeItem("")
+        '     cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", ""))
+    End Sub
+
+    Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
+        init()
+    End Sub
+
+    Private Sub datStatVon_KeyDown(sender As Object, e As KeyEventArgs) Handles datStatVon.KeyDown, datStatBis.KeyDown, cboFirma.KeyDown
+        If e.KeyCode = Keys.Return Then
+            init()
+        End If
+    End Sub
 End Class