diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 1d5e484..e4b9f4b 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: ' - - + + diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 4d7eddc..51877c3 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -601,7 +601,7 @@ Partial Class frmSendungsdetailsNEU Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(1235, 883) + Me.pnl.Size = New System.Drawing.Size(1235, 881) Me.pnl.TabIndex = 0 ' 'Panel4 @@ -611,7 +611,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(0, 462) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(1235, 334) + Me.Panel4.Size = New System.Drawing.Size(1235, 332) Me.Panel4.TabIndex = 2 ' 'TabControl1 @@ -631,7 +631,7 @@ Partial Class frmSendungsdetailsNEU Me.TabControl1.Name = "TabControl1" Me.TabControl1.Padding = New System.Drawing.Point(12, 5) Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(1235, 331) + Me.TabControl1.Size = New System.Drawing.Size(1235, 329) Me.TabControl1.TabIndex = 1 ' 'tbKundenInfo @@ -642,7 +642,7 @@ Partial Class frmSendungsdetailsNEU Me.tbKundenInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.tbKundenInfo.Location = New System.Drawing.Point(4, 29) Me.tbKundenInfo.Name = "tbKundenInfo" - Me.tbKundenInfo.Size = New System.Drawing.Size(1227, 298) + Me.tbKundenInfo.Size = New System.Drawing.Size(1227, 296) Me.tbKundenInfo.TabIndex = 5 Me.tbKundenInfo.Text = "Kundeninfo" Me.tbKundenInfo.UseVisualStyleBackColor = True @@ -654,7 +654,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlKundenInfo.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlKundenInfo.Location = New System.Drawing.Point(0, 10) Me.pnlKundenInfo.Name = "pnlKundenInfo" - Me.pnlKundenInfo.Size = New System.Drawing.Size(1227, 288) + Me.pnlKundenInfo.Size = New System.Drawing.Size(1227, 286) Me.pnlKundenInfo.TabIndex = 1 ' 'Panel20 @@ -1042,7 +1042,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -1050,7 +1050,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -1058,7 +1058,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem10.Enabled = False Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(102, 30) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -5490,7 +5490,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel7.Controls.Add(Me.Panel3) Me.Panel7.Controls.Add(Me.Panel9) Me.Panel7.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel7.Location = New System.Drawing.Point(0, 796) + Me.Panel7.Location = New System.Drawing.Point(0, 794) Me.Panel7.MinimumSize = New System.Drawing.Size(0, 51) Me.Panel7.Name = "Panel7" Me.Panel7.Size = New System.Drawing.Size(1235, 87) @@ -6494,7 +6494,7 @@ Partial Class frmSendungsdetailsNEU Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoScroll = True Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(1235, 883) + Me.ClientSize = New System.Drawing.Size(1235, 881) Me.Controls.Add(Me.pnl) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index c75ff58..74b7bdf 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -384,32 +384,32 @@ Public Class frmSendungsdetailsNEU rtbValidierung.Text &= err & vbNewLine : pnlValidation.Visible = True End If - Dim isATB = SENDUNG_LIST.Any(Function(r) r.tblSnd_Abfertigungsart_ID = 44) + 'Dim isATB = SENDUNG_LIST.Any(Function(r) r.tblSnd_Abfertigungsart_ID = 44) - If isATB Then + 'If isATB Then - Dim invalidSendung = SENDUNG_LIST.FirstOrDefault(Function(r) r.tblSnd_Abfertigungsart_ID <> 44 AndAlso ((String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier) OrElse - String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier_Pos)) OrElse - ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse - Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos)) AndAlso - (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse - String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos))) OrElse - ((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse - Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos)) AndAlso - (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse - String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos))))) + ' Dim invalidSendung = SENDUNG_LIST.FirstOrDefault(Function(r) r.tblSnd_Abfertigungsart_ID <> 44 AndAlso ((String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier) OrElse + ' String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier_Pos)) OrElse + '((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse + ' Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos)) AndAlso + ' (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2) OrElse + ' String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier2_Pos))) OrElse + '((Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse + ' Not String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos)) AndAlso + ' (String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3) OrElse + ' String.IsNullOrWhiteSpace(r.tblSnd_Vorpapier3_Pos))))) - If invalidSendung IsNot Nothing Then - If MsgBox("Sendung-ID: " & invalidSendung.tblSnd_SendungID & vbCrLf & - "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig." & - vbCrLf & vbCrLf & - "Möchten Sie trotzdem fortfahren?", - MsgBoxStyle.YesNo Or MsgBoxStyle.Exclamation) = MsgBoxResult.No Then - Return False - End If - End If + ' If invalidSendung IsNot Nothing Then + ' If MsgBox("Sendung-ID: " & invalidSendung.tblSnd_SendungID & vbCrLf & + ' "Vorpapier-Nr/PosNr ist ungültig oder nicht vollständig." & + ' vbCrLf & vbCrLf & + ' "Möchten Sie trotzdem fortfahren?", + ' MsgBoxStyle.YesNo Or MsgBoxStyle.Exclamation) = MsgBoxResult.No Then + ' Return False + ' End If + ' End If - End If + 'End If