From b1ba5c9700904ebc80532bd21b6af6bae6b45a5d Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 6 Sep 2024 14:55:56 +0200 Subject: [PATCH] Vermerke (AAS) --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/usrcntlAktDetails.Designer.vb | 202 ++++++++++++++-------------- Aviso/usrcntlAktDetails.vb | 107 ++++++++------- 3 files changed, 161 insertions(+), 152 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index c483ad8..254a862 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/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index bc0d264..833bb70 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -23,17 +23,17 @@ Partial Class usrcntlAktDetails _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle15 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 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 resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrcntlAktDetails)) - Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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 DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnlDetailsRechts = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() Me.SplitContainer = New System.Windows.Forms.SplitContainer() @@ -65,6 +65,8 @@ Partial Class usrcntlAktDetails Me.btnQuckScan = New System.Windows.Forms.Button() Me.picArrowDown = New System.Windows.Forms.PictureBox() Me.Panel4 = New System.Windows.Forms.Panel() + Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) + Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.Button2 = New System.Windows.Forms.Button() Me.cbxVPSplit = New System.Windows.Forms.CheckBox() Me.btnLZDruckDIGITAL = New System.Windows.Forms.Button() @@ -80,7 +82,6 @@ Partial Class usrcntlAktDetails Me.btnDipoListeEmail = New System.Windows.Forms.Button() Me.btnDispohaft = New System.Windows.Forms.Button() Me.cbxLZRg = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) - Me.cbxLZT1 = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.Button18 = New System.Windows.Forms.Button() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.pnlVermerkeTop = New System.Windows.Forms.Panel() @@ -174,7 +175,6 @@ Partial Class usrcntlAktDetails Me.btnÄndern = New System.Windows.Forms.Button() Me.btnTV = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() - Me.cbxLZDeFisk = New VERAG_PROG_ALLGEMEIN.MyCheckbox(Me.components) Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -605,46 +605,46 @@ Partial Class usrcntlAktDetails Me.dgvSendungen.AllowUserToAddRows = False Me.dgvSendungen.AllowUserToDeleteRows = False Me.dgvSendungen.AllowUserToResizeRows = False - DataGridViewCellStyle11.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.dgvSendungen.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle12.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 Me.dgvSendungen.ColumnHeadersHeight = 34 Me.dgvSendungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle13 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.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.ControlText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvSendungen.DefaultCellStyle = DataGridViewCellStyle3 Me.dgvSendungen.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvSendungen.Location = New System.Drawing.Point(0, 0) Me.dgvSendungen.MultiSelect = False Me.dgvSendungen.Name = "dgvSendungen" Me.dgvSendungen.ReadOnly = True - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.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)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.dgvSendungen.RowHeadersVisible = False Me.dgvSendungen.RowHeadersWidth = 62 Me.dgvSendungen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvSendungen.RowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvSendungen.RowTemplate.Height = 20 Me.dgvSendungen.RowTemplate.ReadOnly = True Me.dgvSendungen.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -722,6 +722,35 @@ Partial Class usrcntlAktDetails Me.Panel4.TabIndex = 102 Me.Panel4.Visible = False ' + 'cbxLZDeFisk + ' + Me.cbxLZDeFisk._value = "" + Me.cbxLZDeFisk.AutoSize = True + Me.cbxLZDeFisk.Checked_value = False + Me.cbxLZDeFisk.CheckedValue = False + Me.cbxLZDeFisk.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.cbxLZDeFisk.Location = New System.Drawing.Point(205, 93) + Me.cbxLZDeFisk.Name = "cbxLZDeFisk" + Me.cbxLZDeFisk.Size = New System.Drawing.Size(62, 17) + Me.cbxLZDeFisk.TabIndex = 118 + Me.cbxLZDeFisk.Text = "DE Fisk" + Me.cbxLZDeFisk.UseVisualStyleBackColor = True + ' + 'cbxLZT1 + ' + Me.cbxLZT1._value = "" + Me.cbxLZT1.AutoSize = True + Me.cbxLZT1.Checked_value = False + Me.cbxLZT1.CheckedValue = False + Me.cbxLZT1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.cbxLZT1.Location = New System.Drawing.Point(172, 93) + Me.cbxLZT1.Name = "cbxLZT1" + Me.cbxLZT1.Size = New System.Drawing.Size(37, 17) + Me.cbxLZT1.TabIndex = 114 + Me.cbxLZT1.Text = "T1" + Me.cbxLZT1.UseVisualStyleBackColor = True + Me.cbxLZT1.Visible = False + ' 'Button2 ' Me.Button2.BackColor = System.Drawing.Color.White @@ -948,21 +977,6 @@ Partial Class usrcntlAktDetails Me.cbxLZRg.Text = "RG" Me.cbxLZRg.UseVisualStyleBackColor = True ' - 'cbxLZT1 - ' - Me.cbxLZT1._value = "" - Me.cbxLZT1.AutoSize = True - Me.cbxLZT1.Checked_value = False - Me.cbxLZT1.CheckedValue = False - Me.cbxLZT1.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.cbxLZT1.Location = New System.Drawing.Point(172, 93) - Me.cbxLZT1.Name = "cbxLZT1" - Me.cbxLZT1.Size = New System.Drawing.Size(37, 17) - Me.cbxLZT1.TabIndex = 114 - Me.cbxLZT1.Text = "T1" - Me.cbxLZT1.UseVisualStyleBackColor = True - Me.cbxLZT1.Visible = False - ' 'Button18 ' Me.Button18.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -983,46 +997,46 @@ Partial Class usrcntlAktDetails Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle16.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle17.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle7.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle7.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle7 Me.gridVermerke.ColumnHeadersHeight = 34 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.DefaultCellStyle = DataGridViewCellStyle8 Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 30) Me.gridVermerke.MultiSelect = False Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle9 Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidth = 62 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1985,7 +1999,7 @@ Partial Class usrcntlAktDetails Me.conMenuVermerke.ImageScalingSize = New System.Drawing.Size(24, 24) Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkEntgLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem, Me.conVermerkLöschenNew}) Me.conMenuVermerke.Name = "conMenuVermerke" - Me.conMenuVermerke.Size = New System.Drawing.Size(252, 184) + Me.conMenuVermerke.Size = New System.Drawing.Size(252, 206) ' 'conVermerkEntgLöschen ' @@ -2013,7 +2027,7 @@ Partial Class usrcntlAktDetails Me.toolVkReminder.Image = Global.AVISO.My.Resources.Resources.urgent Me.toolVkReminder.Name = "toolVkReminder" Me.toolVkReminder.Size = New System.Drawing.Size(251, 30) - Me.toolVkReminder.Text = "VK: Reminder geschickt" + Me.toolVkReminder.Text = "Reminder geschickt" Me.toolVkReminder.Visible = False ' 'MitarbeiterAnzeigenToolStripMenuItem @@ -2245,20 +2259,6 @@ Partial Class usrcntlAktDetails Me.Button10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button10.UseVisualStyleBackColor = False ' - 'cbxLZDeFisk - ' - Me.cbxLZDeFisk._value = "" - Me.cbxLZDeFisk.AutoSize = True - Me.cbxLZDeFisk.Checked_value = False - Me.cbxLZDeFisk.CheckedValue = False - Me.cbxLZDeFisk.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) - Me.cbxLZDeFisk.Location = New System.Drawing.Point(205, 93) - Me.cbxLZDeFisk.Name = "cbxLZDeFisk" - Me.cbxLZDeFisk.Size = New System.Drawing.Size(62, 17) - Me.cbxLZDeFisk.TabIndex = 118 - Me.cbxLZDeFisk.Text = "DE Fisk" - Me.cbxLZDeFisk.UseVisualStyleBackColor = True - ' 'usrcntlAktDetails ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 0653ee5..2a76335 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -443,6 +443,7 @@ Public Class usrcntlAktDetails .Columns("Datum").Width = 125 '110 .Columns("Datum").HeaderText = "Datum" .Columns("Datum").DefaultCellStyle.Format = "dd.MM. HH:mm (ddd)" + .Columns("DatumValue").Visible = False .Columns("Hinweis_Vermerk_Anzeige").MinimumWidth = 150 @@ -868,10 +869,10 @@ Public Class usrcntlAktDetails End Sub Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & - " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben" & + " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & - " WHERE AvisoID = [[AvisoId]] [[sendwhere]] " & + " WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " & " order by /*VermerkArt ASC,tblSnd_PosUnterNr,*/Datum DESC " Private Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1) If Not loaded Then Exit Sub @@ -1335,37 +1336,37 @@ Public Class usrcntlAktDetails Select Case CInt(r.Cells("VermerkeCode").Value) Case 1 - If Not existCodeInGridVermerke(gridvermerke, 2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Auftrag erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Auftrag erhalten' einzutragen." End If Case 3 - If Not existCodeInGridVermerke(gridvermerke, 4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Rechnung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rechnung erhalten' einzutragen." End If Case 5 - If Not existCodeInGridVermerke(gridvermerke, 6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "LS erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'LS erhalten' einzutragen." End If Case 7 - If Not existCodeInGridVermerke(gridvermerke, 8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATR erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATR erhalten' einzutragen." End If Case 9 - If Not existCodeInGridVermerke(gridvermerke, 10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Vollmacht erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vollmacht erhalten' einzutragen." End If Case 11 - If Not existCodeInGridVermerke(gridvermerke, 12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "CMR erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." End If Case 90 - If Not existCodeInGridVermerke(gridvermerke, 93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Packliste erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Packliste erhalten' einzutragen." End If @@ -1385,32 +1386,32 @@ Public Class usrcntlAktDetails End If End If Case 17 - If Not existCodeInGridVermerke(gridvermerke, 18) Then + If Not existCodeInGridVermerke(r, gridvermerke, 18) Then optionCell.Value = "DE-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL fertig' einzutragen." End If Case 19 - If Not existCodeInGridVermerke(gridvermerke, 20) Then + If Not existCodeInGridVermerke(r, gridvermerke, 20) Then optionCell.Value = "AT-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'AT-ZOLL fertig' einzutragen." End If Case 25 - If Not existCodeInGridVermerke(gridvermerke, 30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Dokument erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dokument erhalten' einzutragen." End If Case 31 - If Not existCodeInGridVermerke(gridvermerke, 32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Vorbereitung abgeschlossen" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorbereitung abgeschlossen' einzutragen." End If Case 33 - If Not existCodeInGridVermerke(gridvermerke, 34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATA-Nr. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATA-Nr. erhalten' einzutragen." End If Case 36 - If Not existCodeInGridVermerke(gridvermerke, 37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Kontaktdaten erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen." End If @@ -1447,46 +1448,46 @@ Public Class usrcntlAktDetails End Select End If Case 53 - If Not existCodeInGridVermerke(gridvermerke, 54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Ü-Dok erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen." End If Case 55 - If Not existCodeInGridVermerke(gridvermerke, 56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Rg-Best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen." End If Case 57 - If Not existCodeInGridVermerke(gridvermerke, 58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Dispoliste erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dispoliste erhalten' einzutragen." End If Case 74 - If Not existCodeInGridVermerke(gridvermerke, 75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Frachtkosten erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Frachtkosten erhalten' einzutragen." End If Case 76 - If Not existCodeInGridVermerke(gridvermerke, 77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Absend.best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." End If Case 96 - If Not existCodeInGridVermerke(gridvermerke, 97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "T1 Bestätigung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1 Bestätigung erhalten' einzutragen." End If Case 80 - If Not existCodeInGridVermerke(gridvermerke, 81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATB-Nr. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen." End If Case 82 - If Not existCodeInGridVermerke(gridvermerke, 83) Then + If Not existCodeInGridVermerke(r, gridvermerke, 83) Then optionCell.Value = "DE-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL (DIGITAL) fertig' einzutragen." End If @@ -1499,17 +1500,17 @@ Public Class usrcntlAktDetails optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Sonstiger Grund erledigt' einzutragen." End If Case 103 - If Not existCodeInGridVermerke(gridvermerke, 104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Gewicht/Packstücke erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Gewicht/Packstücke erhalten' einzutragen." End If Case 105 - If Not existCodeInGridVermerke(gridvermerke, 106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Zolltarifnummer erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Zolltarifnummer erhalten' einzutragen." End If Case 107 - If Not existCodeInGridVermerke(gridvermerke, 108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(r, gridvermerke, 108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Kostenbestätigung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen." End If @@ -1547,28 +1548,33 @@ Public Class usrcntlAktDetails End Select End Sub - Shared Function existCodeInGridVermerke(gridVermerke As DataGridView, code As Integer, Optional text As String = "") As Boolean - - For Each r As DataGridViewRow In gridVermerke.Rows - If r.Cells("Geloescht").Value = False Then - If DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString = CStr(code) Then - Select Case code - Case 59 - Return True - Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34 - If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then - Return True - End If - Case 32 - If DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("Vorbereitung abgeschlossen", "in Vorbereitung") = text Then - Return True - End If - Case Else - Return True - End Select - End If + Shared Function existCodeInGridVermerke(row As DataGridViewRow, gridVermerke As DataGridView, code As Integer, Optional text As String = "") As Boolean + If row.Cells("Datum").Value >= "09.09.2024" Then + If row.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then + Return False End If - Next + Else + For Each r As DataGridViewRow In gridVermerke.Rows + If r.Cells("Geloescht").Value = False Then + If DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString = CStr(code) Then + Select Case code + Case 59 + Return True + Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34 + If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then + Return True + End If + Case 32 + If DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("Vorbereitung abgeschlossen", "in Vorbereitung") = text Then + Return True + End If + Case Else + Return True + End Select + End If + End If + Next + End If Return False End Function @@ -1764,7 +1770,8 @@ Public Class usrcntlAktDetails conMenuVermerke.Show(Cursor.Position) ToolUeberweisungsBeleg.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13") - toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13") + toolVkReminder.Visible = True '(gridVermerke.SelectedRows(0).Cells("VermerkeCode").Value = "13") + ' toolVkReminder.Visible = (gridVermerke.SelectedRows(0).Cells("VermerkIDAufgehoben").Value Is DBNull.Value) End If Case 3 @@ -3667,8 +3674,10 @@ Public Class usrcntlAktDetails Dim AvisoId_Tmp = gridVermerke.SelectedRows(0).Cells("AvisoId").Value Dim SendungID_Tmp = gridVermerke.SelectedRows(0).Cells("SendungID").Value + If sender Is toolVkReminder Then - AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value) + Dim VermerkTxt = gridVermerke.SelectedRows(0).Cells("Hinweis_Vermerk").Value + AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "REMINDER: " & VermerkTxt, 78,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value) ElseIf sender Is ToolUeberweisungsBeleg Then AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value) End If