From c07f717dc916c663fbd909b6d4414aadb0b5dd1f Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 20 Jan 2023 15:58:27 +0100 Subject: [PATCH] Rundungsdiff. Gesamtsicherheiten, Motis Email-Templage --- Aviso/frmGesamtsicherheitenNEU.Designer.vb | 22 +- Aviso/frmGesamtsicherheitenNEU.vb | 15 +- Aviso/frmSendungsdetailsNEU.Designer.vb | 700 +++++++++++---------- Aviso/frmSendungsdetailsNEU.vb | 55 ++ 4 files changed, 440 insertions(+), 352 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenNEU.Designer.vb b/Aviso/frmGesamtsicherheitenNEU.Designer.vb index df2c7b3..e3d097d 100644 --- a/Aviso/frmGesamtsicherheitenNEU.Designer.vb +++ b/Aviso/frmGesamtsicherheitenNEU.Designer.vb @@ -22,13 +22,14 @@ Partial Class frmGesamtsicherheitenNEU 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() 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(frmGesamtsicherheitenNEU)) - Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip() + Me.ContextMenuStripGesSicherh = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ATBNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel2 = New System.Windows.Forms.Panel() Me.pnlChangeATCNr = New System.Windows.Forms.Panel() @@ -63,9 +64,9 @@ Partial Class frmGesamtsicherheitenNEU Me.Label17 = New System.Windows.Forms.Label() Me.Label16 = New System.Windows.Forms.Label() Me.btnClosePanOverlay = New VERAG_PROG_ALLGEMEIN.FlatButton() - Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview() - Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip() + Me.dgvGesamtsicherheit = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.dgvSicherheitsPos = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.ContextMenuStripPosSicherheiten = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ATCMRNNraendernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnlSummeGes = New System.Windows.Forms.Panel() Me.txtPosSicherheitsbGes = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -144,6 +145,7 @@ Partial Class frmGesamtsicherheitenNEU Me.txtSicherheitFreitext = New System.Windows.Forms.TextBox() Me.btnAddPos = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.btnAddSicherheit = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.cbxRundPosanzeigen = New System.Windows.Forms.CheckBox() Me.ContextMenuStripGesSicherh.SuspendLayout() Me.Panel2.SuspendLayout() Me.pnlChangeATCNr.SuspendLayout() @@ -1260,6 +1262,7 @@ Partial Class frmGesamtsicherheitenNEU 'Panel1 ' Me.Panel1.BackColor = System.Drawing.SystemColors.ButtonHighlight + Me.Panel1.Controls.Add(Me.cbxRundPosanzeigen) Me.Panel1.Controls.Add(Me.btnRundungsdifAusgl) Me.Panel1.Controls.Add(Me.btnNew) Me.Panel1.Controls.Add(Me.cbx_offene) @@ -1665,6 +1668,16 @@ Partial Class frmGesamtsicherheitenNEU Me.btnAddSicherheit.TabIndex = 36 Me.btnAddSicherheit.UseVisualStyleBackColor = False ' + 'cbxRundPosanzeigen + ' + Me.cbxRundPosanzeigen.AutoSize = True + Me.cbxRundPosanzeigen.Location = New System.Drawing.Point(12, 38) + Me.cbxRundPosanzeigen.Name = "cbxRundPosanzeigen" + Me.cbxRundPosanzeigen.Size = New System.Drawing.Size(169, 17) + Me.cbxRundPosanzeigen.TabIndex = 52 + Me.cbxRundPosanzeigen.Text = "Rundungspositionen anzeigen" + Me.cbxRundPosanzeigen.UseVisualStyleBackColor = True + ' 'frmGesamtsicherheitenNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1815,4 +1828,5 @@ Partial Class frmGesamtsicherheitenNEU Friend WithEvents txtSicherheitsbetragContext As TextBox Friend WithEvents Label30 As Label Friend WithEvents btnRundungsdifAusgl As Button + Friend WithEvents cbxRundPosanzeigen As CheckBox End Class diff --git a/Aviso/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 37b4df1..dfe3b4d 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -54,8 +54,10 @@ Public Class frmGesamtsicherheitenNEU If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("GESAMTSICHERHEIT_RUNDUNGSKORREKTUR", "AVISO") Then btnRundungsdifAusgl.Visible = True + cbxRundPosanzeigen.Visible = True Else btnRundungsdifAusgl.Visible = False + cbxRundPosanzeigen.Visible = False End If currentGesSichRef = New VERAG_PROG_ALLGEMEIN.cAufschubKonten(Standort) @@ -65,7 +67,7 @@ Public Class frmGesamtsicherheitenNEU Me.Text = "Gesamtsicherheit " & Standort - cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge]", True, "AVISO", True) + cbx_Suche_Warenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 ORDER BY [wo_reihenfolge]", True, "AVISO", True) If setNullToZero(gessicherheitID) = "" Or Neu = True Then @@ -74,7 +76,7 @@ Public Class frmGesamtsicherheitenNEU panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) - cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' ORDER BY [wo_reihenfolge] ", True, "AVISO", True) + cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_bezeichnung],' - ' ,[wo_knnr]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND [wo_firma] = '" & firmaId & "' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) If datum = Nothing Then datum = Date.Now nextGessicherheitID = -1 @@ -101,6 +103,7 @@ Public Class frmGesamtsicherheitenNEU Public Sub LoadDGVSicherheiten(Optional withFilterParam As Boolean = False) + 'lblSaldo.Text = "Saldo: € " & currentGesSichRef.gsr_Saldo.ToString() txtGestellInfo.Text = "" Dim sqladd1 As String = "" @@ -110,6 +113,7 @@ Public Class frmGesamtsicherheitenNEU If withFilterParam = True Then If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')" If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= "AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'" + If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gs_isRundungsdiff,0) = 0" End If Dim SQLStringSicherheit As String = "select [gs_gsId], [gs_gsnr], [gs_posNr], [gs_ATBNr], [gs_datum], [gs_warenwert], [gs_sicherheitsbetrag], [gs_saldo] " & sqladd1 & " , [gs_freitext] from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" & sqlSearchSting & " order by [gs_ATBNr], [gs_posNr]" @@ -270,6 +274,7 @@ Public Class frmGesamtsicherheitenNEU sqlSearchSting &= "And gsp_gsid In (Select gs_gsId from [tblGesamtsicherheit] where [gs_gsnr] = '" & gessicherheitID & "'" If txt_Suche.Text <> "" Then sqlSearchSting &= "AND ([gs_abfertigungsNr] Like '%" & txt_Suche.Text & "%' OR [gs_ATBNr] Like '%" & txt_Suche.Text & "%' OR [gs_LKWKZ] like '%" & txt_Suche.Text & "%' OR [gs_avisoId] like '%" & txt_Suche.Text & "%' OR [gs_freitext] like '%" & txt_Suche.Text & "%')" If cbx_Suche_Warenort._value <> "" Then sqlSearchSting &= " AND gs_warenort like '%" & cbx_Suche_Warenort._value & "%'" + If cbxRundPosanzeigen.Checked = False Then sqlSearchSting &= "AND ISNULL(gsp_isPosRundungsdiff,0) = 0" sqlSearchSting &= ")" End If @@ -950,7 +955,7 @@ Public Class frmGesamtsicherheitenNEU panOverlay.Visible = True cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) cboFiliale.SelectedIndex = cboFiliale.FindString(Me.FilialNummer) - cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' ORDER BY [wo_reihenfolge] ", True, "AVISO", True) + cboWarenort.fillWithSQL("SELECT [wo_warenort],CONCAT([wo_knnr],' - ' ,[wo_bezeichnung]) FROM [tblWarenorte] WHERE [wo_aktiv] ='1' AND wo_ze = 1 ORDER BY [wo_reihenfolge] ", True, "AVISO", True) cboWarenort.SelectedIndex = cbx_Suche_Warenort.FindString(Me.warenortID) txtlkwIdSearch.initSearchBox(Me.FindForm, " LKW_Nr, AvisoID, CAST(Datum as Date) as Datum FROM [Aviso]", {"LKW_Nr", "AvisoID", "Datum"}, "", "Datum desc", "LKW_Nr", "AvisoId", "AVISO",, 250, 200) txtlkwIdSearch.SET_VALUE(avisoID) @@ -1739,4 +1744,8 @@ Public Class frmGesamtsicherheitenNEU Return False End Function + + Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxRundPosanzeigen.CheckedChanged + LoadDGVSicherheiten(True) + End Sub End Class diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 469f3be..fbd4ad6 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -202,10 +202,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() @@ -218,6 +243,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() @@ -377,32 +403,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - 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.AuftragMOTISToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -894,7 +895,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 @@ -902,7 +903,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 @@ -910,7 +911,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 ' @@ -948,7 +949,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 @@ -957,7 +958,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 @@ -966,7 +967,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 @@ -983,7 +984,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 @@ -991,7 +992,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 @@ -1000,7 +1001,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" ' 'ToolStripMenuItem12 @@ -2880,6 +2881,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 @@ -2947,6 +3008,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)) @@ -3135,6 +3436,14 @@ Partial Class frmSendungsdetailsNEU Me.pnlT1.Size = New System.Drawing.Size(549, 92) 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, 92) + Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 + ' 'Label43 ' Me.Label43.AutoSize = True @@ -4061,7 +4370,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 @@ -4073,7 +4382,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 @@ -4586,6 +4895,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" @@ -4754,9 +5064,9 @@ Partial Class frmSendungsdetailsNEU 'ContextMenuStrip1 ' 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.ToolStripMenuItem26, Me.ToolStripMenuItem27, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.WarenortAMBARToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem26, Me.ToolStripMenuItem27, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.WarenortAMBARToolStripMenuItem, Me.AuftragMOTISToolStripMenuItem}) Me.ContextMenuStrip1.Name = "cntxtAnh" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 304) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 356) ' 'ToolStripMenuItem15 ' @@ -4912,313 +5222,12 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'cntlFrachtfuehrer_Sonst + 'AuftragMOTISToolStripMenuItem ' - 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, 92) - Me.UsrCntlSND_NCTSGestellungsadresse1.TabIndex = 0 + Me.AuftragMOTISToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.email_big1 + Me.AuftragMOTISToolStripMenuItem.Name = "AuftragMOTISToolStripMenuItem" + Me.AuftragMOTISToolStripMenuItem.Size = New System.Drawing.Size(222, 30) + Me.AuftragMOTISToolStripMenuItem.Text = "Auftrag MOTIS" ' 'frmSendungsdetailsNEU ' @@ -5693,4 +5702,5 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents OhneGestellungsgarantieToolStripMenuItem As ToolStripMenuItem Friend WithEvents AMBARZollbeschauNEUToolStripMenuItem As ToolStripMenuItem Friend WithEvents WarenortAMBARToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AuftragMOTISToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 4fa2d87..73108f9 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5795,4 +5795,59 @@ Public Class frmSendungsdetailsNEU End Sub + Private Sub AuftragMOTISToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AuftragMOTISToolStripMenuItem.Click + Try + VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("ClipBoard_TMP") + If dgvAnhang.SelectedRows.Count >= 1 Then + Try + Dim outl As New Outlook.Application + Dim Mail As Microsoft.Office.Interop.Outlook.MailItem + Mail = outl.CreateItem(0) + Mail.To = "clearance@motisfreeflow.com" + + Mail.Subject = "Arrival Notice " & If(AVISO.LKW_Nr <> "", AVISO.LKW_Nr, "") & " our Ref: " & SENDUNG_LIST(CURRENT_INDEX).FilialenNr & "/" & SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr + + Dim TextHTML = "" + TextHTML &= "Dear Motis Free Flow Team,
" + TextHTML &= "
" + TextHTML &= "please see attached.
" + TextHTML &= "
" + + For Each r As DataGridViewRow In dgvAnhang.SelectedRows + Mail.Attachments.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value), Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue) + 'If (r.Cells("anh_ART").Value <> "***" Or r.Cells("anh_ART").Value <> "") Then + ' TextHTML &= r.Cells("anh_ART").Value + ' TextHTML &= "
" + 'End If + + Next + + TextHTML &= "Import document
" + TextHTML &= "T1
" + TextHTML &= "Commercial Invoice
" + TextHTML &= "Packing list
" + TextHTML &= "
" + TextHTML &= "ETA to MOTIS " & IIf(AVISO.VoraussichtlichesEintreffen IsNot Nothing, CDate(AVISO.VoraussichtlichesEintreffen).ToShortDateString, "") + TextHTML &= "
" + TextHTML &= "
" + TextHTML &= "Best regards
" + TextHTML &= "" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
" + TextHTML &= "
" + + Mail.HTMLBody = "
" & TextHTML & SDL.cFakturierung.getSignature("EN",,,, "BREXIT_VERAG") & "
" + + Dim answer = MsgBox("Vermerk 'An MOTIS avisiert' eintragen?", vbYesNoCancel) + If vbYes = answer Then + AvisoStatusFunctions.insertSendungsVermerk(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID, AvisoId, "An MOTIS avisiert", 43) + End If + Mail.Display() + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!") + End Try + End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!") + End Try + End Sub End Class