diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb b/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb index f323117..6e4560f 100644 --- a/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb +++ b/Aviso/Auswertung/usrctlStatVERIMEX.Designer.vb @@ -50,6 +50,8 @@ Partial Class usrctlStatVERIMEX Me.datAbfStatVon = New System.Windows.Forms.DateTimePicker() Me.btnAbfBericht = New System.Windows.Forms.Button() Me.btnAbfExcel = New System.Windows.Forms.Button() + Me.Label7 = New System.Windows.Forms.Label() + Me.cboAbfArt = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Panel3.SuspendLayout() Me.Panel4.SuspendLayout() CType(Me.dgvAbklaerungTR, System.ComponentModel.ISupportInitialize).BeginInit() @@ -67,12 +69,11 @@ Partial Class usrctlStatVERIMEX Me.Panel3.Controls.Add(Me.Button1) Me.Panel3.Location = New System.Drawing.Point(15, 17) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(701, 423) + Me.Panel3.Size = New System.Drawing.Size(790, 423) Me.Panel3.TabIndex = 0 ' 'Button4 ' - Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Location = New System.Drawing.Point(310, 389) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(135, 23) @@ -103,13 +104,12 @@ Partial Class usrctlStatVERIMEX Me.Panel4.Controls.Add(Me.datStatVon) Me.Panel4.Location = New System.Drawing.Point(3, 24) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(670, 359) + Me.Panel4.Size = New System.Drawing.Size(784, 359) Me.Panel4.TabIndex = 1 ' 'Button3 ' - Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(532, 8) + Me.Button3.Location = New System.Drawing.Point(646, 9) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(135, 23) Me.Button3.TabIndex = 6 @@ -139,11 +139,14 @@ Partial Class usrctlStatVERIMEX ' 'dgvAbklaerungTR ' + Me.dgvAbklaerungTR.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAbklaerungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAbklaerungTR.Location = New System.Drawing.Point(6, 38) Me.dgvAbklaerungTR.Name = "dgvAbklaerungTR" Me.dgvAbklaerungTR.RowHeadersWidth = 62 - Me.dgvAbklaerungTR.Size = New System.Drawing.Size(661, 318) + Me.dgvAbklaerungTR.Size = New System.Drawing.Size(775, 318) Me.dgvAbklaerungTR.TabIndex = 7 ' 'Label10 @@ -182,8 +185,7 @@ Partial Class usrctlStatVERIMEX ' 'Button2 ' - Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button2.Location = New System.Drawing.Point(598, 389) + Me.Button2.Location = New System.Drawing.Point(712, 389) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(75, 23) Me.Button2.TabIndex = 3 @@ -192,8 +194,7 @@ Partial Class usrctlStatVERIMEX ' 'Button1 ' - Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(517, 389) + Me.Button1.Location = New System.Drawing.Point(631, 389) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(75, 23) Me.Button1.TabIndex = 2 @@ -209,12 +210,11 @@ Partial Class usrctlStatVERIMEX Me.Panel1.Controls.Add(Me.btnAbfExcel) Me.Panel1.Location = New System.Drawing.Point(15, 467) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(701, 423) + Me.Panel1.Size = New System.Drawing.Size(790, 423) Me.Panel1.TabIndex = 5 ' 'btnAbfDetailbereicht ' - Me.btnAbfDetailbereicht.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAbfDetailbereicht.Location = New System.Drawing.Point(310, 389) Me.btnAbfDetailbereicht.Name = "btnAbfDetailbereicht" Me.btnAbfDetailbereicht.Size = New System.Drawing.Size(135, 23) @@ -234,6 +234,8 @@ Partial Class usrctlStatVERIMEX 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.WhiteSmoke + Me.Panel2.Controls.Add(Me.cboAbfArt) + Me.Panel2.Controls.Add(Me.Label7) Me.Panel2.Controls.Add(Me.btnAbfAuswerten) Me.Panel2.Controls.Add(Me.Label3) Me.Panel2.Controls.Add(Me.cboAbfFirma) @@ -244,13 +246,12 @@ Partial Class usrctlStatVERIMEX Me.Panel2.Controls.Add(Me.datAbfStatVon) Me.Panel2.Location = New System.Drawing.Point(3, 24) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(670, 359) + Me.Panel2.Size = New System.Drawing.Size(784, 359) Me.Panel2.TabIndex = 1 ' 'btnAbfAuswerten ' - Me.btnAbfAuswerten.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAbfAuswerten.Location = New System.Drawing.Point(532, 8) + Me.btnAbfAuswerten.Location = New System.Drawing.Point(646, 9) Me.btnAbfAuswerten.Name = "btnAbfAuswerten" Me.btnAbfAuswerten.Size = New System.Drawing.Size(135, 23) Me.btnAbfAuswerten.TabIndex = 6 @@ -260,7 +261,7 @@ Partial Class usrctlStatVERIMEX 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(346, 13) + Me.Label3.Location = New System.Drawing.Point(305, 13) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(35, 13) Me.Label3.TabIndex = 0 @@ -272,19 +273,22 @@ Partial Class usrctlStatVERIMEX Me.cboAbfFirma._allowFreiText = False Me.cboAbfFirma._value = "" Me.cboAbfFirma.FormattingEnabled = True - Me.cboAbfFirma.Location = New System.Drawing.Point(386, 11) + Me.cboAbfFirma.Location = New System.Drawing.Point(345, 11) Me.cboAbfFirma.Margin = New System.Windows.Forms.Padding(2) Me.cboAbfFirma.Name = "cboAbfFirma" - Me.cboAbfFirma.Size = New System.Drawing.Size(111, 21) + Me.cboAbfFirma.Size = New System.Drawing.Size(84, 21) Me.cboAbfFirma.TabIndex = 5 ' 'dgvAbfertigungTR ' + Me.dgvAbfertigungTR.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAbfertigungTR.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvAbfertigungTR.Location = New System.Drawing.Point(6, 38) Me.dgvAbfertigungTR.Name = "dgvAbfertigungTR" Me.dgvAbfertigungTR.RowHeadersWidth = 62 - Me.dgvAbfertigungTR.Size = New System.Drawing.Size(661, 318) + Me.dgvAbfertigungTR.Size = New System.Drawing.Size(775, 318) Me.dgvAbfertigungTR.TabIndex = 7 ' 'Label4 @@ -323,8 +327,7 @@ Partial Class usrctlStatVERIMEX ' 'btnAbfBericht ' - Me.btnAbfBericht.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAbfBericht.Location = New System.Drawing.Point(598, 389) + Me.btnAbfBericht.Location = New System.Drawing.Point(712, 389) Me.btnAbfBericht.Name = "btnAbfBericht" Me.btnAbfBericht.Size = New System.Drawing.Size(75, 23) Me.btnAbfBericht.TabIndex = 3 @@ -333,14 +336,34 @@ Partial Class usrctlStatVERIMEX ' 'btnAbfExcel ' - Me.btnAbfExcel.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnAbfExcel.Location = New System.Drawing.Point(517, 389) + Me.btnAbfExcel.Location = New System.Drawing.Point(631, 389) Me.btnAbfExcel.Name = "btnAbfExcel" Me.btnAbfExcel.Size = New System.Drawing.Size(75, 23) Me.btnAbfExcel.TabIndex = 2 Me.btnAbfExcel.Text = "Excel" Me.btnAbfExcel.UseVisualStyleBackColor = True ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Location = New System.Drawing.Point(434, 15) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(85, 13) + Me.Label7.TabIndex = 8 + Me.Label7.Text = "Abfertigungs-Art:" + ' + 'cboAbfArt + ' + Me.cboAbfArt._allowedValuesFreiText = Nothing + Me.cboAbfArt._allowFreiText = False + Me.cboAbfArt._value = "" + Me.cboAbfArt.FormattingEnabled = True + Me.cboAbfArt.Location = New System.Drawing.Point(524, 11) + Me.cboAbfArt.Margin = New System.Windows.Forms.Padding(2) + Me.cboAbfArt.Name = "cboAbfArt" + Me.cboAbfArt.Size = New System.Drawing.Size(117, 21) + Me.cboAbfArt.TabIndex = 9 + ' 'usrctlStatVERIMEX ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -392,4 +415,6 @@ Partial Class usrctlStatVERIMEX Friend WithEvents datAbfStatVon As DateTimePicker Friend WithEvents btnAbfBericht As Button Friend WithEvents btnAbfExcel As Button + Friend WithEvents cboAbfArt As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label7 As Label End Class diff --git a/Aviso/Auswertung/usrctlStatVERIMEX.vb b/Aviso/Auswertung/usrctlStatVERIMEX.vb index d34d31a..87b2f32 100644 --- a/Aviso/Auswertung/usrctlStatVERIMEX.vb +++ b/Aviso/Auswertung/usrctlStatVERIMEX.vb @@ -45,12 +45,15 @@ Public Class usrctlStatVERIMEX innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr" End Select + + With dgvAbfertigungTR Dim sqlstr = "SELECT mit_vname + ' ' + mit_nname as Mitarbeiter ,sum(tblSnd_AbfertigungTRAnzahl) as Versandscheine ,sum(tblSnd_AbfertigungTRAnzahlPos) as Positionen ,count(distinct(avisoid)) as LKW FROM [tblSendungen] inner join Aviso on AvisoID = tblSnd_AvisoID inner join admin.dbo.tblMitarbeiter on mit_id=tblSnd_AbfertigungTR_MA " & innerJoinFiliale & " where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null " & whereFiliale & " + " & If(cboAbfArt._value <> "", " AND tblSnd_Abfertigungsart_ID IN(" & cboAbfArt._value & ")", "") & " group by mit_vname,mit_nname" 'früher: Datum statt tblSnd_AbfertigungTR ' MsgBox(sqlstr) @@ -138,6 +141,12 @@ Public Class usrctlStatVERIMEX cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("*Nicht zugeordnet", "0")) cboFirma.changeItem("") + cboAbfArt.Items.Clear() + cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) + cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T1", "'5','18','32'")) + cboAbfArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("T2", "'6','33','34','37','40','42'")) + + cboAbfFirma.Items.Clear() cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "")) cboAbfFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 895546e..7f70e15 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +