Merge branch 'master' of https://git.it.verag.ag/edv/AVISO

Aviso/ATEZ/frmATEZ_EZA.Designer.vb

@@ -26,6 +26,9 @@ Partial Class frmATEZ_EZA
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmATEZ_EZA))
         Me.btnSend = New System.Windows.Forms.Button()
         Me.pnlHead = New System.Windows.Forms.Panel()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
         Me.Label4 = New System.Windows.Forms.Label()
         Me.lblInfo = New System.Windows.Forms.Label()
         Me.Label8 = New System.Windows.Forms.Label()
@@ -35,13 +38,11 @@ Partial Class frmATEZ_EZA
         Me.Label9 = New System.Windows.Forms.Label()
         Me.sbAdressierteZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
         Me.txtDyMandant = New System.Windows.Forms.Label()
-        Me.Label1 = New System.Windows.Forms.Label()
         Me.txtDyNiederlassung = New System.Windows.Forms.Label()
         Me.lblBezugsnummer = New System.Windows.Forms.Label()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.lblAnh = New System.Windows.Forms.Label()
-        Me.Button1 = New System.Windows.Forms.Button()
         Me.btnAgg_Tnr = New System.Windows.Forms.Button()
         Me.Label2 = New System.Windows.Forms.Label()
         Me.btnAgg_Origin = New System.Windows.Forms.Button()
@@ -49,9 +50,15 @@ Partial Class frmATEZ_EZA
         Me.btnAgg_desc = New System.Windows.Forms.Button()
         Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
         Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.Button2 = New System.Windows.Forms.Button()
+        Me.btnPrio_CommInv = New System.Windows.Forms.Button()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.btnPrio_eFatura = New System.Windows.Forms.Button()
+        Me.btnPrio_Export = New System.Windows.Forms.Button()
+        Me.btnPrio_ftz = New System.Windows.Forms.Button()
+        Me.Panel1 = New System.Windows.Forms.Panel()
         Me.pnlHead.SuspendLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
         '
         'btnSend
@@ -62,7 +69,7 @@ Partial Class frmATEZ_EZA
         Me.btnSend.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
         Me.btnSend.Image = Global.AVISO.My.Resources.Resources.ico_atez_declarantAI
         Me.btnSend.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSend.Location = New System.Drawing.Point(473, 348)
+        Me.btnSend.Location = New System.Drawing.Point(473, 343)
         Me.btnSend.Margin = New System.Windows.Forms.Padding(2)
         Me.btnSend.Name = "btnSend"
         Me.btnSend.Padding = New System.Windows.Forms.Padding(5, 0, 5, 0)
@@ -76,6 +83,8 @@ Partial Class frmATEZ_EZA
         '
         Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
         Me.pnlHead.BackColor = System.Drawing.Color.White
+        Me.pnlHead.Controls.Add(Me.Button1)
+        Me.pnlHead.Controls.Add(Me.Button2)
         Me.pnlHead.Controls.Add(Me.Label1)
         Me.pnlHead.Controls.Add(Me.Label4)
         Me.pnlHead.Controls.Add(Me.lblInfo)
@@ -93,6 +102,35 @@ Partial Class frmATEZ_EZA
         Me.pnlHead.Size = New System.Drawing.Size(675, 151)
         Me.pnlHead.TabIndex = 112
         '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(553, 117)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(122, 23)
+        Me.Button1.TabIndex = 153
+        Me.Button1.Text = "Clear Token Cache"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(610, 96)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(65, 23)
+        Me.Button2.TabIndex = 158
+        Me.Button2.Text = "json"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Label1.AutoSize = True
+        Me.Label1.BackColor = System.Drawing.Color.White
+        Me.Label1.Location = New System.Drawing.Point(387, 13)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(89, 13)
+        Me.Label1.TabIndex = 106
+        Me.Label1.Text = "Bezugsnummer:"
+        '
         'Label4
         '
         Me.Label4.BackColor = System.Drawing.Color.White
@@ -216,17 +254,6 @@ Partial Class frmATEZ_EZA
         Me.txtDyMandant.Text = "VERG"
         Me.txtDyMandant.TextAlign = System.Drawing.ContentAlignment.TopRight
         '
-        'Label1
-        '
-        Me.Label1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.Label1.AutoSize = True
-        Me.Label1.BackColor = System.Drawing.Color.White
-        Me.Label1.Location = New System.Drawing.Point(387, 13)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(89, 13)
-        Me.Label1.TabIndex = 106
-        Me.Label1.Text = "Bezugsnummer:"
-        '
         'txtDyNiederlassung
         '
         Me.txtDyNiederlassung.BackColor = System.Drawing.Color.White
@@ -273,19 +300,10 @@ Partial Class frmATEZ_EZA
         Me.lblAnh.TabIndex = 151
         Me.lblAnh.Visible = False
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(3, 383)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(178, 23)
-        Me.Button1.TabIndex = 153
-        Me.Button1.Text = "Clear Token Cache"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
         'btnAgg_Tnr
         '
         Me.btnAgg_Tnr.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.btnAgg_Tnr.Location = New System.Drawing.Point(79, 345)
+        Me.btnAgg_Tnr.Location = New System.Drawing.Point(76, 3)
         Me.btnAgg_Tnr.Name = "btnAgg_Tnr"
         Me.btnAgg_Tnr.Size = New System.Drawing.Size(83, 23)
         Me.btnAgg_Tnr.TabIndex = 154
@@ -296,7 +314,7 @@ Partial Class frmATEZ_EZA
         'Label2
         '
         Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.0!)
-        Me.Label2.Location = New System.Drawing.Point(6, 350)
+        Me.Label2.Location = New System.Drawing.Point(3, 8)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(103, 17)
         Me.Label2.TabIndex = 149
@@ -305,7 +323,7 @@ Partial Class frmATEZ_EZA
         'btnAgg_Origin
         '
         Me.btnAgg_Origin.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.btnAgg_Origin.Location = New System.Drawing.Point(165, 345)
+        Me.btnAgg_Origin.Location = New System.Drawing.Point(162, 3)
         Me.btnAgg_Origin.Name = "btnAgg_Origin"
         Me.btnAgg_Origin.Size = New System.Drawing.Size(92, 23)
         Me.btnAgg_Origin.TabIndex = 155
@@ -315,7 +333,7 @@ Partial Class frmATEZ_EZA
         '
         'btnAgg_Unit
         '
-        Me.btnAgg_Unit.Location = New System.Drawing.Point(260, 345)
+        Me.btnAgg_Unit.Location = New System.Drawing.Point(257, 3)
         Me.btnAgg_Unit.Name = "btnAgg_Unit"
         Me.btnAgg_Unit.Size = New System.Drawing.Size(79, 23)
         Me.btnAgg_Unit.TabIndex = 156
@@ -325,7 +343,7 @@ Partial Class frmATEZ_EZA
         '
         'btnAgg_desc
         '
-        Me.btnAgg_desc.Location = New System.Drawing.Point(342, 345)
+        Me.btnAgg_desc.Location = New System.Drawing.Point(339, 3)
         Me.btnAgg_desc.Name = "btnAgg_desc"
         Me.btnAgg_desc.Size = New System.Drawing.Size(126, 23)
         Me.btnAgg_desc.TabIndex = 157
@@ -358,34 +376,91 @@ Partial Class frmATEZ_EZA
         Me.columnName.Name = "columnName"
         Me.columnName.ReadOnly = True
         '
-        'Button2
+        'btnPrio_CommInv
         '
-        Me.Button2.Location = New System.Drawing.Point(402, 383)
+        Me.btnPrio_CommInv.BackColor = System.Drawing.Color.DeepSkyBlue
-        Me.Button2.Name = "Button2"
+        Me.btnPrio_CommInv.Location = New System.Drawing.Point(76, 28)
-        Me.Button2.Size = New System.Drawing.Size(65, 23)
+        Me.btnPrio_CommInv.Name = "btnPrio_CommInv"
-        Me.Button2.TabIndex = 158
+        Me.btnPrio_CommInv.Size = New System.Drawing.Size(116, 23)
-        Me.Button2.Text = "json"
+        Me.btnPrio_CommInv.TabIndex = 159
-        Me.Button2.UseVisualStyleBackColor = True
+        Me.btnPrio_CommInv.Tag = "1"
+        Me.btnPrio_CommInv.Text = "Handelsrechnung"
+        Me.btnPrio_CommInv.UseVisualStyleBackColor = False
+        '
+        'Label5
+        '
+        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.0!)
+        Me.Label5.Location = New System.Drawing.Point(3, 33)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(103, 17)
+        Me.Label5.TabIndex = 160
+        Me.Label5.Text = "Priorität:"
+        '
+        'btnPrio_eFatura
+        '
+        Me.btnPrio_eFatura.BackColor = System.Drawing.Color.White
+        Me.btnPrio_eFatura.Location = New System.Drawing.Point(195, 28)
+        Me.btnPrio_eFatura.Name = "btnPrio_eFatura"
+        Me.btnPrio_eFatura.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_eFatura.TabIndex = 161
+        Me.btnPrio_eFatura.Tag = "0"
+        Me.btnPrio_eFatura.Text = "eFatura"
+        Me.btnPrio_eFatura.UseVisualStyleBackColor = False
+        '
+        'btnPrio_Export
+        '
+        Me.btnPrio_Export.BackColor = System.Drawing.Color.White
+        Me.btnPrio_Export.Location = New System.Drawing.Point(267, 28)
+        Me.btnPrio_Export.Name = "btnPrio_Export"
+        Me.btnPrio_Export.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_Export.TabIndex = 162
+        Me.btnPrio_Export.Tag = "0"
+        Me.btnPrio_Export.Text = "Ausfuhr"
+        Me.btnPrio_Export.UseVisualStyleBackColor = False
+        '
+        'btnPrio_ftz
+        '
+        Me.btnPrio_ftz.BackColor = System.Drawing.Color.White
+        Me.btnPrio_ftz.Location = New System.Drawing.Point(339, 28)
+        Me.btnPrio_ftz.Name = "btnPrio_ftz"
+        Me.btnPrio_ftz.Size = New System.Drawing.Size(69, 23)
+        Me.btnPrio_ftz.TabIndex = 163
+        Me.btnPrio_ftz.Tag = "0"
+        Me.btnPrio_ftz.Text = "FTZ"
+        Me.btnPrio_ftz.UseVisualStyleBackColor = False
+        '
+        'Panel1
+        '
+        Me.Panel1.BackColor = System.Drawing.SystemColors.InactiveBorder
+        Me.Panel1.Controls.Add(Me.btnPrio_CommInv)
+        Me.Panel1.Controls.Add(Me.btnAgg_Tnr)
+        Me.Panel1.Controls.Add(Me.btnPrio_ftz)
+        Me.Panel1.Controls.Add(Me.Label2)
+        Me.Panel1.Controls.Add(Me.btnPrio_Export)
+        Me.Panel1.Controls.Add(Me.btnAgg_Origin)
+        Me.Panel1.Controls.Add(Me.btnPrio_eFatura)
+        Me.Panel1.Controls.Add(Me.btnAgg_Unit)
+        Me.Panel1.Controls.Add(Me.Label5)
+        Me.Panel1.Controls.Add(Me.btnAgg_desc)
+        Me.Panel1.Location = New System.Drawing.Point(0, 343)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(470, 54)
+        Me.Panel1.TabIndex = 164
         '
         'frmATEZ_EZA
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
-        Me.ClientSize = New System.Drawing.Size(680, 413)
+        Me.BackColor = System.Drawing.SystemColors.InactiveBorder
-        Me.Controls.Add(Me.Button2)
+        Me.ClientSize = New System.Drawing.Size(680, 409)
-        Me.Controls.Add(Me.btnAgg_desc)
-        Me.Controls.Add(Me.btnAgg_Tnr)
-        Me.Controls.Add(Me.btnAgg_Unit)
-        Me.Controls.Add(Me.btnAgg_Origin)
-        Me.Controls.Add(Me.Label2)
-        Me.Controls.Add(Me.Button1)
         Me.Controls.Add(Me.Button3)
         Me.Controls.Add(Me.lblAnh)
         Me.Controls.Add(Me.pnlHead)
         Me.Controls.Add(Me.Label6)
         Me.Controls.Add(Me.btnSend)
         Me.Controls.Add(Me.dgvAnhaenge)
+        Me.Controls.Add(Me.Panel1)
         Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
         Me.Name = "frmATEZ_EZA"
@@ -394,6 +469,7 @@ Partial Class frmATEZ_EZA
         Me.pnlHead.ResumeLayout(False)
         Me.pnlHead.PerformLayout()
         CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel1.ResumeLayout(False)
         Me.ResumeLayout(False)
 
     End Sub
@@ -423,4 +499,10 @@ Partial Class frmATEZ_EZA
     Friend WithEvents btnAgg_desc As Button
     Friend WithEvents Label4 As Label
     Friend WithEvents Button2 As Button
+    Friend WithEvents btnPrio_CommInv As Button
+    Friend WithEvents Label5 As Label
+    Friend WithEvents btnPrio_eFatura As Button
+    Friend WithEvents btnPrio_Export As Button
+    Friend WithEvents btnPrio_ftz As Button
+    Friend WithEvents Panel1 As Panel
 End Class

Aviso/ATEZ/frmATEZ_EZA.vb

@@ -146,6 +146,14 @@ Public Class frmATEZ_EZA
             If btnAgg_Unit.Tag = 1 Then AdditionalSettings.Add("unit_type")
 
 
+            Dim combineItemsPriorityDocumentType As String = ""
+            If btnPrio_CommInv.Tag = 1 Then combineItemsPriorityDocumentType = "commercial_invoice"
+            If btnPrio_eFatura.Tag = 1 Then combineItemsPriorityDocumentType = "invoice"
+            If btnPrio_Export.Tag = 1 Then combineItemsPriorityDocumentType = "tr_export_declaration"
+            If btnPrio_ftz.Tag = 1 Then combineItemsPriorityDocumentType = "ftz"
+            'If btnPrio_CommInv.Tag = 1 Then combineItemsPriorityDocumentType = "packing_list"
+
+
             Dim ATEZ_RH_EZA As New VERAG_PROG_ALLGEMEIN.cRelayHub.cRelayHubJobOrderRequest With {
                 .referenceNo = ioReference,
                 .outputApplication = "dakosy/sftp/verg",'.outputApplication = "dakosy/sftp/vera",
@@ -183,7 +191,8 @@ Public Class frmATEZ_EZA
                             }
                     },
                  .additionalSettings = New cRelayHubAdditionalSettings With {
-                        .combineOptions = AdditionalSettings
+                        .combineOptions = AdditionalSettings,
+                        .combineItemsPriorityDocumentType = combineItemsPriorityDocumentType
                     }
             }
 
@@ -809,4 +818,20 @@ Public Class frmATEZ_EZA
             sender.BackColor = SystemColors.Control
         End If
     End Sub
-End Class
+    Private Sub Buttonprio_Click(sender As Object, e As EventArgs) Handles btnPrio_CommInv.Click, btnPrio_ftz.Click, btnPrio_eFatura.Click, btnPrio_Export.Click
+
+        If sender IsNot btnPrio_CommInv Then btnPrio_CommInv.Tag = 0 : btnPrio_CommInv.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_eFatura Then btnPrio_eFatura.Tag = 0 : btnPrio_eFatura.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_Export Then btnPrio_Export.Tag = 0 : btnPrio_Export.BackColor = SystemColors.Control
+        If sender IsNot btnPrio_ftz Then btnPrio_ftz.Tag = 0 : btnPrio_ftz.BackColor = SystemColors.Control
+
+
+        If sender.Tag = 0 Then
+            sender.Tag = 1
+            sender.BackColor = Color.DeepSkyBlue
+        Else
+            sender.Tag = 0
+            sender.BackColor = SystemColors.Control
+        End If
+        End Sub
+        End Class

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(646, 9)
-        Me.Button3.Location = New System.Drawing.Point(532, 8)
         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(712, 389)
-        Me.Button2.Location = New System.Drawing.Point(598, 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(631, 389)
-        Me.Button1.Location = New System.Drawing.Point(517, 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(646, 9)
-        Me.btnAbfAuswerten.Location = New System.Drawing.Point(532, 8)
         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(712, 389)
-        Me.btnAbfBericht.Location = New System.Drawing.Point(598, 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(631, 389)
-        Me.btnAbfExcel.Location = New System.Drawing.Point(517, 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

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"))

Aviso/frmHauptfenster.vb

@@ -207,12 +207,12 @@ Public Class frmHauptfenster
 
         If message.StartsWith("OpenKd_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        FUNC.showKd(split(1), True)
                    End Sub)
         ElseIf message.StartsWith("OpenAvisoSnd_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
                            Dim frmSendungsdetails As New frmSendungsdetailsNEU(split(1), -1)
                            frmSendungsdetails.ShowDialog(Me)
@@ -221,7 +221,7 @@ Public Class frmHauptfenster
 
         ElseIf message.StartsWith("OpenAviso_") Then
             Invoke(Sub()
-                       Dim split = message.ToString.split("_")
+                       Dim split = message.ToString.Split("_")
                        If split.Count > 1 AndAlso IsNumeric(split(1)) AndAlso split(1) > 0 Then
 
                            If IsNumeric(split(1)) AndAlso split(1) > 0 Then
@@ -1513,7 +1513,14 @@ ELSE_ATILLA:
                     sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' OR FIRMA='ATILLA' ) "
                 Else
                     sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) "
+                 '   MsgBox(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+                    'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then
+                    '    '+AMBAR
+                    '    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR (tblSendungen.FilialenNr  IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66))  ) "
 
+                    'Else
+                    '    sqlStrFirma &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'  ) "
+                    'End If
                 End If
 
             Else
@@ -2305,7 +2312,7 @@ ELSE_ATILLA:
                     Dim t As String = txtSuche.Text
                     '    t = t.Replace("/V003/", "")
                     t = t.Replace("/", "")
-                    Dim v() = t.split("-")
+                    Dim v() = t.Split("-")
                     'Dim o As New cOptionenDAL
                     If v.Length > 1 Then
 

Aviso/frmSendungsdetailsNEU.vb

@@ -1915,10 +1915,6 @@ Public Class frmSendungsdetailsNEU
 
     Sub initSendungs_Status()
 
-        Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & cboFiliale._value & "' AND AbfertigungsNr='" & txtAbfertigungsnummer.Text & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
-        'cbxSpedBuch.Checked = (vorhanden > 0)
-        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
-
 
 
         btnStatusAbklaerungTR.BackgroundImage = My.Resources.abklaerungTR_Inaktiv
@@ -2025,6 +2021,10 @@ Public Class frmSendungsdetailsNEU
         End Select
 
 
+        Dim vorhanden = ADMIN.getValueTxtBySql("SELECT COUNT(*) FROM [Speditionsbuch] WHERE [FilialenNr]='" & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "' AND AbfertigungsNr='" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr & "'", "FMZOLL") ' AND UnterNr='" & txtUnterNr.Text & "'
+        'cbxSpedBuch.Checked = (vorhanden > 0)
+        SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen = (vorhanden > 0)
+
 
     End Sub
 

Aviso/usrcntlAktDetails.vb

@@ -1236,6 +1236,11 @@ Public Class usrcntlAktDetails
                     End If
                 Case Else
                     If paarId > 0 Then
+                        Select Case vermerkCode
+                            Case 101, 25 'Sonderfall -> BEzeichnung sollte übernommen werden
+                                paarBez = gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").value.ToString.Replace("angefordert", "erhalten").ToString.Replace("offen", "erledigt")
+                        End Select
+
                         myVermerk.Hinweis_Vermerk = paarBez
                         myVermerk.VermerkCodeId = paarId
                         Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk)
@@ -1260,7 +1265,6 @@ Public Class usrcntlAktDetails
                         End Select
                     End If
             End Select
-
         End If
 
     End Sub
@@ -1354,11 +1358,11 @@ Public Class usrcntlAktDetails
                                 End If
                             End If
 
-                        Case 101, 25
+                            'Case 101, 25
-                            If paarId > 0 AndAlso r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
+                            '    If paarId > 0 AndAlso r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then
-                                optionCell.Value = paarBez
+                            '        optionCell.Value = paarBez
-                                optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
+                            '        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."
-                            End If
+                            '    End If
                         Case Else
                             If paarId > 0 Then
                                 If Not existCodeInGridVermerke(r, gridvermerke, paarId, CStr(r.Cells("Hinweis_Vermerk").Value)) Then
@@ -1417,7 +1421,7 @@ Public Class usrcntlAktDetails
                         Select Case code
                             Case 59
                                 Return True
-                            Case 2, 4, 6, 8, 10, 12, 30, 37, 34
+                            Case 2, 4, 6, 8, 10, 12, 30, 37, 34, 102
                                 If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
                                     Return True
                                 End If