Merge branch 'master' of https://verag.visualstudio.com/AVISO/_git/AVISO

Aviso/Auswertung/usrctlStatVERIMEX.vb

@@ -203,28 +203,28 @@ Public Class usrctlStatVERIMEX
 
         Try
 
-
             Dim whereFiliale = ""
             Dim innerJoinFiliale = ""
-            Select Case cboFirma._value
+            Select Case cboAbfFirma._value
                 Case ""
                 Case 0 : whereFiliale = " and tblSendungen.FilialenNr <=0 "
+                Case "ATILLA" : whereFiliale = " and tblSendungen.FilialenNr='4801' "
+
                 Case Else
-                    whereFiliale = " and Filialen.Firma='" & cboFirma._value & "' "
+                    whereFiliale = " and tblSendungen.FilialenNr<>'4801' and Filialen.Firma='" & cboAbfFirma._value & "' "
                     innerJoinFiliale = "inner join " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen on [tblSendungen].FilialenNr=Filialen.FilialenNr"
             End Select
 
-
+            Dim sqlstr = "SELECT  mit_vname + ' ' + mit_nname as Mitarbeiter ,tblSnd_anzahlHandling as AnzahlVersandscheine ,tblSnd_anzahlHandlingPos as AnzahlPositionen, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
-            Dim sqlstr = "SELECT   (Select isnull(Filialen.firma,'') FROM [FMZOLL\SQLFMZOLL].VERAG.dbo.Filialen WHERE [tblSendungen].FilialenNr=Filialen.FilialenNr) Firma,
-                        mit_vname + ' ' + mit_nname as Mitarbeiter, aviso.LKW_Nr [LKW Kennzeichen],tblSnd_AvisoID [LKW-ID], Auftraggeber as Avisierer, Frächter, tblSnd_Empfaenger as Empfänger, tblSnd_Colli Colli, tblSnd_Gewicht Gewicht, tblSnd_Abfertigungsart_ID Abfertigungsart, tblSendungen.FilialenNr , tblSendungen.AbfertigungsNr, replace(Ankunft,'1899-12-30 00:00:00','') Ankunft, replace(Freigabe,'1899-12-30 00:00:00','') Freigabe
                   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  '" & datStatVon.Value & "' and '" & datStatBis.Value & "' and tblSnd_AbfertigungTR_MA is not null 
+                  where cast(tblSnd_AbfertigungTR as date) BETWEEN '" & datAbfStatVon.Value & "' and '" & datAbfStatBis.Value & "'  and tblSnd_AbfertigungTR_MA is not null 
-                        " & whereFiliale & "
+                  " & whereFiliale & " ORDER BY  mit_nname, tblSnd_AbfertigungTR"
-                        ORDER BY Firma, Mitarbeiter,Auftraggeber,LKW_Nr,tblSnd_PosUnterNr"
 
             SDL.cProgramFunctions.genExcelFromDT_NEW(SQL.loadDgvBySql(sqlstr, "AVISO"))
 
+
+
         Catch ex As Exception
             MsgBox(ex.Message & ex.StackTrace)
         End Try

Aviso/Aviso.vbproj

@@ -1354,6 +1354,7 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
+    <None Include="Resources\Flender_Bocholt.xlsx" />
     <None Include="Resources\old_ATANAK_Instructions_Export.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Aviso/frmAbfertigungTR_ExportAnz.Designer.vb

@@ -32,6 +32,7 @@ Partial Class frmAbfertigungTR_ExportAnz
         Me.Label6 = New System.Windows.Forms.Label()
         Me.Label16 = New System.Windows.Forms.Label()
         Me.btn = New System.Windows.Forms.Button()
+        Me.lblError = New System.Windows.Forms.Label()
         Me.pnl.SuspendLayout()
         Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
@@ -39,6 +40,7 @@ Partial Class frmAbfertigungTR_ExportAnz
         'pnl
         '
         Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.pnl.Controls.Add(Me.lblError)
         Me.pnl.Controls.Add(Me.txtAnzPos)
         Me.pnl.Controls.Add(Me.txtAnz)
         Me.pnl.Controls.Add(Me.Label1)
@@ -168,6 +170,18 @@ Partial Class frmAbfertigungTR_ExportAnz
         Me.btn.Text = "OK"
         Me.btn.UseVisualStyleBackColor = False
         '
+        'lblError
+        '
+        Me.lblError.AutoSize = True
+        Me.lblError.ForeColor = System.Drawing.Color.Red
+        Me.lblError.Location = New System.Drawing.Point(145, 124)
+        Me.lblError.Name = "lblError"
+        Me.lblError.Size = New System.Drawing.Size(97, 26)
+        Me.lblError.TabIndex = 55
+        Me.lblError.Text = "Format!" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Wert muss >0 sein."
+        Me.lblError.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblError.Visible = False
+        '
         'frmAbfertigungTR_ExportAnz
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -196,4 +210,5 @@ Partial Class frmAbfertigungTR_ExportAnz
     Friend WithEvents Label1 As Label
     Friend WithEvents txtAnzPos As VERAG_PROG_ALLGEMEIN.MyTextBox
     Friend WithEvents txtAnz As VERAG_PROG_ALLGEMEIN.MyTextBox
+    Friend WithEvents lblError As Label
 End Class

Aviso/frmAbfertigungTR_ExportAnz.vb

@@ -19,8 +19,12 @@
     End Sub
 
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
-        If txtAnz._value = "" Then Me.DialogResult = DialogResult.None : Exit Sub
+        lblError.Visible = False
-        If txtAnzPos._value = "" Then Me.DialogResult = DialogResult.None : Exit Sub
+        If txtAnz._value = "" OrElse Not IsNumeric(txtAnz._value) Then Me.DialogResult = DialogResult.None : lblError.Visible = True : Exit Sub
+        If txtAnzPos._value = "" OrElse Not IsNumeric(txtAnzPos._value) Then Me.DialogResult = DialogResult.None : lblError.Visible = True : Exit Sub
+
+        If CInt(txtAnz._value) <= 0 Then Me.DialogResult = DialogResult.None : lblError.Visible = True : Exit Sub
+        If CInt(txtAnzPos._value) <= 0 Then Me.DialogResult = DialogResult.None : lblError.Visible = True : Exit Sub
 
         Me.DialogResult = DialogResult.OK
 

Aviso/frmLaufzettel.Designer.vb

@@ -22,40 +22,40 @@ Partial Class frmLaufzettel
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLaufzettel))
         Me.lbl = New System.Windows.Forms.Label()
-        Me.cbxDokumenteDrucken = New System.Windows.Forms.CheckBox()
+        Me.pnl = New System.Windows.Forms.Panel()
-        Me.cbxDigitalLZ = New System.Windows.Forms.CheckBox()
+        Me.btn = New System.Windows.Forms.Button()
-        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel()
-        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
+        Me.Button4 = New System.Windows.Forms.Button()
-        Me.CheckBox4 = New System.Windows.Forms.CheckBox()
-        Me.dgvLaufzettelDruck = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.clmnLzPrint_ID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnLzPrint_Name = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.PrintDocId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.printTyp = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.dgvDigitalMailanfügen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.clmnLzMail_ID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.clmnLzMail_Name = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.DocId = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        Me.btnLaufzettelDrucken = New System.Windows.Forms.Button()
-        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
         Me.cboPrinter = New VERAG_PROG_ALLGEMEIN.MyComboBox()
         Me.cbxVPSplit = New System.Windows.Forms.CheckBox()
         Me.pnlZumZoll = New System.Windows.Forms.Panel()
         Me.Button2 = New System.Windows.Forms.Button()
+        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox4 = New System.Windows.Forms.CheckBox()
         Me.Button3 = New System.Windows.Forms.Button()
         Me.btnDIGITAL = New System.Windows.Forms.Button()
         Me.Button1 = New System.Windows.Forms.Button()
-        Me.pnl = New System.Windows.Forms.Panel()
+        Me.btnLaufzettelDrucken = New System.Windows.Forms.Button()
-        Me.btn = New System.Windows.Forms.Button()
+        Me.cbxDokumenteDrucken = New System.Windows.Forms.CheckBox()
-        Me.Button4 = New System.Windows.Forms.Button()
+        Me.dgvDigitalMailanfügen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        CType(Me.dgvLaufzettelDruck, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.clmnLzMail_ID = New System.Windows.Forms.DataGridViewTextBoxColumn()
-        CType(Me.dgvDigitalMailanfügen, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.clmnLzMail_Name = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.DocId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.dgvLaufzettelDruck = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+        Me.clmnLzPrint_ID = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.clmnLzPrint_Name = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.PrintDocId = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.printTyp = New System.Windows.Forms.DataGridViewTextBoxColumn()
+        Me.cbxDigitalLZ = New System.Windows.Forms.CheckBox()
+        Me.cbxSAAbfertigung = New System.Windows.Forms.CheckBox()
+        Me.pnl.SuspendLayout()
         Me.MyPanel1.SuspendLayout()
         Me.pnlZumZoll.SuspendLayout()
-        Me.pnl.SuspendLayout()
+        CType(Me.dgvDigitalMailanfügen, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.dgvLaufzettelDruck, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'lbl
@@ -69,166 +69,32 @@ Partial Class frmLaufzettel
         Me.lbl.TabIndex = 0
         Me.lbl.Text = "Laufzettel"
         '
-        'cbxDokumenteDrucken
+        'pnl
         '
-        Me.cbxDokumenteDrucken.AutoSize = True
+        Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
-        Me.cbxDokumenteDrucken.Checked = True
+        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.cbxDokumenteDrucken.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.pnl.Controls.Add(Me.btn)
-        Me.cbxDokumenteDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.pnl.Controls.Add(Me.lbl)
-        Me.cbxDokumenteDrucken.Location = New System.Drawing.Point(17, 25)
+        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
-        Me.cbxDokumenteDrucken.Name = "cbxDokumenteDrucken"
+        Me.pnl.Location = New System.Drawing.Point(0, 0)
-        Me.cbxDokumenteDrucken.Size = New System.Drawing.Size(189, 24)
+        Me.pnl.Name = "pnl"
-        Me.cbxDokumenteDrucken.TabIndex = 1
+        Me.pnl.Size = New System.Drawing.Size(564, 45)
-        Me.cbxDokumenteDrucken.Text = "Dokumente drucken"
+        Me.pnl.TabIndex = 10
-        Me.cbxDokumenteDrucken.UseVisualStyleBackColor = True
         '
-        'cbxDigitalLZ
+        'btn
         '
-        Me.cbxDigitalLZ.AutoSize = True
+        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.cbxDigitalLZ.Enabled = False
+        Me.btn.BackColor = System.Drawing.Color.Red
-        Me.cbxDigitalLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.cbxDigitalLZ.Location = New System.Drawing.Point(284, 25)
+        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cbxDigitalLZ.Name = "cbxDigitalLZ"
+        Me.btn.ForeColor = System.Drawing.Color.White
-        Me.cbxDigitalLZ.Size = New System.Drawing.Size(239, 24)
+        Me.btn.Location = New System.Drawing.Point(483, -1)
-        Me.cbxDigitalLZ.TabIndex = 2
+        Me.btn.Margin = New System.Windows.Forms.Padding(0)
-        Me.cbxDigitalLZ.Text = "DIGITAL: An Mail anfügen"
+        Me.btn.Name = "btn"
-        Me.cbxDigitalLZ.UseVisualStyleBackColor = True
+        Me.btn.Size = New System.Drawing.Size(80, 45)
-        '
+        Me.btn.TabIndex = 0
-        'CheckBox2
+        Me.btn.Text = "X"
-        '
+        Me.btn.UseVisualStyleBackColor = False
-        Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Checked = True
-        Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.CheckBox2.Location = New System.Drawing.Point(18, 14)
-        Me.CheckBox2.Name = "CheckBox2"
-        Me.CheckBox2.Size = New System.Drawing.Size(230, 24)
-        Me.CheckBox2.TabIndex = 3
-        Me.CheckBox2.Text = """zum Zoll"" Zettel drucken"
-        Me.CheckBox2.UseVisualStyleBackColor = True
-        '
-        'CheckBox3
-        '
-        Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.CheckBox3.Location = New System.Drawing.Point(284, 14)
-        Me.CheckBox3.Name = "CheckBox3"
-        Me.CheckBox3.Size = New System.Drawing.Size(77, 24)
-        Me.CheckBox3.TabIndex = 4
-        Me.CheckBox3.Text = "AT Zoll"
-        Me.CheckBox3.UseVisualStyleBackColor = True
-        '
-        'CheckBox4
-        '
-        Me.CheckBox4.AutoSize = True
-        Me.CheckBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.CheckBox4.Location = New System.Drawing.Point(376, 14)
-        Me.CheckBox4.Name = "CheckBox4"
-        Me.CheckBox4.Size = New System.Drawing.Size(80, 24)
-        Me.CheckBox4.TabIndex = 5
-        Me.CheckBox4.Text = "DE Zoll"
-        Me.CheckBox4.UseVisualStyleBackColor = True
-        '
-        'dgvLaufzettelDruck
-        '
-        Me.dgvLaufzettelDruck.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvLaufzettelDruck.AllowUserToAddRows = False
-        Me.dgvLaufzettelDruck.AllowUserToResizeColumns = False
-        Me.dgvLaufzettelDruck.AllowUserToResizeRows = False
-        Me.dgvLaufzettelDruck.BackgroundColor = System.Drawing.Color.White
-        Me.dgvLaufzettelDruck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvLaufzettelDruck.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLzPrint_ID, Me.clmnLzPrint_Name, Me.PrintDocId, Me.printTyp})
-        Me.dgvLaufzettelDruck.Location = New System.Drawing.Point(18, 53)
-        Me.dgvLaufzettelDruck.Name = "dgvLaufzettelDruck"
-        Me.dgvLaufzettelDruck.ReadOnly = True
-        Me.dgvLaufzettelDruck.RowHeadersVisible = False
-        Me.dgvLaufzettelDruck.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvLaufzettelDruck.Size = New System.Drawing.Size(260, 266)
-        Me.dgvLaufzettelDruck.TabIndex = 6
-        '
-        'clmnLzPrint_ID
-        '
-        Me.clmnLzPrint_ID.HeaderText = "Column1"
-        Me.clmnLzPrint_ID.Name = "clmnLzPrint_ID"
-        Me.clmnLzPrint_ID.ReadOnly = True
-        Me.clmnLzPrint_ID.Visible = False
-        '
-        'clmnLzPrint_Name
-        '
-        Me.clmnLzPrint_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnLzPrint_Name.HeaderText = "Datei"
-        Me.clmnLzPrint_Name.Name = "clmnLzPrint_Name"
-        Me.clmnLzPrint_Name.ReadOnly = True
-        '
-        'PrintDocId
-        '
-        Me.PrintDocId.HeaderText = "printDocId"
-        Me.PrintDocId.Name = "PrintDocId"
-        Me.PrintDocId.ReadOnly = True
-        Me.PrintDocId.Visible = False
-        '
-        'printTyp
-        '
-        Me.printTyp.HeaderText = "printTyp"
-        Me.printTyp.Name = "printTyp"
-        Me.printTyp.ReadOnly = True
-        Me.printTyp.Visible = False
-        '
-        'dgvDigitalMailanfügen
-        '
-        Me.dgvDigitalMailanfügen.AKTUALISIERUNGS_INTERVALL = -1
-        Me.dgvDigitalMailanfügen.AllowUserToAddRows = False
-        Me.dgvDigitalMailanfügen.AllowUserToResizeColumns = False
-        Me.dgvDigitalMailanfügen.AllowUserToResizeRows = False
-        Me.dgvDigitalMailanfügen.BackgroundColor = System.Drawing.Color.White
-        Me.dgvDigitalMailanfügen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.dgvDigitalMailanfügen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLzMail_ID, Me.clmnLzMail_Name, Me.DocId})
-        Me.dgvDigitalMailanfügen.Enabled = False
-        Me.dgvDigitalMailanfügen.Location = New System.Drawing.Point(284, 53)
-        Me.dgvDigitalMailanfügen.Name = "dgvDigitalMailanfügen"
-        Me.dgvDigitalMailanfügen.ReadOnly = True
-        Me.dgvDigitalMailanfügen.RowHeadersVisible = False
-        Me.dgvDigitalMailanfügen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
-        Me.dgvDigitalMailanfügen.Size = New System.Drawing.Size(260, 365)
-        Me.dgvDigitalMailanfügen.TabIndex = 7
-        '
-        'clmnLzMail_ID
-        '
-        Me.clmnLzMail_ID.HeaderText = "Column1"
-        Me.clmnLzMail_ID.Name = "clmnLzMail_ID"
-        Me.clmnLzMail_ID.ReadOnly = True
-        Me.clmnLzMail_ID.Visible = False
-        '
-        'clmnLzMail_Name
-        '
-        Me.clmnLzMail_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
-        Me.clmnLzMail_Name.HeaderText = "Datei"
-        Me.clmnLzMail_Name.Name = "clmnLzMail_Name"
-        Me.clmnLzMail_Name.ReadOnly = True
-        '
-        'DocId
-        '
-        Me.DocId.HeaderText = "DocId"
-        Me.DocId.Name = "DocId"
-        Me.DocId.ReadOnly = True
-        Me.DocId.Visible = False
-        '
-        'btnLaufzettelDrucken
-        '
-        Me.btnLaufzettelDrucken.BackColor = System.Drawing.Color.PapayaWhip
-        Me.btnLaufzettelDrucken.Enabled = False
-        Me.btnLaufzettelDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnLaufzettelDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.btnLaufzettelDrucken.Image = Global.AVISO.My.Resources.Resources.printer
-        Me.btnLaufzettelDrucken.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnLaufzettelDrucken.Location = New System.Drawing.Point(18, 424)
-        Me.btnLaufzettelDrucken.Name = "btnLaufzettelDrucken"
-        Me.btnLaufzettelDrucken.Padding = New System.Windows.Forms.Padding(10, 0, 20, 0)
-        Me.btnLaufzettelDrucken.Size = New System.Drawing.Size(260, 69)
-        Me.btnLaufzettelDrucken.TabIndex = 8
-        Me.btnLaufzettelDrucken.Text = "Laufzettel drucken"
-        Me.btnLaufzettelDrucken.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnLaufzettelDrucken.UseVisualStyleBackColor = False
         '
         'MyPanel1
         '
@@ -245,12 +111,23 @@ Partial Class frmLaufzettel
         Me.MyPanel1.Controls.Add(Me.dgvDigitalMailanfügen)
         Me.MyPanel1.Controls.Add(Me.dgvLaufzettelDruck)
         Me.MyPanel1.Controls.Add(Me.cbxDigitalLZ)
+        Me.MyPanel1.Controls.Add(Me.cbxSAAbfertigung)
         Me.MyPanel1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.MyPanel1.Location = New System.Drawing.Point(0, 45)
         Me.MyPanel1.Name = "MyPanel1"
         Me.MyPanel1.Size = New System.Drawing.Size(564, 571)
         Me.MyPanel1.TabIndex = 9
         '
+        'Button4
+        '
+        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button4.Location = New System.Drawing.Point(205, 363)
+        Me.Button4.Name = "Button4"
+        Me.Button4.Size = New System.Drawing.Size(73, 36)
+        Me.Button4.TabIndex = 24
+        Me.Button4.Text = "Kopieren"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
         'cboPrinter
         '
         Me.cboPrinter._allowedValuesFreiText = Nothing
@@ -298,6 +175,41 @@ Partial Class frmLaufzettel
         Me.Button2.Text = "nur z.Zoll drucken"
         Me.Button2.UseVisualStyleBackColor = True
         '
+        'CheckBox2
+        '
+        Me.CheckBox2.AutoSize = True
+        Me.CheckBox2.Checked = True
+        Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.CheckBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.CheckBox2.Location = New System.Drawing.Point(18, 14)
+        Me.CheckBox2.Name = "CheckBox2"
+        Me.CheckBox2.Size = New System.Drawing.Size(230, 24)
+        Me.CheckBox2.TabIndex = 3
+        Me.CheckBox2.Text = """zum Zoll"" Zettel drucken"
+        Me.CheckBox2.UseVisualStyleBackColor = True
+        '
+        'CheckBox3
+        '
+        Me.CheckBox3.AutoSize = True
+        Me.CheckBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.CheckBox3.Location = New System.Drawing.Point(284, 14)
+        Me.CheckBox3.Name = "CheckBox3"
+        Me.CheckBox3.Size = New System.Drawing.Size(77, 24)
+        Me.CheckBox3.TabIndex = 4
+        Me.CheckBox3.Text = "AT Zoll"
+        Me.CheckBox3.UseVisualStyleBackColor = True
+        '
+        'CheckBox4
+        '
+        Me.CheckBox4.AutoSize = True
+        Me.CheckBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.CheckBox4.Location = New System.Drawing.Point(376, 14)
+        Me.CheckBox4.Name = "CheckBox4"
+        Me.CheckBox4.Size = New System.Drawing.Size(80, 24)
+        Me.CheckBox4.TabIndex = 5
+        Me.CheckBox4.Text = "DE Zoll"
+        Me.CheckBox4.UseVisualStyleBackColor = True
+        '
         'Button3
         '
         Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -335,42 +247,143 @@ Partial Class frmLaufzettel
         Me.Button1.Text = "Laufzettel anzeigen"
         Me.Button1.UseVisualStyleBackColor = True
         '
-        'pnl
+        'btnLaufzettelDrucken
         '
-        Me.pnl.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+        Me.btnLaufzettelDrucken.BackColor = System.Drawing.Color.PapayaWhip
-        Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.btnLaufzettelDrucken.Enabled = False
-        Me.pnl.Controls.Add(Me.btn)
+        Me.btnLaufzettelDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.pnl.Controls.Add(Me.lbl)
+        Me.btnLaufzettelDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
-        Me.pnl.Dock = System.Windows.Forms.DockStyle.Top
+        Me.btnLaufzettelDrucken.Image = Global.AVISO.My.Resources.Resources.printer
-        Me.pnl.Location = New System.Drawing.Point(0, 0)
+        Me.btnLaufzettelDrucken.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.pnl.Name = "pnl"
+        Me.btnLaufzettelDrucken.Location = New System.Drawing.Point(18, 424)
-        Me.pnl.Size = New System.Drawing.Size(564, 45)
+        Me.btnLaufzettelDrucken.Name = "btnLaufzettelDrucken"
-        Me.pnl.TabIndex = 10
+        Me.btnLaufzettelDrucken.Padding = New System.Windows.Forms.Padding(10, 0, 20, 0)
+        Me.btnLaufzettelDrucken.Size = New System.Drawing.Size(260, 69)
+        Me.btnLaufzettelDrucken.TabIndex = 8
+        Me.btnLaufzettelDrucken.Text = "Laufzettel drucken"
+        Me.btnLaufzettelDrucken.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnLaufzettelDrucken.UseVisualStyleBackColor = False
         '
-        'btn
+        'cbxDokumenteDrucken
         '
-        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.cbxDokumenteDrucken.AutoSize = True
-        Me.btn.BackColor = System.Drawing.Color.Red
+        Me.cbxDokumenteDrucken.Checked = True
-        Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.cbxDokumenteDrucken.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxDokumenteDrucken.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
-        Me.btn.ForeColor = System.Drawing.Color.White
+        Me.cbxDokumenteDrucken.Location = New System.Drawing.Point(17, 25)
-        Me.btn.Location = New System.Drawing.Point(483, -1)
+        Me.cbxDokumenteDrucken.Name = "cbxDokumenteDrucken"
-        Me.btn.Margin = New System.Windows.Forms.Padding(0)
+        Me.cbxDokumenteDrucken.Size = New System.Drawing.Size(189, 24)
-        Me.btn.Name = "btn"
+        Me.cbxDokumenteDrucken.TabIndex = 1
-        Me.btn.Size = New System.Drawing.Size(80, 45)
+        Me.cbxDokumenteDrucken.Text = "Dokumente drucken"
-        Me.btn.TabIndex = 0
+        Me.cbxDokumenteDrucken.UseVisualStyleBackColor = True
-        Me.btn.Text = "X"
-        Me.btn.UseVisualStyleBackColor = False
         '
-        'Button4
+        'dgvDigitalMailanfügen
         '
-        Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.dgvDigitalMailanfügen.AKTUALISIERUNGS_INTERVALL = -1
-        Me.Button4.Location = New System.Drawing.Point(205, 363)
+        Me.dgvDigitalMailanfügen.AllowUserToAddRows = False
-        Me.Button4.Name = "Button4"
+        Me.dgvDigitalMailanfügen.AllowUserToResizeColumns = False
-        Me.Button4.Size = New System.Drawing.Size(73, 36)
+        Me.dgvDigitalMailanfügen.AllowUserToResizeRows = False
-        Me.Button4.TabIndex = 24
+        Me.dgvDigitalMailanfügen.BackgroundColor = System.Drawing.Color.White
-        Me.Button4.Text = "Kopieren"
+        Me.dgvDigitalMailanfügen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.Button4.UseVisualStyleBackColor = True
+        Me.dgvDigitalMailanfügen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLzMail_ID, Me.clmnLzMail_Name, Me.DocId})
+        Me.dgvDigitalMailanfügen.Enabled = False
+        Me.dgvDigitalMailanfügen.Location = New System.Drawing.Point(284, 53)
+        Me.dgvDigitalMailanfügen.Name = "dgvDigitalMailanfügen"
+        Me.dgvDigitalMailanfügen.ReadOnly = True
+        Me.dgvDigitalMailanfügen.RowHeadersVisible = False
+        Me.dgvDigitalMailanfügen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvDigitalMailanfügen.Size = New System.Drawing.Size(260, 365)
+        Me.dgvDigitalMailanfügen.TabIndex = 7
+        '
+        'clmnLzMail_ID
+        '
+        Me.clmnLzMail_ID.HeaderText = "Column1"
+        Me.clmnLzMail_ID.Name = "clmnLzMail_ID"
+        Me.clmnLzMail_ID.ReadOnly = True
+        Me.clmnLzMail_ID.Visible = False
+        '
+        'clmnLzMail_Name
+        '
+        Me.clmnLzMail_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnLzMail_Name.HeaderText = "Datei"
+        Me.clmnLzMail_Name.Name = "clmnLzMail_Name"
+        Me.clmnLzMail_Name.ReadOnly = True
+        '
+        'DocId
+        '
+        Me.DocId.HeaderText = "DocId"
+        Me.DocId.Name = "DocId"
+        Me.DocId.ReadOnly = True
+        Me.DocId.Visible = False
+        '
+        'dgvLaufzettelDruck
+        '
+        Me.dgvLaufzettelDruck.AKTUALISIERUNGS_INTERVALL = -1
+        Me.dgvLaufzettelDruck.AllowUserToAddRows = False
+        Me.dgvLaufzettelDruck.AllowUserToResizeColumns = False
+        Me.dgvLaufzettelDruck.AllowUserToResizeRows = False
+        Me.dgvLaufzettelDruck.BackgroundColor = System.Drawing.Color.White
+        Me.dgvLaufzettelDruck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.dgvLaufzettelDruck.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnLzPrint_ID, Me.clmnLzPrint_Name, Me.PrintDocId, Me.printTyp})
+        Me.dgvLaufzettelDruck.Location = New System.Drawing.Point(18, 53)
+        Me.dgvLaufzettelDruck.Name = "dgvLaufzettelDruck"
+        Me.dgvLaufzettelDruck.ReadOnly = True
+        Me.dgvLaufzettelDruck.RowHeadersVisible = False
+        Me.dgvLaufzettelDruck.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+        Me.dgvLaufzettelDruck.Size = New System.Drawing.Size(260, 266)
+        Me.dgvLaufzettelDruck.TabIndex = 6
+        '
+        'clmnLzPrint_ID
+        '
+        Me.clmnLzPrint_ID.HeaderText = "Column1"
+        Me.clmnLzPrint_ID.Name = "clmnLzPrint_ID"
+        Me.clmnLzPrint_ID.ReadOnly = True
+        Me.clmnLzPrint_ID.Visible = False
+        '
+        'clmnLzPrint_Name
+        '
+        Me.clmnLzPrint_Name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
+        Me.clmnLzPrint_Name.HeaderText = "Datei"
+        Me.clmnLzPrint_Name.Name = "clmnLzPrint_Name"
+        Me.clmnLzPrint_Name.ReadOnly = True
+        '
+        'PrintDocId
+        '
+        Me.PrintDocId.HeaderText = "printDocId"
+        Me.PrintDocId.Name = "PrintDocId"
+        Me.PrintDocId.ReadOnly = True
+        Me.PrintDocId.Visible = False
+        '
+        'printTyp
+        '
+        Me.printTyp.HeaderText = "printTyp"
+        Me.printTyp.Name = "printTyp"
+        Me.printTyp.ReadOnly = True
+        Me.printTyp.Visible = False
+        '
+        'cbxDigitalLZ
+        '
+        Me.cbxDigitalLZ.AutoSize = True
+        Me.cbxDigitalLZ.Enabled = False
+        Me.cbxDigitalLZ.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold)
+        Me.cbxDigitalLZ.Location = New System.Drawing.Point(284, 25)
+        Me.cbxDigitalLZ.Name = "cbxDigitalLZ"
+        Me.cbxDigitalLZ.Size = New System.Drawing.Size(239, 24)
+        Me.cbxDigitalLZ.TabIndex = 2
+        Me.cbxDigitalLZ.Text = "DIGITAL: An Mail anfügen"
+        Me.cbxDigitalLZ.UseVisualStyleBackColor = True
+        '
+        'cbxSAAbfertigung
+        '
+        Me.cbxSAAbfertigung.AutoSize = True
+        Me.cbxSAAbfertigung.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!)
+        Me.cbxSAAbfertigung.Location = New System.Drawing.Point(284, 492)
+        Me.cbxSAAbfertigung.Name = "cbxSAAbfertigung"
+        Me.cbxSAAbfertigung.Size = New System.Drawing.Size(255, 24)
+        Me.cbxSAAbfertigung.TabIndex = 14
+        Me.cbxSAAbfertigung.Text = "SA-Abfertigungs E-Mail (Suben)"
+        Me.cbxSAAbfertigung.UseVisualStyleBackColor = True
+        Me.cbxSAAbfertigung.Visible = False
         '
         'frmLaufzettel
         '
@@ -385,14 +398,14 @@ Partial Class frmLaufzettel
         Me.Name = "frmLaufzettel"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Laufzettel"
-        CType(Me.dgvLaufzettelDruck, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.pnl.ResumeLayout(False)
-        CType(Me.dgvDigitalMailanfügen, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.pnl.PerformLayout()
         Me.MyPanel1.ResumeLayout(False)
         Me.MyPanel1.PerformLayout()
         Me.pnlZumZoll.ResumeLayout(False)
         Me.pnlZumZoll.PerformLayout()
-        Me.pnl.ResumeLayout(False)
+        CType(Me.dgvDigitalMailanfügen, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.pnl.PerformLayout()
+        CType(Me.dgvLaufzettelDruck, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -424,4 +437,5 @@ Partial Class frmLaufzettel
     Friend WithEvents Button2 As Button
     Friend WithEvents cboPrinter As VERAG_PROG_ALLGEMEIN.MyComboBox
     Friend WithEvents Button4 As Button
+    Friend WithEvents cbxSAAbfertigung As CheckBox
 End Class

Aviso/frmLaufzettel.resx

@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="clmnLzMail_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clmnLzMail_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DocId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="clmnLzPrint_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -129,15 +138,6 @@
   <metadata name="printTyp.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="clmnLzMail_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="clmnLzMail_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DocId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Aviso/frmLaufzettel.vb

@@ -158,6 +158,7 @@ Public Class frmLaufzettel
             btnDIGITAL.Enabled = True
             cbxDigitalLZ.Checked = True
             CheckBox2.Checked = False
+            cbxDokumenteDrucken.Checked = False
             pnlZumZoll.Visible = False
         Else
             btnLaufzettelDrucken.Enabled = True
@@ -171,6 +172,12 @@ Public Class frmLaufzettel
             End Select
 
 
+        If AVISO.Grenzstelle = "SUB" Then
+            cbxSAAbfertigung.Visible = True
+            If Now.DayOfWeek = DayOfWeek.Saturday Then
+                cbxSAAbfertigung.Checked = True
+            End If
+        End If
         'pnlZumZoll
         If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "DTB" Then
             CheckBox2.Checked = False ' Wenn nicht FO, dann normal nicht gewählt...
@@ -375,7 +382,11 @@ Public Class frmLaufzettel
                     Dim tX As VERAG_PROG_ALLGEMEIN.cTextkonserve = Nothing
                     Select Case AVISO.Grenzstelle
                         Case "SUB"
+                            If cbxSAAbfertigung.Checked Then
+                                Mail.To = "samstag.ZA-Suben@zoll.bund.de"
+                            Else
                                 Mail.To = "abfertigung.za-suben@zoll.bund.de"
+                            End If
                             tX = New VERAG_PROG_ALLGEMEIN.cTextkonserve("LAUFZETTEL_DIGITAL", "LAUFZETTEL_DE_DIGITAL_SUB", "DE", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
                         Case "WAI"
                             Mail.To = ""
@@ -483,7 +494,7 @@ Public Class frmLaufzettel
             End Try
 
         Else
-            Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False)
+            Dim path = SDL.FormularManagerNEU.LaufzettelZollDE(AvisoID, False,, digitalDruck)
             If path <> "" Then
                 'Process.Start(path)
                 VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString)
@@ -524,9 +535,9 @@ Public Class frmLaufzettel
 
 
         paths = New List(Of String)
-        If pruef Then paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, "XXXX"))
+        If pruef Then paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, "XXXX", digitalDruck))
         For Each VP In VP_Enum
-            paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, VP))
+            paths.Add(SDL.FormularManagerNEU.LaufzettelZollDE_VP(AvisoID, False,, VP, digitalDruck))
         Next
 
         Return True