From f096b224b26de58218e111bf277304ace94fbb18 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 9 Aug 2024 09:53:26 +0200 Subject: [PATCH 1/2] sendungsdet. --- Aviso/frmSendungsdetailsNEU.Designer.vb | 713 ++++++++++++------------ Aviso/frmSendungsdetailsNEU.vb | 101 +++- 2 files changed, 446 insertions(+), 368 deletions(-) diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 0b49048..1b4d183 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -127,7 +127,6 @@ Partial Class frmSendungsdetailsNEU Me.Label25 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() Me.TabPage3 = New System.Windows.Forms.TabPage() - Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.tbATEZ = New System.Windows.Forms.TabPage() Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() @@ -240,35 +239,10 @@ Partial Class frmSendungsdetailsNEU Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button4 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() - Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() Me.lblSonstigesKosten = New System.Windows.Forms.Label() Me.btnAufschub_Atr = New System.Windows.Forms.Button() Me.btnAufschub_Empf = New System.Windows.Forms.Button() Me.btnAufschub_VERAG = New System.Windows.Forms.Button() - Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() Me.Panel15 = New System.Windows.Forms.Panel() Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox() @@ -281,7 +255,6 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblFrachtfuehrer = New System.Windows.Forms.Label() Me.pnlT1 = New System.Windows.Forms.Panel() - Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.Label43 = New System.Windows.Forms.Label() Me.lblAbsender = New System.Windows.Forms.Label() Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -464,6 +437,33 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.timerValidation = New System.Windows.Forms.Timer(Me.components) + Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() + Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() + Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -992,7 +992,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(101, 30) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(93, 22) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -1000,7 +1000,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(101, 30) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(93, 22) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -1008,7 +1008,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(101, 30) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(93, 22) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -1046,7 +1046,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(95, 22) Me.ToolStripMenuItem20.Text = "EZA" ' 'ToolStripMenuItem18 @@ -1055,7 +1055,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(95, 22) Me.ToolStripMenuItem18.Text = "T1" ' 'ToolStripMenuItem19 @@ -1064,7 +1064,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(95, 22) Me.ToolStripMenuItem19.Text = "T2" ' 'ToolStripMenuItem21 @@ -1081,7 +1081,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem22.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem22.Name = "ToolStripMenuItem22" - Me.ToolStripMenuItem22.Size = New System.Drawing.Size(184, 30) + Me.ToolStripMenuItem22.Size = New System.Drawing.Size(176, 22) Me.ToolStripMenuItem22.Text = "MIC Import senden" ' 'ToolStripMenuItem23 @@ -1089,7 +1089,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem23.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem23.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23" - Me.ToolStripMenuItem23.Size = New System.Drawing.Size(184, 30) + Me.ToolStripMenuItem23.Size = New System.Drawing.Size(176, 22) Me.ToolStripMenuItem23.Text = "MIC Transit senden" ' 'ToolStripMenuItem24 @@ -1098,7 +1098,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem24.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem24.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem24.Name = "ToolStripMenuItem24" - Me.ToolStripMenuItem24.Size = New System.Drawing.Size(184, 30) + Me.ToolStripMenuItem24.Size = New System.Drawing.Size(176, 22) Me.ToolStripMenuItem24.Text = "MIC Export senden" ' 'ToolStripMenuItem31 @@ -1555,13 +1555,6 @@ Partial Class frmSendungsdetailsNEU Me.TabPage3.Text = "Vermerke" Me.TabPage3.UseVisualStyleBackColor = True ' - 'RCntrlVermerke1 - ' - Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18) - Me.RCntrlVermerke1.Name = "RCntrlVermerke1" - Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208) - Me.RCntrlVermerke1.TabIndex = 1 - ' 'gridVermerke ' Me.gridVermerke.AllowUserToAddRows = False @@ -3349,66 +3342,6 @@ Partial Class frmSendungsdetailsNEU Me.Button1.Text = "BAR - Beleg" Me.Button1.UseVisualStyleBackColor = False ' - 'cntlFrachtfuehrer_Sonst - ' - Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" - Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" - Me.cntlFrachtfuehrer_Sonst._readOnly = True - Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) - Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" - Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 - Me.cntlFrachtfuehrer_Sonst.TabStop = False - Me.cntlFrachtfuehrer_Sonst.value = "" - ' - 'cntlAbsender_Sonst - ' - Me.cntlAbsender_Sonst._abrArt = "SONST" - Me.cntlAbsender_Sonst._beteiligter = "ABS" - Me.cntlAbsender_Sonst._readOnly = True - Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) - Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" - Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Sonst.TabIndex = 68 - Me.cntlAbsender_Sonst.TabStop = False - Me.cntlAbsender_Sonst.value = "" - ' - 'cntlEmpfaenger_Sonst - ' - Me.cntlEmpfaenger_Sonst._abrArt = "SONST" - Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" - Me.cntlEmpfaenger_Sonst._readOnly = True - Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) - Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" - Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpfaenger_Sonst.TabIndex = 53 - Me.cntlEmpfaenger_Sonst.TabStop = False - Me.cntlEmpfaenger_Sonst.value = "" - ' - 'cntlAuftraggeber_Sonst - ' - Me.cntlAuftraggeber_Sonst._abrArt = "SONST" - Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" - Me.cntlAuftraggeber_Sonst._readOnly = True - Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) - Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" - Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftraggeber_Sonst.TabIndex = 36 - Me.cntlAuftraggeber_Sonst.TabStop = False - Me.cntlAuftraggeber_Sonst.value = "" - ' - 'cntlAvisierer_Sonst - ' - Me.cntlAvisierer_Sonst._abrArt = "SONST" - Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" - Me.cntlAvisierer_Sonst._readOnly = True - Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) - Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" - Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Sonst.TabIndex = 21 - Me.cntlAvisierer_Sonst.TabStop = False - Me.cntlAvisierer_Sonst.value = "" - ' 'lblSonstigesKosten ' Me.lblSonstigesKosten.AutoSize = True @@ -3476,246 +3409,6 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_VERAG.UseVisualStyleBackColor = False Me.btnAufschub_VERAG.Visible = False ' - 'cntlFrachtf_Clear - ' - Me.cntlFrachtf_Clear._abrArt = "CLEARING" - Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" - Me.cntlFrachtf_Clear._readOnly = False - Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) - Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" - Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Clear.TabIndex = 81 - Me.cntlFrachtf_Clear.TabStop = False - Me.cntlFrachtf_Clear.value = "" - ' - 'cntlFrachtf_Abf - ' - Me.cntlFrachtf_Abf._abrArt = "ABFKOST" - Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" - Me.cntlFrachtf_Abf._readOnly = False - Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) - Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" - Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Abf.TabIndex = 80 - Me.cntlFrachtf_Abf.TabStop = False - Me.cntlFrachtf_Abf.value = "" - ' - 'cntlFrachtf_Eust - ' - Me.cntlFrachtf_Eust._abrArt = "EUST" - Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" - Me.cntlFrachtf_Eust._readOnly = False - Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) - Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" - Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Eust.TabIndex = 79 - Me.cntlFrachtf_Eust.TabStop = False - Me.cntlFrachtf_Eust.value = "" - ' - 'cntlFrachtf_Zoll - ' - Me.cntlFrachtf_Zoll._abrArt = "ZOLL" - Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" - Me.cntlFrachtf_Zoll._readOnly = False - Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) - Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" - Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Zoll.TabIndex = 78 - Me.cntlFrachtf_Zoll.TabStop = False - Me.cntlFrachtf_Zoll.value = "" - ' - 'cntlAbsender_Clear - ' - Me.cntlAbsender_Clear._abrArt = "CLEARING" - Me.cntlAbsender_Clear._beteiligter = "ABS" - Me.cntlAbsender_Clear._readOnly = False - Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) - Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" - Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Clear.TabIndex = 67 - Me.cntlAbsender_Clear.TabStop = False - Me.cntlAbsender_Clear.value = "" - ' - 'cntlAbsender_Abf - ' - Me.cntlAbsender_Abf._abrArt = "ABFKOST" - Me.cntlAbsender_Abf._beteiligter = "ABS" - Me.cntlAbsender_Abf._readOnly = False - Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) - Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" - Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Abf.TabIndex = 66 - Me.cntlAbsender_Abf.TabStop = False - Me.cntlAbsender_Abf.value = "" - ' - 'cntlAbsender_Eust - ' - Me.cntlAbsender_Eust._abrArt = "EUST" - Me.cntlAbsender_Eust._beteiligter = "ABS" - Me.cntlAbsender_Eust._readOnly = False - Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) - Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" - Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Eust.TabIndex = 65 - Me.cntlAbsender_Eust.TabStop = False - Me.cntlAbsender_Eust.value = "" - ' - 'cntlAbsender_Zoll - ' - Me.cntlAbsender_Zoll._abrArt = "ZOLL" - Me.cntlAbsender_Zoll._beteiligter = "ABS" - Me.cntlAbsender_Zoll._readOnly = False - Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) - Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" - Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Zoll.TabIndex = 64 - Me.cntlAbsender_Zoll.TabStop = False - Me.cntlAbsender_Zoll.value = "" - ' - 'cntlEmpf_Clear - ' - Me.cntlEmpf_Clear._abrArt = "CLEARING" - Me.cntlEmpf_Clear._beteiligter = "EMPF" - Me.cntlEmpf_Clear._readOnly = False - Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) - Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" - Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Clear.TabIndex = 52 - Me.cntlEmpf_Clear.TabStop = False - Me.cntlEmpf_Clear.value = "" - ' - 'cntlEmpf_Abf - ' - Me.cntlEmpf_Abf._abrArt = "ABFKOST" - Me.cntlEmpf_Abf._beteiligter = "EMPF" - Me.cntlEmpf_Abf._readOnly = False - Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) - Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" - Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Abf.TabIndex = 51 - Me.cntlEmpf_Abf.TabStop = False - Me.cntlEmpf_Abf.value = "" - ' - 'cntlEmpf_Eust - ' - Me.cntlEmpf_Eust._abrArt = "EUST" - Me.cntlEmpf_Eust._beteiligter = "EMPF" - Me.cntlEmpf_Eust._readOnly = False - Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) - Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" - Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Eust.TabIndex = 50 - Me.cntlEmpf_Eust.TabStop = False - Me.cntlEmpf_Eust.value = "" - ' - 'cntlEmpf_Zoll - ' - Me.cntlEmpf_Zoll._abrArt = "ZOLL" - Me.cntlEmpf_Zoll._beteiligter = "EMPF" - Me.cntlEmpf_Zoll._readOnly = False - Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) - Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" - Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Zoll.TabIndex = 49 - Me.cntlEmpf_Zoll.TabStop = False - Me.cntlEmpf_Zoll.value = "" - ' - 'cntlAuftr_Clear - ' - Me.cntlAuftr_Clear._abrArt = "CLEARING" - Me.cntlAuftr_Clear._beteiligter = "AUFTR" - Me.cntlAuftr_Clear._readOnly = False - Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) - Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" - Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Clear.TabIndex = 35 - Me.cntlAuftr_Clear.TabStop = False - Me.cntlAuftr_Clear.value = "" - ' - 'cntlAuftr_Abf - ' - Me.cntlAuftr_Abf._abrArt = "ABFKOST" - Me.cntlAuftr_Abf._beteiligter = "AUFTR" - Me.cntlAuftr_Abf._readOnly = False - Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) - Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" - Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Abf.TabIndex = 34 - Me.cntlAuftr_Abf.TabStop = False - Me.cntlAuftr_Abf.value = "" - ' - 'cntlAuftr_Eust - ' - Me.cntlAuftr_Eust._abrArt = "EUST" - Me.cntlAuftr_Eust._beteiligter = "AUFTR" - Me.cntlAuftr_Eust._readOnly = False - Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) - Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" - Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Eust.TabIndex = 33 - Me.cntlAuftr_Eust.TabStop = False - Me.cntlAuftr_Eust.value = "" - ' - 'cntlAuftr_Zoll - ' - Me.cntlAuftr_Zoll._abrArt = "ZOLL" - Me.cntlAuftr_Zoll._beteiligter = "AUFTR" - Me.cntlAuftr_Zoll._readOnly = False - Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) - Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" - Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Zoll.TabIndex = 32 - Me.cntlAuftr_Zoll.TabStop = False - Me.cntlAuftr_Zoll.value = "" - ' - 'cntlAvisierer_Clear - ' - Me.cntlAvisierer_Clear._abrArt = "CLEARING" - Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" - Me.cntlAvisierer_Clear._readOnly = False - Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) - Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" - Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Clear.TabIndex = 20 - Me.cntlAvisierer_Clear.TabStop = False - Me.cntlAvisierer_Clear.value = "" - ' - 'cntlAvisierer_Abf - ' - Me.cntlAvisierer_Abf._abrArt = "ABFKOST" - Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" - Me.cntlAvisierer_Abf._readOnly = False - Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) - Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" - Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Abf.TabIndex = 19 - Me.cntlAvisierer_Abf.TabStop = False - Me.cntlAvisierer_Abf.value = "" - ' - 'cntlAvisierer_Eust - ' - Me.cntlAvisierer_Eust._abrArt = "EUST" - Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" - Me.cntlAvisierer_Eust._readOnly = False - Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) - Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" - Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Eust.TabIndex = 18 - Me.cntlAvisierer_Eust.TabStop = False - Me.cntlAvisierer_Eust.value = "" - ' - 'cntlAvisierer_Zoll - ' - Me.cntlAvisierer_Zoll._abrArt = "ZOLL" - Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" - Me.cntlAvisierer_Zoll._readOnly = False - Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) - Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" - Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Zoll.TabIndex = 17 - Me.cntlAvisierer_Zoll.TabStop = False - Me.cntlAvisierer_Zoll.value = "" - ' 'Panel15 ' Me.Panel15.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -3906,14 +3599,6 @@ Partial Class frmSendungsdetailsNEU Me.pnlT1.Size = New System.Drawing.Size(549, 118) Me.pnlT1.TabIndex = 86 ' - 'UsrCntlSND_NCTSGestellungsadresse1 - ' - Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" - Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) - Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 - ' 'Label43 ' Me.Label43.AutoSize = True @@ -4901,7 +4586,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.MaximumSize = New System.Drawing.Size(0, 510) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1214, 55) + Me.Panel2.Size = New System.Drawing.Size(0, 55) Me.Panel2.TabIndex = 0 ' 'FlowLayoutPanel @@ -4913,7 +4598,7 @@ Partial Class frmSendungsdetailsNEU Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(0, 550) Me.FlowLayoutPanel.MinimumSize = New System.Drawing.Size(0, 53) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(1214, 55) + Me.FlowLayoutPanel.Size = New System.Drawing.Size(0, 55) Me.FlowLayoutPanel.TabIndex = 0 ' 'FlatButton2 @@ -5466,6 +5151,7 @@ Partial Class frmSendungsdetailsNEU ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -5655,7 +5341,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem27, Me.ToolStripMenuItem26, Me.ToolStripMenuItem28, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.CMRBestätigungToolStripMenuItem, Me.AuftragMOTISToolStripMenuItem, Me.ToolStripSeparator1, Me.dynMailsToolStripMenuItem}) Me.ContextMenuStrip1.Name = "cntxtAnh" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 400) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 422) ' 'ToolStripMenuItem15 ' @@ -5786,14 +5472,14 @@ Partial Class frmSendungsdetailsNEU ' Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Image = CType(resources.GetObject("AktuelleSendungAnhängeWählenToolStripMenuItem.Image"), System.Drawing.Image) Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Name = "AktuelleSendungAnhängeWählenToolStripMenuItem" - Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(267, 22) + Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(275, 30) Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Text = "Aktuelle Sendung (Anhänge wählen)" ' 'AlleLEXSendungenLKWToolStripMenuItem ' Me.AlleLEXSendungenLKWToolStripMenuItem.Image = CType(resources.GetObject("AlleLEXSendungenLKWToolStripMenuItem.Image"), System.Drawing.Image) Me.AlleLEXSendungenLKWToolStripMenuItem.Name = "AlleLEXSendungenLKWToolStripMenuItem" - Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(267, 22) + Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(275, 30) Me.AlleLEXSendungenLKWToolStripMenuItem.Text = "Alle LEX Sendungen (LKW)" ' 'GVMSInfoToolStripMenuItem @@ -5897,6 +5583,321 @@ Partial Class frmSendungsdetailsNEU Me.timerValidation.Enabled = True Me.timerValidation.Interval = 2000 ' + 'RCntrlVermerke1 + ' + Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18) + Me.RCntrlVermerke1.Name = "RCntrlVermerke1" + Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208) + Me.RCntrlVermerke1.TabIndex = 1 + ' + 'cntlFrachtfuehrer_Sonst + ' + Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" + Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" + Me.cntlFrachtfuehrer_Sonst._readOnly = True + Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) + Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" + Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 + Me.cntlFrachtfuehrer_Sonst.TabStop = False + Me.cntlFrachtfuehrer_Sonst.value = "" + ' + 'cntlAbsender_Sonst + ' + Me.cntlAbsender_Sonst._abrArt = "SONST" + Me.cntlAbsender_Sonst._beteiligter = "ABS" + Me.cntlAbsender_Sonst._readOnly = True + Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) + Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" + Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Sonst.TabIndex = 68 + Me.cntlAbsender_Sonst.TabStop = False + Me.cntlAbsender_Sonst.value = "" + ' + 'cntlEmpfaenger_Sonst + ' + Me.cntlEmpfaenger_Sonst._abrArt = "SONST" + Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" + Me.cntlEmpfaenger_Sonst._readOnly = True + Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) + Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" + Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpfaenger_Sonst.TabIndex = 53 + Me.cntlEmpfaenger_Sonst.TabStop = False + Me.cntlEmpfaenger_Sonst.value = "" + ' + 'cntlAuftraggeber_Sonst + ' + Me.cntlAuftraggeber_Sonst._abrArt = "SONST" + Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" + Me.cntlAuftraggeber_Sonst._readOnly = True + Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) + Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" + Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftraggeber_Sonst.TabIndex = 36 + Me.cntlAuftraggeber_Sonst.TabStop = False + Me.cntlAuftraggeber_Sonst.value = "" + ' + 'cntlAvisierer_Sonst + ' + Me.cntlAvisierer_Sonst._abrArt = "SONST" + Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" + Me.cntlAvisierer_Sonst._readOnly = True + Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) + Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" + Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Sonst.TabIndex = 21 + Me.cntlAvisierer_Sonst.TabStop = False + Me.cntlAvisierer_Sonst.value = "" + ' + 'cntlFrachtf_Clear + ' + Me.cntlFrachtf_Clear._abrArt = "CLEARING" + Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" + Me.cntlFrachtf_Clear._readOnly = False + Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) + Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" + Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Clear.TabIndex = 81 + Me.cntlFrachtf_Clear.TabStop = False + Me.cntlFrachtf_Clear.value = "" + ' + 'cntlFrachtf_Abf + ' + Me.cntlFrachtf_Abf._abrArt = "ABFKOST" + Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" + Me.cntlFrachtf_Abf._readOnly = False + Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) + Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" + Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Abf.TabIndex = 80 + Me.cntlFrachtf_Abf.TabStop = False + Me.cntlFrachtf_Abf.value = "" + ' + 'cntlFrachtf_Eust + ' + Me.cntlFrachtf_Eust._abrArt = "EUST" + Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" + Me.cntlFrachtf_Eust._readOnly = False + Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) + Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" + Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Eust.TabIndex = 79 + Me.cntlFrachtf_Eust.TabStop = False + Me.cntlFrachtf_Eust.value = "" + ' + 'cntlFrachtf_Zoll + ' + Me.cntlFrachtf_Zoll._abrArt = "ZOLL" + Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" + Me.cntlFrachtf_Zoll._readOnly = False + Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) + Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" + Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Zoll.TabIndex = 78 + Me.cntlFrachtf_Zoll.TabStop = False + Me.cntlFrachtf_Zoll.value = "" + ' + 'cntlAbsender_Clear + ' + Me.cntlAbsender_Clear._abrArt = "CLEARING" + Me.cntlAbsender_Clear._beteiligter = "ABS" + Me.cntlAbsender_Clear._readOnly = False + Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) + Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" + Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Clear.TabIndex = 67 + Me.cntlAbsender_Clear.TabStop = False + Me.cntlAbsender_Clear.value = "" + ' + 'cntlAbsender_Abf + ' + Me.cntlAbsender_Abf._abrArt = "ABFKOST" + Me.cntlAbsender_Abf._beteiligter = "ABS" + Me.cntlAbsender_Abf._readOnly = False + Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) + Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" + Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Abf.TabIndex = 66 + Me.cntlAbsender_Abf.TabStop = False + Me.cntlAbsender_Abf.value = "" + ' + 'cntlAbsender_Eust + ' + Me.cntlAbsender_Eust._abrArt = "EUST" + Me.cntlAbsender_Eust._beteiligter = "ABS" + Me.cntlAbsender_Eust._readOnly = False + Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) + Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" + Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Eust.TabIndex = 65 + Me.cntlAbsender_Eust.TabStop = False + Me.cntlAbsender_Eust.value = "" + ' + 'cntlAbsender_Zoll + ' + Me.cntlAbsender_Zoll._abrArt = "ZOLL" + Me.cntlAbsender_Zoll._beteiligter = "ABS" + Me.cntlAbsender_Zoll._readOnly = False + Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) + Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" + Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Zoll.TabIndex = 64 + Me.cntlAbsender_Zoll.TabStop = False + Me.cntlAbsender_Zoll.value = "" + ' + 'cntlEmpf_Clear + ' + Me.cntlEmpf_Clear._abrArt = "CLEARING" + Me.cntlEmpf_Clear._beteiligter = "EMPF" + Me.cntlEmpf_Clear._readOnly = False + Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) + Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" + Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Clear.TabIndex = 52 + Me.cntlEmpf_Clear.TabStop = False + Me.cntlEmpf_Clear.value = "" + ' + 'cntlEmpf_Abf + ' + Me.cntlEmpf_Abf._abrArt = "ABFKOST" + Me.cntlEmpf_Abf._beteiligter = "EMPF" + Me.cntlEmpf_Abf._readOnly = False + Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) + Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" + Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Abf.TabIndex = 51 + Me.cntlEmpf_Abf.TabStop = False + Me.cntlEmpf_Abf.value = "" + ' + 'cntlEmpf_Eust + ' + Me.cntlEmpf_Eust._abrArt = "EUST" + Me.cntlEmpf_Eust._beteiligter = "EMPF" + Me.cntlEmpf_Eust._readOnly = False + Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) + Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" + Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Eust.TabIndex = 50 + Me.cntlEmpf_Eust.TabStop = False + Me.cntlEmpf_Eust.value = "" + ' + 'cntlEmpf_Zoll + ' + Me.cntlEmpf_Zoll._abrArt = "ZOLL" + Me.cntlEmpf_Zoll._beteiligter = "EMPF" + Me.cntlEmpf_Zoll._readOnly = False + Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) + Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" + Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Zoll.TabIndex = 49 + Me.cntlEmpf_Zoll.TabStop = False + Me.cntlEmpf_Zoll.value = "" + ' + 'cntlAuftr_Clear + ' + Me.cntlAuftr_Clear._abrArt = "CLEARING" + Me.cntlAuftr_Clear._beteiligter = "AUFTR" + Me.cntlAuftr_Clear._readOnly = False + Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) + Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" + Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Clear.TabIndex = 35 + Me.cntlAuftr_Clear.TabStop = False + Me.cntlAuftr_Clear.value = "" + ' + 'cntlAuftr_Abf + ' + Me.cntlAuftr_Abf._abrArt = "ABFKOST" + Me.cntlAuftr_Abf._beteiligter = "AUFTR" + Me.cntlAuftr_Abf._readOnly = False + Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) + Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" + Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Abf.TabIndex = 34 + Me.cntlAuftr_Abf.TabStop = False + Me.cntlAuftr_Abf.value = "" + ' + 'cntlAuftr_Eust + ' + Me.cntlAuftr_Eust._abrArt = "EUST" + Me.cntlAuftr_Eust._beteiligter = "AUFTR" + Me.cntlAuftr_Eust._readOnly = False + Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) + Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" + Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Eust.TabIndex = 33 + Me.cntlAuftr_Eust.TabStop = False + Me.cntlAuftr_Eust.value = "" + ' + 'cntlAuftr_Zoll + ' + Me.cntlAuftr_Zoll._abrArt = "ZOLL" + Me.cntlAuftr_Zoll._beteiligter = "AUFTR" + Me.cntlAuftr_Zoll._readOnly = False + Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) + Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" + Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Zoll.TabIndex = 32 + Me.cntlAuftr_Zoll.TabStop = False + Me.cntlAuftr_Zoll.value = "" + ' + 'cntlAvisierer_Clear + ' + Me.cntlAvisierer_Clear._abrArt = "CLEARING" + Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" + Me.cntlAvisierer_Clear._readOnly = False + Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) + Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" + Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Clear.TabIndex = 20 + Me.cntlAvisierer_Clear.TabStop = False + Me.cntlAvisierer_Clear.value = "" + ' + 'cntlAvisierer_Abf + ' + Me.cntlAvisierer_Abf._abrArt = "ABFKOST" + Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" + Me.cntlAvisierer_Abf._readOnly = False + Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) + Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" + Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Abf.TabIndex = 19 + Me.cntlAvisierer_Abf.TabStop = False + Me.cntlAvisierer_Abf.value = "" + ' + 'cntlAvisierer_Eust + ' + Me.cntlAvisierer_Eust._abrArt = "EUST" + Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" + Me.cntlAvisierer_Eust._readOnly = False + Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) + Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" + Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Eust.TabIndex = 18 + Me.cntlAvisierer_Eust.TabStop = False + Me.cntlAvisierer_Eust.value = "" + ' + 'cntlAvisierer_Zoll + ' + Me.cntlAvisierer_Zoll._abrArt = "ZOLL" + Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" + Me.cntlAvisierer_Zoll._readOnly = False + Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) + Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" + Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Zoll.TabIndex = 17 + Me.cntlAvisierer_Zoll.TabStop = False + Me.cntlAvisierer_Zoll.value = "" + ' + 'UsrCntlSND_NCTSGestellungsadresse1 + ' + Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" + Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) + Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 + ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index f481265..befe3f9 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -6833,6 +6833,8 @@ Public Class frmSendungsdetailsNEU Dim Mail As Microsoft.Office.Interop.Outlook.MailItem Mail = outl.CreateItem(0) + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then Mail.SentOnBehalfOfName = SDL.cFakturierung.getDefaultMail("AMBAR") @@ -6840,6 +6842,7 @@ Public Class frmSendungsdetailsNEU End If + Mail.To = r.txt_fixerEmpfaengerEmail Mail.Subject = r.txt_betreff @@ -6852,35 +6855,110 @@ Public Class frmSendungsdetailsNEU TextHTML &= "
" TextHTML &= cFakturierung.getSignature(r.txt_sprache, r.txt_firmaSig, True, True) - If lblGrenze.Text <> "" Then - TextHTML = TextHTML.Replace("%VAR-GRENZE%", lblGrenze.Text & "
") - Else - TextHTML = TextHTML.Replace("%VAR-GRENZE%", "") - End If - - - Mail.HTMLBody = "
" & TextHTML & "
" - - If AVISO IsNot Nothing Then + Mail.Subject = Mail.Subject.Replace("%LKW%", AVISO.LKW_Nr) Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", AVISO.LKW_Nr) + TextHTML = TextHTML.Replace("%LKW%", AVISO.LKW_Nr) + TextHTML = TextHTML.Replace("%LKWKennzeichen%", AVISO.LKW_Nr) + + If AVISO.VoraussichtlichesEintreffen IsNot Nothing Then + TextHTML = TextHTML.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString) + Mail.Subject = Mail.Subject.Replace("%voraus-Eintreffen%", CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString) + End If + + If AVISO.ImEx IsNot Nothing Then + If AVISO.ImEx = "" Then + TextHTML = TextHTML.Replace("%ImEx%", "Custom") + Mail.Subject = Mail.Subject.Replace("%ImEx%", "Custom") + Else + + TextHTML = TextHTML.Replace("%ImEx%", AVISO.ImEx) + Mail.Subject = Mail.Subject.Replace("%ImEx%", AVISO.ImEx) + End If + End If + + + If AVISO.Zollstelle IsNot Nothing Then + + If AVISO.Zollstelle <> "" Then + + Dim zollstelleBez = SQL.getValueTxtBySql("SELECT [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ) ", "FMZOLL") + TextHTML = TextHTML.Replace("%Zollstelle%", zollstelleBez) + Else + + TextHTML = TextHTML.Replace("%Zollstelle%", AVISO.Zollstelle) + Mail.Subject = Mail.Subject.Replace("%Zollstelle%", AVISO.Zollstelle) + + End If + End If End If + + + If lblGrenze.Text <> "" Then + TextHTML = TextHTML.Replace("%VAR-GRENZE%", lblGrenze.Text & "
") + Mail.Subject = Mail.Subject.Replace("%VAR-GRENZE%", lblGrenze.Text.Replace(vbCrLf, " ")) + End If + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger IsNot Nothing Then Mail.Subject = Mail.Subject.Replace("%Empfaenger%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger) + TextHTML = TextHTML.Replace("%Empfaenger%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger) End If + If SENDUNG_LIST(CURRENT_INDEX).FilialenNr > 0 Then + Mail.Subject = Mail.Subject.Replace("%FilialenNr%", SENDUNG_LIST(CURRENT_INDEX).FilialenNr) + TextHTML = TextHTML.Replace("%FilialenNr%", SENDUNG_LIST(CURRENT_INDEX).FilialenNr) + End If + + If SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr > 0 Then + Mail.Subject = Mail.Subject.Replace("%AbfertigungsNr%", SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) + TextHTML = TextHTML.Replace("%AbfertigungsNr%", SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) + End If + + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender <> "" Then + Mail.Subject = Mail.Subject.Replace("%Absender%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender) + TextHTML = TextHTML.Replace("%Absender%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender) + End If + + If SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht <> "" Then + Mail.Subject = Mail.Subject.Replace("%Gewicht%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht) + TextHTML = TextHTML.Replace("%Gewicht%", SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht) + End If + + Mail.Subject = Mail.Subject.Replace("%LKW%", "") Mail.Subject = Mail.Subject.Replace("%LKWKennzeichen%", "") Mail.Subject = Mail.Subject.Replace("%Empfaenger%", "") + Mail.Subject = Mail.Subject.Replace("%VAR-GRENZE%", "") + Mail.Subject = Mail.Subject.Replace("%voraus-Eintreffen%", "") + Mail.Subject = Mail.Subject.Replace("%FilialenNr%", "") + Mail.Subject = Mail.Subject.Replace("%AbfertigungsNr%", "") + Mail.Subject = Mail.Subject.Replace("%Absender%", "") + Mail.Subject = Mail.Subject.Replace("%Gewicht%", "") + Mail.Subject = Mail.Subject.Replace("%ImEx%", "") + Mail.Subject = Mail.Subject.Replace("%Zollstelle%", "") + TextHTML = TextHTML.Replace("%LKW%", "") + TextHTML = TextHTML.Replace("%LKWKennzeichen%", "") + TextHTML = TextHTML.Replace("%Empfaenger%", "") + TextHTML = TextHTML.Replace("%VAR-GRENZE%", "") + TextHTML = TextHTML.Replace("%voraus-Eintreffen%", "") + TextHTML = TextHTML.Replace("%FilialenNr%", "") + TextHTML = TextHTML.Replace("%AbfertigungsNr%", "") + TextHTML = TextHTML.Replace("%Absender%", "") + TextHTML = TextHTML.Replace("%Gewicht%", "") + TextHTML = TextHTML.Replace("%ImEx%", "") + TextHTML = TextHTML.Replace("%Zollstelle%", "") - For Each anh As DataGridViewRow In dgvAnhang.SelectedRows + For Each anh As DataGridViewRow In dgvAnhang.SelectedRows Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(anh.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) Next + + Mail.HTMLBody = "
" & TextHTML & "
" + Mail.Display() If r.txt_sendungsvermerk AndAlso Not r.txt_sendungsvermerkText.ToLower.Contains("test") AndAlso SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID > 0 Then AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, r.txt_sendungsvermerkText, r.txt_sendungsvermerkId) @@ -7136,5 +7214,4 @@ Public Class frmSendungsdetailsNEU sequence) End Function - End Class From 2a8c77933376bfcc0b9dfd9218fc68972060f24d Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Mon, 12 Aug 2024 10:39:14 +0200 Subject: [PATCH 2/2] CMR AnhangCMR Anhang --- Aviso/Anhänge/frmSendungAnhangImport.vb | 4 +- Aviso/frmSendungsdetailsNEU.Designer.vb | 712 ++++++++++++------------ Aviso/frmSendungsdetailsNEU.vb | 76 ++- Aviso/usrcntlAktDetailsATILLANeu.vb | 107 ++-- 4 files changed, 496 insertions(+), 403 deletions(-) diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 7762abf..e45fe8b 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -1448,7 +1448,7 @@ Public Class frmSendungAnhangImport Return True End Function - Public Shared Function saveToDS(AvisoId, ByRef fileName, sourcePath, Art, Typ, Optional ByRef da_id = -1, Optional ByRef anhId = -1, Optional ByRef destPath = "", Optional SendungsId = Nothing) As Boolean + Public Shared Function saveToDS(AvisoId, ByRef fileName, sourcePath, Art, Typ, Optional ByRef da_id = -1, Optional ByRef anhId = -1, Optional ByRef destPath = "", Optional SendungsId = Nothing, Optional crmId = Nothing) As Boolean Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "AVISO_ANHAENGE", AvisoId, Now.ToString("ddMMyy_HHmmss.ffff"), "", fileName, -1, False) If Not DS.uploadDataToDATENSERVER(sourcePath) Then MsgBox("Fehler beim Speichern: Datenserver!") : Return False If DS.da_id <= 0 Then MsgBox("Keine DocId!") : Return False @@ -1456,7 +1456,7 @@ Public Class frmSendungAnhangImport destPath = DS.GET_TOP1_PATH fileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(fileName) Dim fi As New FileInfo(sourcePath) - Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, Art, Typ, SendungsId,, fi.Length) + Dim ANH As New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(AvisoId, fileName, DS.da_id, Art, Typ, SendungsId,, fi.Length, crmId) If Not ANH.SAVE Then MsgBox("Fehler beim Anhang speichern!") : Return False anhId = ANH.anh_id Return True diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 1b4d183..09c2c08 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -127,6 +127,7 @@ Partial Class frmSendungsdetailsNEU Me.Label25 = New System.Windows.Forms.Label() Me.Button7 = New System.Windows.Forms.Button() Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() Me.gridVermerke = New System.Windows.Forms.DataGridView() Me.tbATEZ = New System.Windows.Forms.TabPage() Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView() @@ -239,10 +240,35 @@ Partial Class frmSendungsdetailsNEU Me.btnAvisierer = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button4 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() + Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() Me.lblSonstigesKosten = New System.Windows.Forms.Label() Me.btnAufschub_Atr = New System.Windows.Forms.Button() Me.btnAufschub_Empf = New System.Windows.Forms.Button() Me.btnAufschub_VERAG = New System.Windows.Forms.Button() + Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() + Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() + Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() Me.Panel15 = New System.Windows.Forms.Panel() Me.txtAvisierer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.txtAuftraggeber = New VERAG_PROG_ALLGEMEIN.KdSearchBox() @@ -255,6 +281,7 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfAufschubEust = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblFrachtfuehrer = New System.Windows.Forms.Label() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.Label43 = New System.Windows.Forms.Label() Me.lblAbsender = New System.Windows.Forms.Label() Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -437,33 +464,6 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.timerValidation = New System.Windows.Forms.Timer(Me.components) - Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() - Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAuftraggeber_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Sonst = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlFrachtf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAbsender_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Clear = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Abf = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Eust = New AVISO.usrcntlCheckBox() - Me.cntlEmpf_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAuftr_Zoll = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Clear = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Abf = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Eust = New AVISO.usrcntlCheckBox() - Me.cntlAvisierer_Zoll = New AVISO.usrcntlCheckBox() - Me.UsrCntlSND_NCTSGestellungsadresse1 = New AVISO.usrCntlSND_NCTSGestellungsadresse() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -992,7 +992,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(93, 22) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(101, 30) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -1000,7 +1000,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(93, 22) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(101, 30) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -1008,7 +1008,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(93, 22) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(101, 30) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -1046,7 +1046,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem20.Text = "EZA" ' 'ToolStripMenuItem18 @@ -1055,7 +1055,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem18.Text = "T1" ' 'ToolStripMenuItem19 @@ -1064,7 +1064,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem19.Text = "T2" ' 'ToolStripMenuItem21 @@ -1081,7 +1081,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem22.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem22.Name = "ToolStripMenuItem22" - Me.ToolStripMenuItem22.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem22.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem22.Text = "MIC Import senden" ' 'ToolStripMenuItem23 @@ -1089,7 +1089,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem23.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem23.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem23.Name = "ToolStripMenuItem23" - Me.ToolStripMenuItem23.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem23.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem23.Text = "MIC Transit senden" ' 'ToolStripMenuItem24 @@ -1098,7 +1098,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem24.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem24.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 Me.ToolStripMenuItem24.Name = "ToolStripMenuItem24" - Me.ToolStripMenuItem24.Size = New System.Drawing.Size(176, 22) + Me.ToolStripMenuItem24.Size = New System.Drawing.Size(184, 30) Me.ToolStripMenuItem24.Text = "MIC Export senden" ' 'ToolStripMenuItem31 @@ -1555,6 +1555,13 @@ Partial Class frmSendungsdetailsNEU Me.TabPage3.Text = "Vermerke" Me.TabPage3.UseVisualStyleBackColor = True ' + 'RCntrlVermerke1 + ' + Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18) + Me.RCntrlVermerke1.Name = "RCntrlVermerke1" + Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208) + Me.RCntrlVermerke1.TabIndex = 1 + ' 'gridVermerke ' Me.gridVermerke.AllowUserToAddRows = False @@ -3342,6 +3349,66 @@ Partial Class frmSendungsdetailsNEU Me.Button1.Text = "BAR - Beleg" Me.Button1.UseVisualStyleBackColor = False ' + 'cntlFrachtfuehrer_Sonst + ' + Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" + Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" + Me.cntlFrachtfuehrer_Sonst._readOnly = True + Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) + Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" + Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 + Me.cntlFrachtfuehrer_Sonst.TabStop = False + Me.cntlFrachtfuehrer_Sonst.value = "" + ' + 'cntlAbsender_Sonst + ' + Me.cntlAbsender_Sonst._abrArt = "SONST" + Me.cntlAbsender_Sonst._beteiligter = "ABS" + Me.cntlAbsender_Sonst._readOnly = True + Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) + Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" + Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Sonst.TabIndex = 68 + Me.cntlAbsender_Sonst.TabStop = False + Me.cntlAbsender_Sonst.value = "" + ' + 'cntlEmpfaenger_Sonst + ' + Me.cntlEmpfaenger_Sonst._abrArt = "SONST" + Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" + Me.cntlEmpfaenger_Sonst._readOnly = True + Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) + Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" + Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpfaenger_Sonst.TabIndex = 53 + Me.cntlEmpfaenger_Sonst.TabStop = False + Me.cntlEmpfaenger_Sonst.value = "" + ' + 'cntlAuftraggeber_Sonst + ' + Me.cntlAuftraggeber_Sonst._abrArt = "SONST" + Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" + Me.cntlAuftraggeber_Sonst._readOnly = True + Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) + Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" + Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftraggeber_Sonst.TabIndex = 36 + Me.cntlAuftraggeber_Sonst.TabStop = False + Me.cntlAuftraggeber_Sonst.value = "" + ' + 'cntlAvisierer_Sonst + ' + Me.cntlAvisierer_Sonst._abrArt = "SONST" + Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" + Me.cntlAvisierer_Sonst._readOnly = True + Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) + Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" + Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Sonst.TabIndex = 21 + Me.cntlAvisierer_Sonst.TabStop = False + Me.cntlAvisierer_Sonst.value = "" + ' 'lblSonstigesKosten ' Me.lblSonstigesKosten.AutoSize = True @@ -3409,6 +3476,246 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_VERAG.UseVisualStyleBackColor = False Me.btnAufschub_VERAG.Visible = False ' + 'cntlFrachtf_Clear + ' + Me.cntlFrachtf_Clear._abrArt = "CLEARING" + Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" + Me.cntlFrachtf_Clear._readOnly = False + Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) + Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" + Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Clear.TabIndex = 81 + Me.cntlFrachtf_Clear.TabStop = False + Me.cntlFrachtf_Clear.value = "" + ' + 'cntlFrachtf_Abf + ' + Me.cntlFrachtf_Abf._abrArt = "ABFKOST" + Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" + Me.cntlFrachtf_Abf._readOnly = False + Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) + Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" + Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Abf.TabIndex = 80 + Me.cntlFrachtf_Abf.TabStop = False + Me.cntlFrachtf_Abf.value = "" + ' + 'cntlFrachtf_Eust + ' + Me.cntlFrachtf_Eust._abrArt = "EUST" + Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" + Me.cntlFrachtf_Eust._readOnly = False + Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) + Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" + Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Eust.TabIndex = 79 + Me.cntlFrachtf_Eust.TabStop = False + Me.cntlFrachtf_Eust.value = "" + ' + 'cntlFrachtf_Zoll + ' + Me.cntlFrachtf_Zoll._abrArt = "ZOLL" + Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" + Me.cntlFrachtf_Zoll._readOnly = False + Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) + Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" + Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlFrachtf_Zoll.TabIndex = 78 + Me.cntlFrachtf_Zoll.TabStop = False + Me.cntlFrachtf_Zoll.value = "" + ' + 'cntlAbsender_Clear + ' + Me.cntlAbsender_Clear._abrArt = "CLEARING" + Me.cntlAbsender_Clear._beteiligter = "ABS" + Me.cntlAbsender_Clear._readOnly = False + Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) + Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" + Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Clear.TabIndex = 67 + Me.cntlAbsender_Clear.TabStop = False + Me.cntlAbsender_Clear.value = "" + ' + 'cntlAbsender_Abf + ' + Me.cntlAbsender_Abf._abrArt = "ABFKOST" + Me.cntlAbsender_Abf._beteiligter = "ABS" + Me.cntlAbsender_Abf._readOnly = False + Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) + Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" + Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Abf.TabIndex = 66 + Me.cntlAbsender_Abf.TabStop = False + Me.cntlAbsender_Abf.value = "" + ' + 'cntlAbsender_Eust + ' + Me.cntlAbsender_Eust._abrArt = "EUST" + Me.cntlAbsender_Eust._beteiligter = "ABS" + Me.cntlAbsender_Eust._readOnly = False + Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) + Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" + Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Eust.TabIndex = 65 + Me.cntlAbsender_Eust.TabStop = False + Me.cntlAbsender_Eust.value = "" + ' + 'cntlAbsender_Zoll + ' + Me.cntlAbsender_Zoll._abrArt = "ZOLL" + Me.cntlAbsender_Zoll._beteiligter = "ABS" + Me.cntlAbsender_Zoll._readOnly = False + Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) + Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" + Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAbsender_Zoll.TabIndex = 64 + Me.cntlAbsender_Zoll.TabStop = False + Me.cntlAbsender_Zoll.value = "" + ' + 'cntlEmpf_Clear + ' + Me.cntlEmpf_Clear._abrArt = "CLEARING" + Me.cntlEmpf_Clear._beteiligter = "EMPF" + Me.cntlEmpf_Clear._readOnly = False + Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) + Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" + Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Clear.TabIndex = 52 + Me.cntlEmpf_Clear.TabStop = False + Me.cntlEmpf_Clear.value = "" + ' + 'cntlEmpf_Abf + ' + Me.cntlEmpf_Abf._abrArt = "ABFKOST" + Me.cntlEmpf_Abf._beteiligter = "EMPF" + Me.cntlEmpf_Abf._readOnly = False + Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) + Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" + Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Abf.TabIndex = 51 + Me.cntlEmpf_Abf.TabStop = False + Me.cntlEmpf_Abf.value = "" + ' + 'cntlEmpf_Eust + ' + Me.cntlEmpf_Eust._abrArt = "EUST" + Me.cntlEmpf_Eust._beteiligter = "EMPF" + Me.cntlEmpf_Eust._readOnly = False + Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) + Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" + Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Eust.TabIndex = 50 + Me.cntlEmpf_Eust.TabStop = False + Me.cntlEmpf_Eust.value = "" + ' + 'cntlEmpf_Zoll + ' + Me.cntlEmpf_Zoll._abrArt = "ZOLL" + Me.cntlEmpf_Zoll._beteiligter = "EMPF" + Me.cntlEmpf_Zoll._readOnly = False + Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) + Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" + Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlEmpf_Zoll.TabIndex = 49 + Me.cntlEmpf_Zoll.TabStop = False + Me.cntlEmpf_Zoll.value = "" + ' + 'cntlAuftr_Clear + ' + Me.cntlAuftr_Clear._abrArt = "CLEARING" + Me.cntlAuftr_Clear._beteiligter = "AUFTR" + Me.cntlAuftr_Clear._readOnly = False + Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) + Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" + Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Clear.TabIndex = 35 + Me.cntlAuftr_Clear.TabStop = False + Me.cntlAuftr_Clear.value = "" + ' + 'cntlAuftr_Abf + ' + Me.cntlAuftr_Abf._abrArt = "ABFKOST" + Me.cntlAuftr_Abf._beteiligter = "AUFTR" + Me.cntlAuftr_Abf._readOnly = False + Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) + Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" + Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Abf.TabIndex = 34 + Me.cntlAuftr_Abf.TabStop = False + Me.cntlAuftr_Abf.value = "" + ' + 'cntlAuftr_Eust + ' + Me.cntlAuftr_Eust._abrArt = "EUST" + Me.cntlAuftr_Eust._beteiligter = "AUFTR" + Me.cntlAuftr_Eust._readOnly = False + Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) + Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" + Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Eust.TabIndex = 33 + Me.cntlAuftr_Eust.TabStop = False + Me.cntlAuftr_Eust.value = "" + ' + 'cntlAuftr_Zoll + ' + Me.cntlAuftr_Zoll._abrArt = "ZOLL" + Me.cntlAuftr_Zoll._beteiligter = "AUFTR" + Me.cntlAuftr_Zoll._readOnly = False + Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) + Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" + Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAuftr_Zoll.TabIndex = 32 + Me.cntlAuftr_Zoll.TabStop = False + Me.cntlAuftr_Zoll.value = "" + ' + 'cntlAvisierer_Clear + ' + Me.cntlAvisierer_Clear._abrArt = "CLEARING" + Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" + Me.cntlAvisierer_Clear._readOnly = False + Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) + Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" + Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Clear.TabIndex = 20 + Me.cntlAvisierer_Clear.TabStop = False + Me.cntlAvisierer_Clear.value = "" + ' + 'cntlAvisierer_Abf + ' + Me.cntlAvisierer_Abf._abrArt = "ABFKOST" + Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" + Me.cntlAvisierer_Abf._readOnly = False + Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) + Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" + Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Abf.TabIndex = 19 + Me.cntlAvisierer_Abf.TabStop = False + Me.cntlAvisierer_Abf.value = "" + ' + 'cntlAvisierer_Eust + ' + Me.cntlAvisierer_Eust._abrArt = "EUST" + Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" + Me.cntlAvisierer_Eust._readOnly = False + Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) + Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" + Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Eust.TabIndex = 18 + Me.cntlAvisierer_Eust.TabStop = False + Me.cntlAvisierer_Eust.value = "" + ' + 'cntlAvisierer_Zoll + ' + Me.cntlAvisierer_Zoll._abrArt = "ZOLL" + Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" + Me.cntlAvisierer_Zoll._readOnly = False + Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) + Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" + Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) + Me.cntlAvisierer_Zoll.TabIndex = 17 + Me.cntlAvisierer_Zoll.TabStop = False + Me.cntlAvisierer_Zoll.value = "" + ' 'Panel15 ' Me.Panel15.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -3599,6 +3906,14 @@ Partial Class frmSendungsdetailsNEU Me.pnlT1.Size = New System.Drawing.Size(549, 118) Me.pnlT1.TabIndex = 86 ' + 'UsrCntlSND_NCTSGestellungsadresse1 + ' + Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) + Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" + Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) + Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 + ' 'Label43 ' Me.Label43.AutoSize = True @@ -4586,7 +4901,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.MaximumSize = New System.Drawing.Size(0, 510) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(0, 55) + Me.Panel2.Size = New System.Drawing.Size(1214, 55) Me.Panel2.TabIndex = 0 ' 'FlowLayoutPanel @@ -4598,7 +4913,7 @@ Partial Class frmSendungsdetailsNEU Me.FlowLayoutPanel.MaximumSize = New System.Drawing.Size(0, 550) Me.FlowLayoutPanel.MinimumSize = New System.Drawing.Size(0, 53) Me.FlowLayoutPanel.Name = "FlowLayoutPanel" - Me.FlowLayoutPanel.Size = New System.Drawing.Size(0, 55) + Me.FlowLayoutPanel.Size = New System.Drawing.Size(1214, 55) Me.FlowLayoutPanel.TabIndex = 0 ' 'FlatButton2 @@ -5341,7 +5656,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem27, Me.ToolStripMenuItem26, Me.ToolStripMenuItem28, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.CMRBestätigungToolStripMenuItem, Me.AuftragMOTISToolStripMenuItem, Me.ToolStripSeparator1, Me.dynMailsToolStripMenuItem}) Me.ContextMenuStrip1.Name = "cntxtAnh" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 422) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 400) ' 'ToolStripMenuItem15 ' @@ -5472,14 +5787,14 @@ Partial Class frmSendungsdetailsNEU ' Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Image = CType(resources.GetObject("AktuelleSendungAnhängeWählenToolStripMenuItem.Image"), System.Drawing.Image) Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Name = "AktuelleSendungAnhängeWählenToolStripMenuItem" - Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(275, 30) + Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Size = New System.Drawing.Size(267, 22) Me.AktuelleSendungAnhängeWählenToolStripMenuItem.Text = "Aktuelle Sendung (Anhänge wählen)" ' 'AlleLEXSendungenLKWToolStripMenuItem ' Me.AlleLEXSendungenLKWToolStripMenuItem.Image = CType(resources.GetObject("AlleLEXSendungenLKWToolStripMenuItem.Image"), System.Drawing.Image) Me.AlleLEXSendungenLKWToolStripMenuItem.Name = "AlleLEXSendungenLKWToolStripMenuItem" - Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(275, 30) + Me.AlleLEXSendungenLKWToolStripMenuItem.Size = New System.Drawing.Size(267, 22) Me.AlleLEXSendungenLKWToolStripMenuItem.Text = "Alle LEX Sendungen (LKW)" ' 'GVMSInfoToolStripMenuItem @@ -5583,321 +5898,6 @@ Partial Class frmSendungsdetailsNEU Me.timerValidation.Enabled = True Me.timerValidation.Interval = 2000 ' - 'RCntrlVermerke1 - ' - Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18) - Me.RCntrlVermerke1.Name = "RCntrlVermerke1" - Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208) - Me.RCntrlVermerke1.TabIndex = 1 - ' - 'cntlFrachtfuehrer_Sonst - ' - Me.cntlFrachtfuehrer_Sonst._abrArt = "SONST" - Me.cntlFrachtfuehrer_Sonst._beteiligter = "FRACHTF" - Me.cntlFrachtfuehrer_Sonst._readOnly = True - Me.cntlFrachtfuehrer_Sonst.Location = New System.Drawing.Point(632, 168) - Me.cntlFrachtfuehrer_Sonst.Name = "cntlFrachtfuehrer_Sonst" - Me.cntlFrachtfuehrer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtfuehrer_Sonst.TabIndex = 82 - Me.cntlFrachtfuehrer_Sonst.TabStop = False - Me.cntlFrachtfuehrer_Sonst.value = "" - ' - 'cntlAbsender_Sonst - ' - Me.cntlAbsender_Sonst._abrArt = "SONST" - Me.cntlAbsender_Sonst._beteiligter = "ABS" - Me.cntlAbsender_Sonst._readOnly = True - Me.cntlAbsender_Sonst.Location = New System.Drawing.Point(632, 133) - Me.cntlAbsender_Sonst.Name = "cntlAbsender_Sonst" - Me.cntlAbsender_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Sonst.TabIndex = 68 - Me.cntlAbsender_Sonst.TabStop = False - Me.cntlAbsender_Sonst.value = "" - ' - 'cntlEmpfaenger_Sonst - ' - Me.cntlEmpfaenger_Sonst._abrArt = "SONST" - Me.cntlEmpfaenger_Sonst._beteiligter = "EMPF" - Me.cntlEmpfaenger_Sonst._readOnly = True - Me.cntlEmpfaenger_Sonst.Location = New System.Drawing.Point(632, 94) - Me.cntlEmpfaenger_Sonst.Name = "cntlEmpfaenger_Sonst" - Me.cntlEmpfaenger_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpfaenger_Sonst.TabIndex = 53 - Me.cntlEmpfaenger_Sonst.TabStop = False - Me.cntlEmpfaenger_Sonst.value = "" - ' - 'cntlAuftraggeber_Sonst - ' - Me.cntlAuftraggeber_Sonst._abrArt = "SONST" - Me.cntlAuftraggeber_Sonst._beteiligter = "AUFTR" - Me.cntlAuftraggeber_Sonst._readOnly = True - Me.cntlAuftraggeber_Sonst.Location = New System.Drawing.Point(632, 57) - Me.cntlAuftraggeber_Sonst.Name = "cntlAuftraggeber_Sonst" - Me.cntlAuftraggeber_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftraggeber_Sonst.TabIndex = 36 - Me.cntlAuftraggeber_Sonst.TabStop = False - Me.cntlAuftraggeber_Sonst.value = "" - ' - 'cntlAvisierer_Sonst - ' - Me.cntlAvisierer_Sonst._abrArt = "SONST" - Me.cntlAvisierer_Sonst._beteiligter = "AVISIERER" - Me.cntlAvisierer_Sonst._readOnly = True - Me.cntlAvisierer_Sonst.Location = New System.Drawing.Point(632, 20) - Me.cntlAvisierer_Sonst.Name = "cntlAvisierer_Sonst" - Me.cntlAvisierer_Sonst.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Sonst.TabIndex = 21 - Me.cntlAvisierer_Sonst.TabStop = False - Me.cntlAvisierer_Sonst.value = "" - ' - 'cntlFrachtf_Clear - ' - Me.cntlFrachtf_Clear._abrArt = "CLEARING" - Me.cntlFrachtf_Clear._beteiligter = "FRACHTF" - Me.cntlFrachtf_Clear._readOnly = False - Me.cntlFrachtf_Clear.Location = New System.Drawing.Point(600, 168) - Me.cntlFrachtf_Clear.Name = "cntlFrachtf_Clear" - Me.cntlFrachtf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Clear.TabIndex = 81 - Me.cntlFrachtf_Clear.TabStop = False - Me.cntlFrachtf_Clear.value = "" - ' - 'cntlFrachtf_Abf - ' - Me.cntlFrachtf_Abf._abrArt = "ABFKOST" - Me.cntlFrachtf_Abf._beteiligter = "FRACHTF" - Me.cntlFrachtf_Abf._readOnly = False - Me.cntlFrachtf_Abf.Location = New System.Drawing.Point(569, 168) - Me.cntlFrachtf_Abf.Name = "cntlFrachtf_Abf" - Me.cntlFrachtf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Abf.TabIndex = 80 - Me.cntlFrachtf_Abf.TabStop = False - Me.cntlFrachtf_Abf.value = "" - ' - 'cntlFrachtf_Eust - ' - Me.cntlFrachtf_Eust._abrArt = "EUST" - Me.cntlFrachtf_Eust._beteiligter = "FRACHTF" - Me.cntlFrachtf_Eust._readOnly = False - Me.cntlFrachtf_Eust.Location = New System.Drawing.Point(538, 168) - Me.cntlFrachtf_Eust.Name = "cntlFrachtf_Eust" - Me.cntlFrachtf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Eust.TabIndex = 79 - Me.cntlFrachtf_Eust.TabStop = False - Me.cntlFrachtf_Eust.value = "" - ' - 'cntlFrachtf_Zoll - ' - Me.cntlFrachtf_Zoll._abrArt = "ZOLL" - Me.cntlFrachtf_Zoll._beteiligter = "FRACHTF" - Me.cntlFrachtf_Zoll._readOnly = False - Me.cntlFrachtf_Zoll.Location = New System.Drawing.Point(507, 168) - Me.cntlFrachtf_Zoll.Name = "cntlFrachtf_Zoll" - Me.cntlFrachtf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlFrachtf_Zoll.TabIndex = 78 - Me.cntlFrachtf_Zoll.TabStop = False - Me.cntlFrachtf_Zoll.value = "" - ' - 'cntlAbsender_Clear - ' - Me.cntlAbsender_Clear._abrArt = "CLEARING" - Me.cntlAbsender_Clear._beteiligter = "ABS" - Me.cntlAbsender_Clear._readOnly = False - Me.cntlAbsender_Clear.Location = New System.Drawing.Point(600, 133) - Me.cntlAbsender_Clear.Name = "cntlAbsender_Clear" - Me.cntlAbsender_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Clear.TabIndex = 67 - Me.cntlAbsender_Clear.TabStop = False - Me.cntlAbsender_Clear.value = "" - ' - 'cntlAbsender_Abf - ' - Me.cntlAbsender_Abf._abrArt = "ABFKOST" - Me.cntlAbsender_Abf._beteiligter = "ABS" - Me.cntlAbsender_Abf._readOnly = False - Me.cntlAbsender_Abf.Location = New System.Drawing.Point(569, 133) - Me.cntlAbsender_Abf.Name = "cntlAbsender_Abf" - Me.cntlAbsender_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Abf.TabIndex = 66 - Me.cntlAbsender_Abf.TabStop = False - Me.cntlAbsender_Abf.value = "" - ' - 'cntlAbsender_Eust - ' - Me.cntlAbsender_Eust._abrArt = "EUST" - Me.cntlAbsender_Eust._beteiligter = "ABS" - Me.cntlAbsender_Eust._readOnly = False - Me.cntlAbsender_Eust.Location = New System.Drawing.Point(538, 133) - Me.cntlAbsender_Eust.Name = "cntlAbsender_Eust" - Me.cntlAbsender_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Eust.TabIndex = 65 - Me.cntlAbsender_Eust.TabStop = False - Me.cntlAbsender_Eust.value = "" - ' - 'cntlAbsender_Zoll - ' - Me.cntlAbsender_Zoll._abrArt = "ZOLL" - Me.cntlAbsender_Zoll._beteiligter = "ABS" - Me.cntlAbsender_Zoll._readOnly = False - Me.cntlAbsender_Zoll.Location = New System.Drawing.Point(507, 133) - Me.cntlAbsender_Zoll.Name = "cntlAbsender_Zoll" - Me.cntlAbsender_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAbsender_Zoll.TabIndex = 64 - Me.cntlAbsender_Zoll.TabStop = False - Me.cntlAbsender_Zoll.value = "" - ' - 'cntlEmpf_Clear - ' - Me.cntlEmpf_Clear._abrArt = "CLEARING" - Me.cntlEmpf_Clear._beteiligter = "EMPF" - Me.cntlEmpf_Clear._readOnly = False - Me.cntlEmpf_Clear.Location = New System.Drawing.Point(600, 94) - Me.cntlEmpf_Clear.Name = "cntlEmpf_Clear" - Me.cntlEmpf_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Clear.TabIndex = 52 - Me.cntlEmpf_Clear.TabStop = False - Me.cntlEmpf_Clear.value = "" - ' - 'cntlEmpf_Abf - ' - Me.cntlEmpf_Abf._abrArt = "ABFKOST" - Me.cntlEmpf_Abf._beteiligter = "EMPF" - Me.cntlEmpf_Abf._readOnly = False - Me.cntlEmpf_Abf.Location = New System.Drawing.Point(569, 94) - Me.cntlEmpf_Abf.Name = "cntlEmpf_Abf" - Me.cntlEmpf_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Abf.TabIndex = 51 - Me.cntlEmpf_Abf.TabStop = False - Me.cntlEmpf_Abf.value = "" - ' - 'cntlEmpf_Eust - ' - Me.cntlEmpf_Eust._abrArt = "EUST" - Me.cntlEmpf_Eust._beteiligter = "EMPF" - Me.cntlEmpf_Eust._readOnly = False - Me.cntlEmpf_Eust.Location = New System.Drawing.Point(538, 94) - Me.cntlEmpf_Eust.Name = "cntlEmpf_Eust" - Me.cntlEmpf_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Eust.TabIndex = 50 - Me.cntlEmpf_Eust.TabStop = False - Me.cntlEmpf_Eust.value = "" - ' - 'cntlEmpf_Zoll - ' - Me.cntlEmpf_Zoll._abrArt = "ZOLL" - Me.cntlEmpf_Zoll._beteiligter = "EMPF" - Me.cntlEmpf_Zoll._readOnly = False - Me.cntlEmpf_Zoll.Location = New System.Drawing.Point(507, 94) - Me.cntlEmpf_Zoll.Name = "cntlEmpf_Zoll" - Me.cntlEmpf_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlEmpf_Zoll.TabIndex = 49 - Me.cntlEmpf_Zoll.TabStop = False - Me.cntlEmpf_Zoll.value = "" - ' - 'cntlAuftr_Clear - ' - Me.cntlAuftr_Clear._abrArt = "CLEARING" - Me.cntlAuftr_Clear._beteiligter = "AUFTR" - Me.cntlAuftr_Clear._readOnly = False - Me.cntlAuftr_Clear.Location = New System.Drawing.Point(600, 57) - Me.cntlAuftr_Clear.Name = "cntlAuftr_Clear" - Me.cntlAuftr_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Clear.TabIndex = 35 - Me.cntlAuftr_Clear.TabStop = False - Me.cntlAuftr_Clear.value = "" - ' - 'cntlAuftr_Abf - ' - Me.cntlAuftr_Abf._abrArt = "ABFKOST" - Me.cntlAuftr_Abf._beteiligter = "AUFTR" - Me.cntlAuftr_Abf._readOnly = False - Me.cntlAuftr_Abf.Location = New System.Drawing.Point(569, 57) - Me.cntlAuftr_Abf.Name = "cntlAuftr_Abf" - Me.cntlAuftr_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Abf.TabIndex = 34 - Me.cntlAuftr_Abf.TabStop = False - Me.cntlAuftr_Abf.value = "" - ' - 'cntlAuftr_Eust - ' - Me.cntlAuftr_Eust._abrArt = "EUST" - Me.cntlAuftr_Eust._beteiligter = "AUFTR" - Me.cntlAuftr_Eust._readOnly = False - Me.cntlAuftr_Eust.Location = New System.Drawing.Point(538, 57) - Me.cntlAuftr_Eust.Name = "cntlAuftr_Eust" - Me.cntlAuftr_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Eust.TabIndex = 33 - Me.cntlAuftr_Eust.TabStop = False - Me.cntlAuftr_Eust.value = "" - ' - 'cntlAuftr_Zoll - ' - Me.cntlAuftr_Zoll._abrArt = "ZOLL" - Me.cntlAuftr_Zoll._beteiligter = "AUFTR" - Me.cntlAuftr_Zoll._readOnly = False - Me.cntlAuftr_Zoll.Location = New System.Drawing.Point(507, 57) - Me.cntlAuftr_Zoll.Name = "cntlAuftr_Zoll" - Me.cntlAuftr_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAuftr_Zoll.TabIndex = 32 - Me.cntlAuftr_Zoll.TabStop = False - Me.cntlAuftr_Zoll.value = "" - ' - 'cntlAvisierer_Clear - ' - Me.cntlAvisierer_Clear._abrArt = "CLEARING" - Me.cntlAvisierer_Clear._beteiligter = "AVISIERER" - Me.cntlAvisierer_Clear._readOnly = False - Me.cntlAvisierer_Clear.Location = New System.Drawing.Point(600, 20) - Me.cntlAvisierer_Clear.Name = "cntlAvisierer_Clear" - Me.cntlAvisierer_Clear.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Clear.TabIndex = 20 - Me.cntlAvisierer_Clear.TabStop = False - Me.cntlAvisierer_Clear.value = "" - ' - 'cntlAvisierer_Abf - ' - Me.cntlAvisierer_Abf._abrArt = "ABFKOST" - Me.cntlAvisierer_Abf._beteiligter = "AVISIERER" - Me.cntlAvisierer_Abf._readOnly = False - Me.cntlAvisierer_Abf.Location = New System.Drawing.Point(569, 20) - Me.cntlAvisierer_Abf.Name = "cntlAvisierer_Abf" - Me.cntlAvisierer_Abf.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Abf.TabIndex = 19 - Me.cntlAvisierer_Abf.TabStop = False - Me.cntlAvisierer_Abf.value = "" - ' - 'cntlAvisierer_Eust - ' - Me.cntlAvisierer_Eust._abrArt = "EUST" - Me.cntlAvisierer_Eust._beteiligter = "AVISIERER" - Me.cntlAvisierer_Eust._readOnly = False - Me.cntlAvisierer_Eust.Location = New System.Drawing.Point(538, 20) - Me.cntlAvisierer_Eust.Name = "cntlAvisierer_Eust" - Me.cntlAvisierer_Eust.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Eust.TabIndex = 18 - Me.cntlAvisierer_Eust.TabStop = False - Me.cntlAvisierer_Eust.value = "" - ' - 'cntlAvisierer_Zoll - ' - Me.cntlAvisierer_Zoll._abrArt = "ZOLL" - Me.cntlAvisierer_Zoll._beteiligter = "AVISIERER" - Me.cntlAvisierer_Zoll._readOnly = False - Me.cntlAvisierer_Zoll.Location = New System.Drawing.Point(507, 20) - Me.cntlAvisierer_Zoll.Name = "cntlAvisierer_Zoll" - Me.cntlAvisierer_Zoll.Size = New System.Drawing.Size(21, 20) - Me.cntlAvisierer_Zoll.TabIndex = 17 - Me.cntlAvisierer_Zoll.TabStop = False - Me.cntlAvisierer_Zoll.value = "" - ' - 'UsrCntlSND_NCTSGestellungsadresse1 - ' - Me.UsrCntlSND_NCTSGestellungsadresse1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlSND_NCTSGestellungsadresse1.Location = New System.Drawing.Point(0, 0) - Me.UsrCntlSND_NCTSGestellungsadresse1.Name = "UsrCntlSND_NCTSGestellungsadresse1" - Me.UsrCntlSND_NCTSGestellungsadresse1.Size = New System.Drawing.Size(549, 118) - Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 - ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index befe3f9..17bc1b7 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -3320,7 +3320,7 @@ Public Class frmSendungsdetailsNEU End Sub Sub initAnhang() - Dim hSQL As String = " SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND isnull(aa_name,'')='' THEN '***' ELSE [aa_name] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert + Dim hSQL As String = " SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND isnull(aa_name,'')='' THEN '***' ELSE [aa_name] END as [anh_Art],[anh_Typ],anh_LaufzettelDruck,anh_GestellungslisteAnfuegen, anh_markiert , anh_cmrId FROM [tblAvisoAnhaenge] left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art WHERE anh_AvisoId=" & AvisoId & " AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & ") @@ -3338,6 +3338,7 @@ Public Class frmSendungsdetailsNEU .Columns("anh_id").Visible = False 'VermerkID nicht anzeigen .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen .Columns("anh_markiert").Visible = False + .Columns("anh_cmrId").Visible = False .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" @@ -3362,15 +3363,31 @@ Public Class frmSendungsdetailsNEU .Columns("anh_GestellungslisteAnfuegen").Width = 150 .Columns("anh_GestellungslisteAnfuegen").HeaderText = "GestListe anfügen" + If .Columns("isCMR") Is Nothing Then + + Dim c As New DataGridViewImageColumn + c.Name = "isCMR" : c.HeaderText = "CMR" + c.Image = New Bitmap(1, 1) + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + .Columns.Add(c) + + End If + For Each row As DataGridViewRow In dgvAnhang.Rows + If Not IsDBNull(row.Cells("anh_markiert").Value) Then If row.Cells("anh_markiert").Value Then row.DefaultCellStyle.BackColor = Color.Yellow End If + + If Not IsDBNull(row.Cells("anh_cmrId").Value) Then + + If row.Cells("anh_cmrId").Value > 0 Then DirectCast(row.Cells("isCMR"), DataGridViewImageCell).Value = My.Resources.stift + + End If Next .ClearSelection() - End With End Sub @@ -4076,18 +4093,55 @@ Public Class frmSendungsdetailsNEU Try If TabControl1.SelectedTab Is tbAnhang Then If dgvAnhang.SelectedRows.Count > 0 Then - Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.SelectedRows(0).Cells("anh_docId").Value) - If Not IO.File.Exists(docPath) Then - MsgBox("Die Datei existiert nicht!") + + + + If dgvAnhang.Columns(e.ColumnIndex).Name = "isCMR" Then + If Not IsDBNull(dgvAnhang.SelectedRows(0).Cells("anh_cmrId").Value) AndAlso dgvAnhang.SelectedRows(0).Cells("anh_cmrId").Value > 0 Then + Dim cmrId As Integer = dgvAnhang.SelectedRows(0).Cells("anh_cmrId").Value + + Dim f As New SDL.frmCMR(cmrId, dgvAnhang.SelectedRows(0).Cells("anh_docId").Value, dgvAnhang.SelectedRows(0).Cells("anh_id").Value) + f.btnCMRtoAkt.Visible = True + f.txtCMRName.Visible = True + f.btnSaveVorlage.Visible = False 'aus dieser Ansicht keine Vorlagen speichern! + If f.ShowDialog(Me) = DialogResult.OK Then + If f.ueberschreiben Then + Dim da_id = -1 + Dim anhId = -1 + Dim destPath = "" + + Dim Typ = "" + + If f.PDF_Path <> "" Then + Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR") + frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath,, f.CMR.CMR_ID) + initAnhang() + + + End If + End If + End If + + End If + Else - If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) - Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() - System.IO.File.Copy(docPath, docPathTMP) - Process.Start(docPathTMP) + + + + Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvAnhang.SelectedRows(0).Cells("anh_docId").Value) + If Not IO.File.Exists(docPath) Then + MsgBox("Die Datei existiert nicht!") Else - Process.Start(docPath) + If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) + Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() + System.IO.File.Copy(docPath, docPathTMP) + Process.Start(docPathTMP) + Else + Process.Start(docPath) + End If End If End If + End If End If Catch ex As Exception @@ -5902,7 +5956,7 @@ Public Class frmSendungsdetailsNEU If f.PDF_Path <> "" Then Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR") - frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + frmSendungAnhangImport.saveToDS(AvisoId, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, f.CMR.CMR_ID) initAnhang() End If diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 88198a1..b19825b 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -504,29 +504,11 @@ Public Class usrcntlAktDetailsATILLANeu End Sub Sub initAnhaenge() - Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] + Dim hSQL As String = "SELECT [anh_id],[anh_Name],anh_Datum,[anh_docId], [anh_Art],[anh_Typ], anh_cmrId + FROM [tblAvisoAnhaenge] + left join tblAvisoAnhangsArten on aa_bezeichnung = anh_Art WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 - ORDER BY - case - when [anh_Art] = 'ATR-EUR1' then 0 - when [anh_Art] = 'Rechnung' then 1 - when [anh_Art] = 'eFatura' then 1.1 - when [anh_Art] = 'CMR' then 2 - when [anh_Art] = 'Ausfuhr' then 3 - when [anh_Art] = 'Vorpapier' then 4 - when [anh_Art] = 'Packliste' then 5 - when [anh_Art] = 'Auftrag' then 6 - when [anh_Art] = 'Auftrag' then 7 - when [anh_Art] = 'Dispoliste' then 8 - when [anh_Art] = 'Vorkasse' then 9 - when [anh_Art] = 'Überweisungsbeleg' then 10 - when [anh_Art] = 'Vollmacht' then 11 - when [anh_Art] = 'ATB' then 12 - when [anh_Art] = 'ATA' then 13 - when [anh_Art] = 'Sonstiges' then 99 - when [anh_Art] ='' then 15 - - END, [anh_Reihenfolge], anh_Datum desc, [anh_id]" + ORDER BY anh_SendungsId desc, case when aa_sort = NULL THEN 15 else aa_sort END, [anh_Reihenfolge],[anh_id]" ' order by [anh_Reihenfolge],[anh_id] dgvanhaenge.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL) @@ -539,7 +521,8 @@ Public Class usrcntlAktDetailsATILLANeu .RowTemplate.MinimumHeight = 30 .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells .Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke - .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen + .Columns("anh_docId").Visible = False + .Columns("anh_cmrId").Visible = False 'AvisoID nicht anzeigen .Columns("anh_Datum").MinimumWidth = 50 .Columns("anh_Datum").HeaderText = "Datum" @@ -558,6 +541,27 @@ Public Class usrcntlAktDetailsATILLANeu .Columns("anh_Typ").HeaderText = "Typ" .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + If .Columns("isCMR") Is Nothing Then + + Dim c As New DataGridViewImageColumn + c.Name = "isCMR" : c.HeaderText = "CMR" + c.Image = New Bitmap(1, 1) + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + .Columns.Add(c) + + End If + + For Each row As DataGridViewRow In dgvanhaenge.Rows + + If Not IsDBNull(row.Cells("anh_cmrId").Value) Then + + If row.Cells("anh_cmrId").Value > 0 Then DirectCast(row.Cells("isCMR"), DataGridViewImageCell).Value = My.Resources.stift + + End If + Next + + .ClearSelection() + End With End Sub @@ -565,21 +569,56 @@ Public Class usrcntlAktDetailsATILLANeu Try If dgvanhaenge.SelectedRows.Count > 0 Then - Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value) - If Not IO.File.Exists(docPath) Then - MsgBox("Die Datei existiert nicht!") - Else - If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) - Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() - File.Copy(docPath, docPathTMP) - Process.Start(docPathTMP) - Else - Process.Start(docPath) + + If dgvanhaenge.Columns(e.ColumnIndex).Name = "isCMR" Then + If Not IsDBNull(dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value) AndAlso dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value > 0 Then + Dim cmrId As Integer = dgvanhaenge.SelectedRows(0).Cells("anh_cmrId").Value + + Dim f As New SDL.frmCMR(cmrId, dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value, dgvanhaenge.SelectedRows(0).Cells("anh_id").Value) + f.btnCMRtoAkt.Visible = True + f.txtCMRName.Visible = True + f.btnSaveVorlage.Visible = False 'aus dieser Ansicht keine Vorlagen speichern! + + If f.ShowDialog(Me) = DialogResult.OK Then + If f.ueberschreiben Then + Dim da_id = -1 + Dim anhId = -1 + Dim destPath = "" + + Dim Typ = "" + + If f.PDF_Path <> "" Then + Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR") + frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath,, f.CMR.CMR_ID) + initAnhaenge() + + End If + End If + End If + + + End If + Else + + Dim docPath = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value) + If Not IO.File.Exists(docPath) Then + MsgBox("Die Datei existiert nicht!") + Else + If docPath.ToString.ToLower.EndsWith(".msg") Then ' MSG - Mails --> lokale Kopie, sonst Fehler (bereits von Benutzer soUndSo geöffnet) + Dim docPathTMP = VERAG_PROG_ALLGEMEIN.cFormularManager.getTMPPath_MSG() + File.Copy(docPath, docPathTMP) + Process.Start(docPathTMP) + Else + Process.Start(docPath) + End If + End If + End If End If + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try @@ -1611,7 +1650,7 @@ Public Class usrcntlAktDetailsATILLANeu If f.PDF_Path <> "" Then Dim CMRName = If(f.txtCMRName.Text <> "", f.txtCMRName.Text, "CMR") - frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath) + frmSendungAnhangImport.saveToDS(AvisoID, CMRName, f.PDF_Path, "CMR", "PDF", da_id, anhId, destPath,, f.CMR.CMR_ID) initAnhaenge() End If