diff --git a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb index 28f35a6a..db99017e 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.Designer.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.Designer.vb @@ -110,6 +110,7 @@ Partial Class frmMDM_USTVAntrag Me.Button3 = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.Button4 = New System.Windows.Forms.Button() Me.pnlBottom.SuspendLayout() CType(Me.picPDF, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlHeader.SuspendLayout() @@ -136,6 +137,7 @@ Partial Class frmMDM_USTVAntrag ' Me.pnlBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.pnlBottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlBottom.Controls.Add(Me.Button4) Me.pnlBottom.Controls.Add(Me.picPDF) Me.pnlBottom.Controls.Add(Me.btnMail) Me.pnlBottom.Controls.Add(Me.btnAntrageeinarbeiten) @@ -151,7 +153,7 @@ Partial Class frmMDM_USTVAntrag 'picPDF ' Me.picPDF.Image = Global.SDL.My.Resources.Resources.pdf - Me.picPDF.Location = New System.Drawing.Point(972, 29) + Me.picPDF.Location = New System.Drawing.Point(865, 30) Me.picPDF.Name = "picPDF" Me.picPDF.Size = New System.Drawing.Size(50, 50) Me.picPDF.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -163,7 +165,7 @@ Partial Class frmMDM_USTVAntrag Me.btnMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMail.ForeColor = System.Drawing.Color.Black Me.btnMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMail.Location = New System.Drawing.Point(1067, 30) + Me.btnMail.Location = New System.Drawing.Point(1109, 30) Me.btnMail.Name = "btnMail" Me.btnMail.Size = New System.Drawing.Size(103, 39) Me.btnMail.TabIndex = 26 @@ -1357,6 +1359,18 @@ Partial Class frmMDM_USTVAntrag Me.ContextMenuStrip2.Name = "ContextMenuStrip1" Me.ContextMenuStrip2.Size = New System.Drawing.Size(61, 4) ' + 'Button4 + ' + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.ForeColor = System.Drawing.Color.Black + Me.Button4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button4.Location = New System.Drawing.Point(979, 30) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(103, 39) + Me.Button4.TabIndex = 28 + Me.Button4.Text = "Sped.-Buch eintragen" + Me.Button4.UseVisualStyleBackColor = True + ' 'frmMDM_USTVAntrag ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1484,4 +1498,5 @@ Partial Class frmMDM_USTVAntrag Friend WithEvents Panel1 As Panel Friend WithEvents Button2 As Button Friend WithEvents Button3 As Button + Friend WithEvents Button4 As Button End Class diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index fc9e7d41..5e0ab6c3 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2055,7 +2055,30 @@ Public Class frmMDM_USTVAntrag End If End Sub + Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click + USTV_ANTRAG.SAVE() + If IsDBNull(USTV_ANTRAG.FilialenNr) Then MsgBox("Für das Speditionsbuch muss die Filiale eingegeben werden.") : Exit Sub + If IsDBNull(USTV_ANTRAG.AbfertigungsNr) Then MsgBox("Für das Speditionsbuch muss die Abfertigungs-Nr eingegeben werden.") : Exit Sub + Dim spedBuch As New cSpeditionsbuch(USTV_ANTRAG.FilialenNr, USTV_ANTRAG.AbfertigungsNr) + + If spedBuch.hasEntry Then MsgBox("Es existiert bereits ein Speditionsbucheintrag!" & vbNewLine & "Vorgang wird abgebrochen ") : Exit Sub + + With spedBuch + .UnterNr = 0 + .Abfertigungsdatum = Today() + .AvisUhrzeit = Now() + .Sachbearbeiter = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME + .ErfassungsNr = USTV_ANTRAG.UStVAn_ID + .AnzahlSonstiges = 1 + .Abfertigungsart = 10 + .Abfertigungsanzahl = 1 + .Packstücke = "Mehrwertsteuerrückerstattung " & USTV_ANTRAG.UStVAn_LandKz & " / " & USTV_ANTRAG.UStVAn_ReDatVon & " - " & USTV_ANTRAG.UStVAn_ReDatBis + .VermittlerKundenNr = KundenNr + If .SAVE() Then MsgBox("Sped-Eintrag wurde angelegt") + + End With + End Sub Private Sub initdgvErstattungen()