neu

2020-05-31 22:25:35 +02:00
parent 4a358d43fd
commit 083e666fbc
214 changed files with 14292 additions and 4117 deletions
--- a/SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb
+++ b/SDL/Administration/Auswertungen/frmZollUserStat.Designer.vb
@@ -38,13 +38,14 @@ Partial Class frmZollUserStat
        Me.MyListBox1 = New VERAG_PROG_ALLGEMEIN.MyListBox()
        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button8 = New System.Windows.Forms.Button()
+        Me.cbxNachAbfertigungsartSplitten = New System.Windows.Forms.CheckBox()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.cbxNachAbfertigungsartSplitten = New System.Windows.Forms.CheckBox()
-        Me.Button8 = New System.Windows.Forms.Button()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Button9 = New System.Windows.Forms.Button()
        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        Me.Panel2.SuspendLayout()
@@ -71,13 +72,16 @@ Partial Class frmZollUserStat
        '
        'MyTextBox1
        '
+        Me.MyTextBox1._DateTimeOnly = False
        Me.MyTextBox1._numbersOnly = False
+        Me.MyTextBox1._numbersOnlyKommastellen = ""
        Me.MyTextBox1._Prozent = False
        Me.MyTextBox1._ShortDateNew = False
        Me.MyTextBox1._ShortDateOnly = True
        Me.MyTextBox1._TimeOnly = False
        Me.MyTextBox1._value = ""
        Me.MyTextBox1._Waehrung = False
+        Me.MyTextBox1._WaehrungZeichen = True
        Me.MyTextBox1.ForeColor = System.Drawing.Color.Black
        Me.MyTextBox1.Location = New System.Drawing.Point(43, 47)
        Me.MyTextBox1.MaxLength = 10
@@ -99,13 +103,16 @@ Partial Class frmZollUserStat
        '
        'MyTextBox3
        '
+        Me.MyTextBox3._DateTimeOnly = False
        Me.MyTextBox3._numbersOnly = False
+        Me.MyTextBox3._numbersOnlyKommastellen = ""
        Me.MyTextBox3._Prozent = False
        Me.MyTextBox3._ShortDateNew = False
        Me.MyTextBox3._ShortDateOnly = True
        Me.MyTextBox3._TimeOnly = False
        Me.MyTextBox3._value = ""
        Me.MyTextBox3._Waehrung = False
+        Me.MyTextBox3._WaehrungZeichen = True
        Me.MyTextBox3.ForeColor = System.Drawing.Color.Black
        Me.MyTextBox3.Location = New System.Drawing.Point(156, 47)
        Me.MyTextBox3.MaxLength = 10
@@ -214,6 +221,7 @@ Partial Class frmZollUserStat
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.Button9)
        Me.Panel1.Controls.Add(Me.Label4)
        Me.Panel1.Controls.Add(Me.MyComboBox1)
        Me.Panel1.Controls.Add(Me.Button8)
@@ -236,6 +244,50 @@ Partial Class frmZollUserStat
        Me.Panel1.Size = New System.Drawing.Size(841, 186)
        Me.Panel1.TabIndex = 10
        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Location = New System.Drawing.Point(12, 91)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(32, 13)
+        Me.Label4.TabIndex = 11
+        Me.Label4.Text = "Firma"
+        '
+        'MyComboBox1
+        '
+        Me.MyComboBox1._allowedValuesFreiText = Nothing
+        Me.MyComboBox1._allowFreiText = False
+        Me.MyComboBox1._value = ""
+        Me.MyComboBox1.FormattingEnabled = True
+        Me.MyComboBox1.Location = New System.Drawing.Point(15, 108)
+        Me.MyComboBox1.Name = "MyComboBox1"
+        Me.MyComboBox1.Size = New System.Drawing.Size(217, 21)
+        Me.MyComboBox1.TabIndex = 12
+        '
+        'Button8
+        '
+        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
+        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button8.Image = Global.SDL.My.Resources.Resources.Excel_logo
+        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button8.Location = New System.Drawing.Point(755, 132)
+        Me.Button8.Name = "Button8"
+        Me.Button8.Size = New System.Drawing.Size(80, 40)
+        Me.Button8.TabIndex = 10
+        Me.Button8.Text = "Excel"
+        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button8.UseVisualStyleBackColor = True
+        '
+        'cbxNachAbfertigungsartSplitten
+        '
+        Me.cbxNachAbfertigungsartSplitten.AutoSize = True
+        Me.cbxNachAbfertigungsartSplitten.Location = New System.Drawing.Point(247, 110)
+        Me.cbxNachAbfertigungsartSplitten.Name = "cbxNachAbfertigungsartSplitten"
+        Me.cbxNachAbfertigungsartSplitten.Size = New System.Drawing.Size(160, 17)
+        Me.cbxNachAbfertigungsartSplitten.TabIndex = 9
+        Me.cbxNachAbfertigungsartSplitten.Text = "nach Abfertigungsart splitten"
+        Me.cbxNachAbfertigungsartSplitten.UseVisualStyleBackColor = True
+        '
        'Label5
        '
        Me.Label5.AutoSize = True
@@ -267,49 +319,15 @@ Partial Class frmZollUserStat
        Me.Panel2.Size = New System.Drawing.Size(234, 716)
        Me.Panel2.TabIndex = 11
        '
-        'cbxNachAbfertigungsartSplitten
+        'Button9
        '
-        Me.cbxNachAbfertigungsartSplitten.AutoSize = True
-        Me.cbxNachAbfertigungsartSplitten.Location = New System.Drawing.Point(247, 110)
-        Me.cbxNachAbfertigungsartSplitten.Name = "cbxNachAbfertigungsartSplitten"
-        Me.cbxNachAbfertigungsartSplitten.Size = New System.Drawing.Size(160, 17)
-        Me.cbxNachAbfertigungsartSplitten.TabIndex = 9
-        Me.cbxNachAbfertigungsartSplitten.Text = "nach Abfertigungsart splitten"
-        Me.cbxNachAbfertigungsartSplitten.UseVisualStyleBackColor = True
-        '
-        'Button8
-        '
-        Me.Button8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
-        Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button8.Image = Global.SDL.My.Resources.Excel_logo
-        Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button8.Location = New System.Drawing.Point(755, 132)
-        Me.Button8.Name = "Button8"
-        Me.Button8.Size = New System.Drawing.Size(80, 40)
-        Me.Button8.TabIndex = 10
-        Me.Button8.Text = "Excel"
-        Me.Button8.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button8.UseVisualStyleBackColor = True
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(12, 91)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(32, 13)
-        Me.Label4.TabIndex = 11
-        Me.Label4.Text = "Firma"
-        '
-        'MyComboBox1
-        '
-        Me.MyComboBox1._allowedValuesFreiText = Nothing
-        Me.MyComboBox1._allowFreiText = False
-        Me.MyComboBox1._value = ""
-        Me.MyComboBox1.FormattingEnabled = True
-        Me.MyComboBox1.Location = New System.Drawing.Point(15, 108)
-        Me.MyComboBox1.Name = "MyComboBox1"
-        Me.MyComboBox1.Size = New System.Drawing.Size(217, 21)
-        Me.MyComboBox1.TabIndex = 12
+        Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button9.Location = New System.Drawing.Point(427, 132)
+        Me.Button9.Name = "Button9"
+        Me.Button9.Size = New System.Drawing.Size(174, 40)
+        Me.Button9.TabIndex = 13
+        Me.Button9.Text = "AUSWERTUNG QS"
+        Me.Button9.UseVisualStyleBackColor = True
        '
        'frmZollUserStat
        '
@@ -352,4 +370,5 @@ Partial Class frmZollUserStat
    Friend WithEvents Button8 As System.Windows.Forms.Button
    Friend WithEvents Label4 As System.Windows.Forms.Label
    Friend WithEvents MyComboBox1 As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Button9 As Button
 End Class
--- a/SDL/Administration/Auswertungen/frmZollUserStat.vb
+++ b/SDL/Administration/Auswertungen/frmZollUserStat.vb
@@ -2,21 +2,28 @@

 Public Class frmZollUserStat
    Dim dbSQL As New SQL
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
+    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click, Button9.Click
        Me.Cursor = Cursors.WaitCursor
        DataGridView1.Columns.Clear()
        Try
            'Dim sql As String = " SELECT [Personal].[Name], [Personal].Niederlassung,/*COUNT(distinct ([AbfertigungsNr]))*/ sum(Abfertigungsanzahl) as anzahl "
            ' sql &= " FROM [Speditionsbuch] INNER JOIN [Personal] ON [ID]=[Personalnummer] "
            ' sql &= " WHERE 1=1 AND "
-            Dim sql As String = " SELECT mit_nname + ' ' + mit_vname as [Name], mit_niederlassung , [dstma_wochenStunden], "
+            Dim sql As String = " SELECT mit_nname + ' ' + mit_vname as [Name], mit_niederlassung , "
+            sql &= " (SELECT TOP 1 isnull([dstma_wochenStunden],0) FROM [SQLGUIDE01.verag.ost.dmn\SQLEXPRESS].ADMIN.dbo.tblDienstMitarb where [dstma_mitId]=mit_id ) as dstma_wochenStunden, "
            sql &= " isnull((SELECT sum(Abfertigungsanzahl) as anzahl FROM [Speditionsbuch] WHERE Abfertigungsdatum BETWEEN '" & MyTextBox1.Text & "' AND '" & MyTextBox3.Text & "' "
+
            If MyListBox1.SelectedItems.Count > 0 Then sql &= " AND Abfertigungsart IN (" & getValues() & ") "
-            sql &= " AND [Personalnummer] = (case when mit_FMZollPersIDKasseIsnotSpedBuch = 1 then mit_FMZollPersIDSpedBuch else mit_fmzollpersid end )),0) as anzahl "
+
+            If sender Is Button7 Then
+                sql &= " AND isnull([Personalnummer],0)>0 AND  [Personalnummer] = (case when mit_FMZollPersIDKasseIsnotSpedBuch = 1 then mit_FMZollPersIDSpedBuch else mit_fmzollpersid end )),0) as anzahl "
+            Else
+                sql &= " AND isnull([PersonalnummerQS],0)>0 AND  [PersonalnummerQS] = mit_id),0) as anzahl "
+            End If

            sql &= getAbfArtSplitter()

-            sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
+            sql &= " FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblMitarbeiter " 'left join " & VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & ".ADMIN.dbo.tblDienstMitarb ON [dstma_mitId]=mit_id"
            sql &= " WHERE 1=1  "
            sql &= " and mit_abteilung IN ('ZOLL','QS') and mit_pseudoUser=0"
            sql &= " and mit_gekuendigt = 0"
@@ -32,10 +39,10 @@ Public Class frmZollUserStat


            ' filter += " AND [Personalnummer] is not null "
-          
-            Dim grouporder As String = " ORDER BY mit_abteilung desc, anzahl desc "
+
+            Dim grouporder As String = " ORDER BY  anzahl desc "
            sql += filter + grouporder
-            'MsgBox(sql)
+            ' MsgBox(sql)
            Dim data As DataTable = dbSQL.loadDgvBySql(sql, "FMZOLL", 300)
            DataGridView1.DataSource = data
            initDGV()
@@ -60,6 +67,7 @@ Public Class frmZollUserStat
            c.Width = 200
            c.Name = "anzahlShowBar"
            .Columns.Insert(2, c)
+
            '.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCellsExceptHeader
            For Each col In .Columns
                Try : col.MinimumWidth = 50
@@ -93,7 +101,12 @@ Public Class frmZollUserStat
        MyListBox1.fillWithSQL(" SELECT [Abfertigungsart],[Abfertigungsbezeichnung] FROM [Abfertigungsarten] ", , "FMZOLL")
        '     MyComboBox1.fillWithSQL("SELECT Filialen.FilialenNr, Filialen.Grenzstelle FROM Filialen WHERE (((Filialen.Fil_Status)='A')) ORDER BY Filialen.FilialenNr ", , "FMZOLL")
        MyComboBox1.Items.Clear()
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG", "VERAG"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IMEX", "IMEX"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("UNISPED", "UNISPED"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE"))
+        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR"))
        MyComboBox1.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA"))
        MyComboBox1.changeItem("VERAG")
        MyComboBox2.fillWithSQL("SELECT [nl_kuerzel] ,nl_kuerzel FROM [ADMIN].[dbo].[tblNiederlassungen]", False, "ADMIN")
@@ -154,6 +167,7 @@ Public Class frmZollUserStat
        If DataGridView1.Rows.Count = 0 Then Exit Sub

        Dim topvalue As Integer = DataGridView1.Rows(0).Cells("Anzahl").Value
+        If topvalue = 0 Then Exit Sub
        If DataGridView1.Columns("anzahlShowBar") Is Nothing Then Exit Sub
        If e.ColumnIndex = DataGridView1.Columns("anzahlShowBar").Index Then ' Or DataGridView1.Columns(e.ColumnIndex).Name.StartsWith("davon") Then