Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

This commit is contained in:
2025-05-16 09:28:58 +02:00
3 changed files with 104 additions and 94 deletions

View File

@@ -23,12 +23,12 @@ Partial Class usrCntlSpeditionsBuchSuche
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche))
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -75,6 +75,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.KundenauswertungenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.cboHandlingssatz = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -240,7 +241,7 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24) Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungsdetailsÖffnenToolStripMenuItem, Me.EintragLöschenToolStripMenuItem}) Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungsdetailsÖffnenToolStripMenuItem, Me.EintragLöschenToolStripMenuItem})
Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch" Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch"
Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(199, 70) Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(199, 48)
Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch" Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch"
' '
'SendungsdetailsÖffnenToolStripMenuItem 'SendungsdetailsÖffnenToolStripMenuItem
@@ -666,35 +667,35 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.DataGridView.AllowUserToDeleteRows = False Me.DataGridView.AllowUserToDeleteRows = False
Me.DataGridView.AllowUserToOrderColumns = True Me.DataGridView.AllowUserToOrderColumns = True
Me.DataGridView.AllowUserToResizeRows = False Me.DataGridView.AllowUserToResizeRows = False
DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.DataGridView.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7
Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch Me.DataGridView.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle2 Me.DataGridView.DefaultCellStyle = DataGridViewCellStyle8
Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill
Me.DataGridView.Location = New System.Drawing.Point(450, 0) Me.DataGridView.Location = New System.Drawing.Point(450, 0)
Me.DataGridView.Name = "DataGridView" Me.DataGridView.Name = "DataGridView"
DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.DataGridView.RowHeadersDefaultCellStyle = DataGridViewCellStyle9
Me.DataGridView.Size = New System.Drawing.Size(770, 200) Me.DataGridView.Size = New System.Drawing.Size(770, 200)
Me.DataGridView.TabIndex = 0 Me.DataGridView.TabIndex = 0
' '
@@ -721,35 +722,35 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.dgvLKW.AllowUserToOrderColumns = True Me.dgvLKW.AllowUserToOrderColumns = True
Me.dgvLKW.AllowUserToResizeRows = False Me.dgvLKW.AllowUserToResizeRows = False
Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke Me.dgvLKW.BackgroundColor = System.Drawing.Color.WhiteSmoke
DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvLKW.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLKW.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch Me.dgvLKW.ContextMenuStrip = Me.cntxtCntxtSpeditionsbuch
DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle5 Me.dgvLKW.DefaultCellStyle = DataGridViewCellStyle2
Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left Me.dgvLKW.Dock = System.Windows.Forms.DockStyle.Left
Me.dgvLKW.Location = New System.Drawing.Point(0, 0) Me.dgvLKW.Location = New System.Drawing.Point(0, 0)
Me.dgvLKW.Name = "dgvLKW" Me.dgvLKW.Name = "dgvLKW"
DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.dgvLKW.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
Me.dgvLKW.Size = New System.Drawing.Size(450, 200) Me.dgvLKW.Size = New System.Drawing.Size(450, 200)
Me.dgvLKW.TabIndex = 35 Me.dgvLKW.TabIndex = 35
Me.dgvLKW.Visible = False Me.dgvLKW.Visible = False
@@ -922,14 +923,14 @@ Partial Class usrCntlSpeditionsBuchSuche
Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1}) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KundenauswertungenToolStripMenuItem1})
Me.MenuStrip1.Location = New System.Drawing.Point(715, 158) Me.MenuStrip1.Location = New System.Drawing.Point(715, 158)
Me.MenuStrip1.Name = "MenuStrip1" Me.MenuStrip1.Name = "MenuStrip1"
Me.MenuStrip1.Size = New System.Drawing.Size(163, 27) Me.MenuStrip1.Size = New System.Drawing.Size(283, 27)
Me.MenuStrip1.TabIndex = 89 Me.MenuStrip1.TabIndex = 89
Me.MenuStrip1.Text = "Kundenauswertungen" Me.MenuStrip1.Text = "Kundenauswertungen"
' '
'KundenauswertungenToolStripMenuItem1 'KundenauswertungenToolStripMenuItem1
' '
Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.KundenauswertungenToolStripMenuItem1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem, Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem}) Me.KundenauswertungenToolStripMenuItem1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem, Me.ZFSteyrZeitraumAuswählenToolStripMenuItem, Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem, Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem})
Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!) Me.KundenauswertungenToolStripMenuItem1.Font = New System.Drawing.Font("Segoe UI", 10.0!)
Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White Me.KundenauswertungenToolStripMenuItem1.ForeColor = System.Drawing.Color.White
Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1" Me.KundenauswertungenToolStripMenuItem1.Name = "KundenauswertungenToolStripMenuItem1"
@@ -940,14 +941,22 @@ Partial Class usrCntlSpeditionsBuchSuche
' '
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image = CType(resources.GetObject("ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Image"), System.Drawing.Image)
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Name = "ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem"
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)" Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Text = "ZF Passau (Zeitraum auswählen)"
Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False Me.ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Visible = False
' '
'ZFSteyrZeitraumAuswählenToolStripMenuItem
'
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Name = "ZFSteyrZeitraumAuswählenToolStripMenuItem"
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
Me.ZFSteyrZeitraumAuswählenToolStripMenuItem.Text = "ZF Steyr (Zeitraum auswählen)"
'
'ZFThyrnauZeitraumAuswählenToolStripMenuItem 'ZFThyrnauZeitraumAuswählenToolStripMenuItem
' '
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem" Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Name = "ZFThyrnauZeitraumAuswählenToolStripMenuItem"
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)" Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Text = "ZF Thyrnau (Zeitraum auswählen)"
Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False Me.ZFThyrnauZeitraumAuswählenToolStripMenuItem.Visible = False
' '
@@ -955,7 +964,7 @@ Partial Class usrCntlSpeditionsBuchSuche
' '
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.Excel_logo
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem" Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Name = "FlenderBocholtZeitraumAuswählenToolStripMenuItem"
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(308, 24) Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Size = New System.Drawing.Size(316, 30)
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)" Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Text = "Flender Bocholt (Zeitraum auswählen)"
Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Visible = False Me.FlenderBocholtZeitraumAuswählenToolStripMenuItem.Visible = False
' '
@@ -3027,4 +3036,5 @@ Partial Class usrCntlSpeditionsBuchSuche
Friend WithEvents Button25 As Button Friend WithEvents Button25 As Button
Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents SendungsdetailsÖffnenToolStripMenuItem As ToolStripMenuItem Friend WithEvents SendungsdetailsÖffnenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ZFSteyrZeitraumAuswählenToolStripMenuItem As ToolStripMenuItem
End Class End Class

View File

@@ -174,40 +174,39 @@
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
AElFTkSuQmCC
</value> </value>
</data> </data>
</root> </root>

View File

@@ -2044,7 +2044,7 @@ Public Class usrCntlSpeditionsBuchSuche
End Select End Select
End Sub End Sub
Private Sub ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZFThyrnauZeitraumAuswählenToolStripMenuItem.Click, ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Click Private Sub ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZFThyrnauZeitraumAuswählenToolStripMenuItem.Click, ZFFriedrichshafenAGZeitraumAuswählenToolStripMenuItem.Click, ZFSteyrZeitraumAuswählenToolStripMenuItem.Click
lblKdAusFortschritt.Text = "lädt..." lblKdAusFortschritt.Text = "lädt..."
Me.Cursor = Cursors.WaitCursor Me.Cursor = Cursors.WaitCursor
Try Try
@@ -2055,6 +2055,8 @@ Public Class usrCntlSpeditionsBuchSuche
kdnrsrch = 714869 kdnrsrch = 714869
ElseIf sender Is ZFThyrnauZeitraumAuswählenToolStripMenuItem Then ElseIf sender Is ZFThyrnauZeitraumAuswählenToolStripMenuItem Then
kdnrsrch = 718486 kdnrsrch = 718486
ElseIf sender Is ZFSteyrZeitraumAuswählenToolStripMenuItem Then
kdnrsrch = 764755
End If End If
@@ -2074,7 +2076,7 @@ Public Class usrCntlSpeditionsBuchSuche
,BelegNr ,BelegNr
,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung ,[FilialenNr],[AbfertigungsNr],Speditionsbuch.Abfertigungsart,Abfertigungsbezeichnung
FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart FROM Speditionsbuch INNER JOIN [Abfertigungsarten] ON Speditionsbuch.Abfertigungsart=Abfertigungsarten.Abfertigungsart
where EmpfängerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29)", "FMZOLL") where EmpfängerKundenNr IN (" & kdnrsrch & ") and Abfertigungsdatum BETWEEN '" & txtAbfertDat.Text & "' AND '" & txtAbfertDatBis.Text & "' And Speditionsbuch.Abfertigungsart IN (1,29,38)", "FMZOLL")
Dim Path = "" Dim Path = ""
If dt IsNot Nothing And dt.Rows.Count > 0 Then If dt IsNot Nothing And dt.Rows.Count > 0 Then
@@ -2575,5 +2577,4 @@ Public Class usrCntlSpeditionsBuchSuche
End Sub End Sub
End Class End Class