diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index b200bd6..b3d5114 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -953,6 +953,12 @@ UserControl + + usrCntlSND_Ausfuhr.vb + + + UserControl + usrCntlSND_NCTSGestellungsadresse.vb @@ -1268,6 +1274,9 @@ usrCntlSND_ATBGestellung.vb + + usrCntlSND_Ausfuhr.vb + usrCntlSND_NCTSGestellungsadresse.vb diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb index 7ea0839..449e255 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.Designer.vb @@ -23,17 +23,18 @@ Partial Class usrCntlBenachrichtigungen _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.Panel2 = New System.Windows.Forms.Panel() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.gridAvisoBenachrichtigungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.Panel3 = New System.Windows.Forms.Panel() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cbxCluster = New System.Windows.Forms.CheckBox() Me.cbxTeams = New System.Windows.Forms.CheckBox() Me.Label22 = New System.Windows.Forms.Label() Me.Label25 = New System.Windows.Forms.Label() - Me.cbxCluster = New System.Windows.Forms.CheckBox() + Me.cbxNeukunden = New System.Windows.Forms.CheckBox() Me.Panel2.SuspendLayout() CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel4.SuspendLayout() @@ -49,9 +50,26 @@ Partial Class usrCntlBenachrichtigungen Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(236, 203) + Me.Panel2.Size = New System.Drawing.Size(284, 203) Me.Panel2.TabIndex = 2 ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.MyComboBox2.BackColor = System.Drawing.Color.WhiteSmoke + Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.Location = New System.Drawing.Point(160, 86) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(71, 21) + Me.MyComboBox2.TabIndex = 27 + Me.MyComboBox2.Visible = False + ' 'gridAvisoBenachrichtigungen ' Me.gridAvisoBenachrichtigungen.AKTUALISIERUNGS_INTERVALL = -1 @@ -59,8 +77,8 @@ Partial Class usrCntlBenachrichtigungen Me.gridAvisoBenachrichtigungen.AllowUserToDeleteRows = False Me.gridAvisoBenachrichtigungen.AllowUserToOrderColumns = True Me.gridAvisoBenachrichtigungen.AllowUserToResizeRows = False - DataGridViewCellStyle3.BackColor = System.Drawing.Color.Azure - Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure + Me.gridAvisoBenachrichtigungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.gridAvisoBenachrichtigungen.BackgroundColor = System.Drawing.Color.White Me.gridAvisoBenachrichtigungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridAvisoBenachrichtigungen.Dock = System.Windows.Forms.DockStyle.Fill @@ -68,17 +86,18 @@ Partial Class usrCntlBenachrichtigungen Me.gridAvisoBenachrichtigungen.Name = "gridAvisoBenachrichtigungen" Me.gridAvisoBenachrichtigungen.ReadOnly = True Me.gridAvisoBenachrichtigungen.RowHeadersVisible = False - Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(236, 144) + Me.gridAvisoBenachrichtigungen.Size = New System.Drawing.Size(284, 144) Me.gridAvisoBenachrichtigungen.TabIndex = 2 ' 'Panel4 ' Me.Panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel4.Controls.Add(Me.cbxNeukunden) Me.Panel4.Controls.Add(Me.Button10) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel4.Location = New System.Drawing.Point(0, 165) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(236, 38) + Me.Panel4.Size = New System.Drawing.Size(284, 38) Me.Panel4.TabIndex = 5 ' 'Button10 @@ -89,7 +108,7 @@ Partial Class usrCntlBenachrichtigungen Me.Button10.ForeColor = System.Drawing.Color.Black Me.Button10.Image = Global.AVISO.My.Resources.Resources.ok Me.Button10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button10.Location = New System.Drawing.Point(111, 3) + Me.Button10.Location = New System.Drawing.Point(159, 3) Me.Button10.Name = "Button10" Me.Button10.Size = New System.Drawing.Size(121, 30) Me.Button10.TabIndex = 3 @@ -108,25 +127,20 @@ Partial Class usrCntlBenachrichtigungen Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(236, 21) + Me.Panel3.Size = New System.Drawing.Size(284, 21) Me.Panel3.TabIndex = 3 ' - 'MyComboBox2 + 'cbxCluster ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.MyComboBox2.BackColor = System.Drawing.Color.WhiteSmoke - Me.MyComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.MyComboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.MyComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(112, 86) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(71, 21) - Me.MyComboBox2.TabIndex = 27 - Me.MyComboBox2.Visible = False + Me.cbxCluster.AutoSize = True + Me.cbxCluster.ForeColor = System.Drawing.Color.White + Me.cbxCluster.Location = New System.Drawing.Point(219, 4) + Me.cbxCluster.Name = "cbxCluster" + Me.cbxCluster.Size = New System.Drawing.Size(58, 17) + Me.cbxCluster.TabIndex = 29 + Me.cbxCluster.Text = "Cluster" + Me.cbxCluster.UseVisualStyleBackColor = True + Me.cbxCluster.Visible = False ' 'cbxTeams ' @@ -154,24 +168,24 @@ Partial Class usrCntlBenachrichtigungen ' Me.Label25.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label25.ForeColor = System.Drawing.Color.White - Me.Label25.Location = New System.Drawing.Point(579, 6) + Me.Label25.Location = New System.Drawing.Point(627, 6) Me.Label25.Name = "Label25" Me.Label25.Size = New System.Drawing.Size(207, 19) Me.Label25.TabIndex = 1 Me.Label25.Text = "0 Akte vom Arbeitsplatz übernommen" Me.Label25.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cbxCluster + 'cbxNeukunden ' - Me.cbxCluster.AutoSize = True - Me.cbxCluster.ForeColor = System.Drawing.Color.White - Me.cbxCluster.Location = New System.Drawing.Point(219, 4) - Me.cbxCluster.Name = "cbxCluster" - Me.cbxCluster.Size = New System.Drawing.Size(58, 17) - Me.cbxCluster.TabIndex = 29 - Me.cbxCluster.Text = "Cluster" - Me.cbxCluster.UseVisualStyleBackColor = True - Me.cbxCluster.Visible = False + Me.cbxNeukunden.AutoSize = True + Me.cbxNeukunden.ForeColor = System.Drawing.Color.Black + Me.cbxNeukunden.Location = New System.Drawing.Point(7, 3) + Me.cbxNeukunden.Name = "cbxNeukunden" + Me.cbxNeukunden.Size = New System.Drawing.Size(82, 17) + Me.cbxNeukunden.TabIndex = 30 + Me.cbxNeukunden.Text = "Neukunden" + Me.cbxNeukunden.UseVisualStyleBackColor = True + Me.cbxNeukunden.Visible = False ' 'usrCntlBenachrichtigungen ' @@ -179,10 +193,11 @@ Partial Class usrCntlBenachrichtigungen Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.Panel2) Me.Name = "usrCntlBenachrichtigungen" - Me.Size = New System.Drawing.Size(236, 203) + Me.Size = New System.Drawing.Size(284, 203) Me.Panel2.ResumeLayout(False) CType(Me.gridAvisoBenachrichtigungen, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel4.ResumeLayout(False) + Me.Panel4.PerformLayout() Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() Me.ResumeLayout(False) @@ -199,4 +214,5 @@ Partial Class usrCntlBenachrichtigungen Public WithEvents gridAvisoBenachrichtigungen As VERAG_PROG_ALLGEMEIN.MyDatagridview Friend WithEvents cbxTeams As CheckBox Friend WithEvents cbxCluster As CheckBox + Friend WithEvents cbxNeukunden As CheckBox End Class diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index cb6a341..14c6402 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -31,20 +31,32 @@ Dim whereMA = " AND ( 1<>1 " - If cbxCluster.Checked Then - whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') " + + If cbxNeukunden.Checked Then + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" + whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='13') " 'TEAM_NEUKUNDEN --> VERAG + End Select Else - whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') " - whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') " - whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') " - whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') " - End If + + If cbxCluster.Checked Then + whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') " + Else + whereMA &= " OR (ab_TO_Art='B' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "') " + whereMA &= " OR (ab_TO_Art='N' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG & "') " + whereMA &= " OR (ab_TO_Art='A' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG & "') " + whereMA &= " OR (ab_TO_Art='F' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') " + End If - If cbxTeams.Checked Then - whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) " - Else - whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId & "') " + If cbxTeams.Checked Then + whereMA &= " Or (ab_TO_Art='T' AND ab_TO_Code IN (SELECT [team_id] FROM ADMIN.dbo.[tblTeams] WHERE team_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) " + Else + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing AndAlso VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then + whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId & "') " + End If + End If + End If whereMA &= " ) " @@ -183,6 +195,10 @@ cbxCluster.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER End If End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("BENACHRICHTIGUNGEN_SeeNeukunden", "AVISO") Then + cbxNeukunden.Visible = True + 'cbxNeukunden.Checked = True + End If @@ -285,4 +301,8 @@ Private Sub cbxCluster_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCluster.CheckedChanged initDgvAvisoBenachrichtigungen(True, Me.Font) End Sub + + Private Sub cbxNeukunden_CheckedChanged(sender As Object, e As EventArgs) Handles cbxNeukunden.CheckedChanged + initDgvAvisoBenachrichtigungen(True, Me.Font) + End Sub End Class diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index db9778e..4a66f42 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -143,7 +143,7 @@ Public Class frmEintragAviso cboImEx.Visible = True 'txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) - txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) + txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) 'txtBestimmungszollstelle.Visible = True 'lblZA.Visible = True pnl.Visible = True @@ -159,7 +159,7 @@ Public Class frmEintragAviso cboImEx.Visible = True ' txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) - txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) + txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) pnl.Visible = True Case "VERAG" @@ -200,6 +200,12 @@ Public Class frmEintragAviso lblSndFremd.Visible = True cboImEx.Visible = True Label1.Visible = True + + Case "DTB" + cboImEx.Visible = True + Label1.Visible = True + lblFiskAT.Visible = False + txtSndFiskalAT.Visible = False End Select Select Case FIRMA_TMP Case "FRONTOFFICE" @@ -1695,7 +1701,7 @@ Public Class frmEintragAviso pnl.Visible = False ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") - Label1.Visible = (cboGrenzstelle._value = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") + Label1.Visible = (cboGrenzstelle._value = "WAI" Or cboGrenzstelle._value = "DTB" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") Select Case FIRMA_TMP Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR" diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 1074e15..340ec85 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -88,6 +88,7 @@ Partial Class frmHauptfenster Me.NKDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DTBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.SpracheWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DeutschToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TürkischToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -267,6 +268,7 @@ Partial Class frmHauptfenster Me.Button10 = New System.Windows.Forms.Button() Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() + Me.btnColor = New System.Windows.Forms.Button() Me.lblMeineAviso = New System.Windows.Forms.Label() Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label18 = New System.Windows.Forms.Label() @@ -354,6 +356,12 @@ Partial Class frmHauptfenster Me.GüterlisteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.ColorDialog = New System.Windows.Forms.ColorDialog() + Me.ctxtFarben = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ALLEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.Top.SuspendLayout() @@ -390,6 +398,7 @@ Partial Class frmHauptfenster Me.pnlSearch.SuspendLayout() Me.pnlOptionen.SuspendLayout() Me.cntxt.SuspendLayout() + Me.ctxtFarben.SuspendLayout() Me.SuspendLayout() ' 'mnuInfo @@ -696,7 +705,7 @@ Partial Class frmHauptfenster ' 'StandortWechselnToolStripMenuItem ' - Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem}) + Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem, Me.DTBToolStripMenuItem}) Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem" Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln" @@ -739,6 +748,12 @@ Partial Class frmHauptfenster Me.AMBToolStripMenuItem.Text = "AMB" Me.AMBToolStripMenuItem.Visible = False ' + 'DTBToolStripMenuItem + ' + Me.DTBToolStripMenuItem.Name = "DTBToolStripMenuItem" + Me.DTBToolStripMenuItem.Size = New System.Drawing.Size(100, 22) + Me.DTBToolStripMenuItem.Text = "DTB" + ' 'SpracheWechselnToolStripMenuItem ' Me.SpracheWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DeutschToolStripMenuItem, Me.TürkischToolStripMenuItem}) @@ -1838,6 +1853,7 @@ Partial Class frmHauptfenster ' 'lblMitarbeiter ' + Me.lblMitarbeiter.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblMitarbeiter.AutoSize = True Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) @@ -1851,6 +1867,7 @@ Partial Class frmHauptfenster ' 'lblGrenzstelle ' + Me.lblGrenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblGrenzstelle.AutoSize = True Me.lblGrenzstelle.BackColor = System.Drawing.SystemColors.Control Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) @@ -1989,7 +2006,7 @@ Partial Class frmHauptfenster 'SplitContainer2 ' Me.SplitContainer2.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2 + Me.SplitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1 Me.SplitContainer2.Location = New System.Drawing.Point(0, 5) Me.SplitContainer2.Name = "SplitContainer2" ' @@ -1998,12 +2015,13 @@ Partial Class frmHauptfenster Me.SplitContainer2.Panel1.BackColor = System.Drawing.SystemColors.Control Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinks) Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinksOben) + Me.SplitContainer2.Panel1MinSize = 164 ' 'SplitContainer2.Panel2 ' Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) - Me.SplitContainer2.Panel2MinSize = 650 Me.SplitContainer2.Size = New System.Drawing.Size(815, 300) + Me.SplitContainer2.SplitterDistance = 164 Me.SplitContainer2.SplitterDistance = 111 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 @@ -2021,7 +2039,7 @@ Partial Class frmHauptfenster Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlLinks.Location = New System.Drawing.Point(0, 86) Me.pnlLinks.Name = "pnlLinks" - Me.pnlLinks.Size = New System.Drawing.Size(111, 214) + Me.pnlLinks.Size = New System.Drawing.Size(164, 214) Me.pnlLinks.TabIndex = 0 ' 'lblFimaAviso @@ -2046,7 +2064,7 @@ Partial Class frmHauptfenster Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(111, 111) + Me.Panel2.Size = New System.Drawing.Size(164, 111) Me.Panel2.TabIndex = 10 ' 'Label7 @@ -2068,7 +2086,7 @@ Partial Class frmHauptfenster Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red Me.lblErrVermerk.Location = New System.Drawing.Point(12, 158) Me.lblErrVermerk.Name = "lblErrVermerk" - Me.lblErrVermerk.Size = New System.Drawing.Size(84, 27) + Me.lblErrVermerk.Size = New System.Drawing.Size(137, 27) Me.lblErrVermerk.TabIndex = 1 Me.lblErrVermerk.Text = "Bei diesem Status kann kein Vermerk erfasst werden!" Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft @@ -2143,7 +2161,7 @@ Partial Class frmHauptfenster Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0) Me.pnlLinksOben.Name = "pnlLinksOben" - Me.pnlLinksOben.Size = New System.Drawing.Size(111, 86) + Me.pnlLinksOben.Size = New System.Drawing.Size(164, 86) Me.pnlLinksOben.TabIndex = 1 ' 'Label22 @@ -2218,8 +2236,8 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(703, 300) - Me.SplitContainer3.SplitterDistance = 172 + Me.SplitContainer3.Size = New System.Drawing.Size(650, 300) + Me.SplitContainer3.SplitterDistance = 158 Me.SplitContainer3.TabIndex = 3 ' 'UsrCntlBenachrichtigungen1 @@ -2228,7 +2246,7 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(172, 300) + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' 'pnl @@ -2239,7 +2257,7 @@ Partial Class frmHauptfenster Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(527, 300) + Me.pnl.Size = New System.Drawing.Size(488, 300) Me.pnl.TabIndex = 0 ' 'Button10 @@ -2268,7 +2286,7 @@ Partial Class frmHauptfenster Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText @@ -2283,7 +2301,7 @@ Partial Class frmHauptfenster DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 - Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Top + Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True @@ -2297,12 +2315,13 @@ Partial Class frmHauptfenster Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(527, 277) + Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 ' Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel6.Controls.Add(Me.btnColor) Me.Panel6.Controls.Add(Me.lblMeineAviso) Me.Panel6.Controls.Add(Me.cboMy_Grenzstelle) Me.Panel6.Controls.Add(Me.Label18) @@ -2315,9 +2334,20 @@ Partial Class frmHauptfenster Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(527, 21) + Me.Panel6.Size = New System.Drawing.Size(488, 21) Me.Panel6.TabIndex = 1 ' + 'btnColor + ' + Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnColor.BackColor = System.Drawing.Color.White + Me.btnColor.Location = New System.Drawing.Point(397, -1) + Me.btnColor.Name = "btnColor" + Me.btnColor.Size = New System.Drawing.Size(36, 23) + Me.btnColor.TabIndex = 27 + Me.btnColor.UseVisualStyleBackColor = False + Me.btnColor.Visible = False + ' 'lblMeineAviso ' Me.lblMeineAviso.AutoSize = True @@ -2341,7 +2371,7 @@ Partial Class frmHauptfenster Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMy_Grenzstelle.FormattingEnabled = True - Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(152, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 @@ -2351,7 +2381,7 @@ Partial Class frmHauptfenster Me.Label18.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label18.AutoSize = True Me.Label18.ForeColor = System.Drawing.Color.White - Me.Label18.Location = New System.Drawing.Point(84, 4) + Me.Label18.Location = New System.Drawing.Point(45, 4) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(62, 13) Me.Label18.TabIndex = 25 @@ -2362,7 +2392,7 @@ Partial Class frmHauptfenster Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_LKW.AutoSize = True Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White - Me.cbx_My_LKW.Location = New System.Drawing.Point(28, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(-11, 3) Me.cbx_My_LKW.Name = "cbx_My_LKW" Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17) Me.cbx_My_LKW.TabIndex = 24 @@ -2376,7 +2406,7 @@ Partial Class frmHauptfenster Me.cboMy_QS.Checked = True Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_QS.ForeColor = System.Drawing.Color.White - Me.cboMy_QS.Location = New System.Drawing.Point(414, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(445, 3) Me.cboMy_QS.Name = "cboMy_QS" Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 @@ -2390,7 +2420,7 @@ Partial Class frmHauptfenster Me.cboMy_VB.Checked = True Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_VB.ForeColor = System.Drawing.Color.White - Me.cboMy_VB.Location = New System.Drawing.Point(435, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(464, 3) Me.cboMy_VB.Name = "cboMy_VB" Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 @@ -2408,7 +2438,7 @@ Partial Class frmHauptfenster Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMyAvisoAnzeige.FormattingEnabled = True - Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(271, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 @@ -2418,7 +2448,7 @@ Partial Class frmHauptfenster Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label17.AutoSize = True Me.Label17.ForeColor = System.Drawing.Color.White - Me.Label17.Location = New System.Drawing.Point(222, 3) + Me.Label17.Location = New System.Drawing.Point(183, 3) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(48, 13) Me.Label17.TabIndex = 20 @@ -2428,7 +2458,7 @@ Partial Class frmHauptfenster ' Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAkte.ForeColor = System.Drawing.Color.White - Me.lblAkte.Location = New System.Drawing.Point(800, 6) + Me.lblAkte.Location = New System.Drawing.Point(761, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -3394,6 +3424,40 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'ctxtFarben + ' + Me.ctxtFarben.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.ctxtFarben.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ALLEToolStripMenuItem, Me.ToolStripMenuItem19, Me.ToolStripMenuItem20, Me.ToolStripMenuItem21}) + Me.ctxtFarben.Name = "cntxt" + Me.ctxtFarben.Size = New System.Drawing.Size(122, 92) + ' + 'ALLEToolStripMenuItem + ' + Me.ALLEToolStripMenuItem.Name = "ALLEToolStripMenuItem" + Me.ALLEToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.ALLEToolStripMenuItem.Text = "ALLE" + ' + 'ToolStripMenuItem19 + ' + Me.ToolStripMenuItem19.BackColor = System.Drawing.Color.Red + Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(121, 22) + Me.ToolStripMenuItem19.Text = "ROT" + ' + 'ToolStripMenuItem20 + ' + Me.ToolStripMenuItem20.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(121, 22) + Me.ToolStripMenuItem20.Text = "ORANGE" + ' + 'ToolStripMenuItem21 + ' + Me.ToolStripMenuItem21.BackColor = System.Drawing.Color.Yellow + Me.ToolStripMenuItem21.Name = "ToolStripMenuItem21" + Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) + Me.ToolStripMenuItem21.Text = "GELB" + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3461,6 +3525,7 @@ Partial Class frmHauptfenster Me.pnlSearch.PerformLayout() Me.pnlOptionen.ResumeLayout(False) Me.cntxt.ResumeLayout(False) + Me.ctxtFarben.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -3785,5 +3850,12 @@ Partial Class frmHauptfenster Friend WithEvents BrexitToolStripMenuItem1 As ToolStripMenuItem Friend WithEvents EmbargosLänderToolStripMenuItem As ToolStripMenuItem Friend WithEvents GüterlisteToolStripMenuItem As ToolStripMenuItem - Friend WithEvents RoutenverwaltungToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DTBToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnColor As Button + Friend WithEvents ColorDialog As ColorDialog + Friend WithEvents ctxtFarben As ContextMenuStrip + Friend WithEvents ToolStripMenuItem19 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem20 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem21 As ToolStripMenuItem + Friend WithEvents ALLEToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 9bc720a..cb80e1a 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -259,6 +259,12 @@ 1421, 17 + + 1557, 17 + + + 17, 56 + AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 755041d..d034037 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -188,6 +188,9 @@ Public Class frmHauptfenster 'transparentpnl.BackColor = Color.FromArgb(25, Color.Red) ' transparentpnl.BackColor = Color.Transparent + + + TimerAkte.Enabled = True Grid_aktiv = False @@ -227,6 +230,7 @@ Public Class frmHauptfenster + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then cboMy_Grenzstelle.Items.Clear() cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "' AND grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False) @@ -251,6 +255,7 @@ Public Class frmHauptfenster cboMy_Grenzstelle.changeItem("") cboMyAvisoAnzeige.Items.Clear() + cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE")) cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer")) cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False) cboMyAvisoAnzeige.changeItem("Benutzer") @@ -1091,9 +1096,12 @@ Public Class frmHauptfenster '---------------------------------------------------------------------------------------------------------------------------------- '--- Sendung --- '---------------------------------------------------------------------------------------------------------------------------------- - Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " + Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer" If cboMyAvisoAnzeige._value <> "" Then - If cboMyAvisoAnzeige._value = "T1" Then + If cboMyAvisoAnzeige._value = "ALLE" Then + ' inBearbeitungSQL = " 1=1 " 'ALLE + inBearbeitungSQL = " ( tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') OR Aviso.[TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') OR tblSendungen.LetzterMitarbeiterId=@maId) " + ElseIf cboMyAvisoAnzeige._value = "T1" Then inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 " 'NUR VERAG/IMEX: inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) " @@ -1120,11 +1128,39 @@ Public Class frmHauptfenster End Select If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" + + 'Farbe + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then + Select Case btnColor.BackColor + Case Color.Red + sqlStr &= " AND (Status = 3 ) " + Case Color.Orange + sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE()) ) ) " + Case Color.Yellow + sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 1,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 2,GETDATE()) AS DATE) ) ) " + End Select + End If + ''Farbe + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then + ' Select Case btnColor.BackColor + ' Case Color.Red + ' sqlStr &= " AND (Status = 3 OR (Status IN (0, 3, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE)<= cast(GETDATE() AS DATE) ) or VoraussichtlichesEintreffen is null) " + ' Case Color.Orange + ' sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) " + ' Case Color.Yellow + ' sqlStr &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY, 2,GETDATE()) AS DATE) AND cast(DATEADD(DAY, 3,GETDATE()) AS DATE) ) ) " + ' End Select + 'End If + + '''sqlStr &= " AND (Grenzstelle ='???' OR Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen! + ''' Funktioniert nciht, wg. WO + + sqlStr &= " ORDER BY case " & - " when [Status] =3 then 0 " & - " when [Status] =1 then 5 " & - " else 1 " & - " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID") + " when [Status] =3 then 0 " & + " when [Status] =1 then 5 " & + " else 1 " & + " END, VoraussichtlichesEintreffen, Grenzstelle,Ankunft " & If(cbx_My_LKW.Checked, "", ",tblSnd_SendungID") End If 'Dim sqlStr As String = " SELECT AvisoID, [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, LetzterMitarbeiterId AS maId, CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,LetzterMitarbeiter,CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],AvisoTVHinweis " & @@ -1373,8 +1409,54 @@ Public Class frmHauptfenster 'End If + + + 'Farbkennung + + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then + If Not cbx_My_LKW.Checked Then + Select Case r.Cells("Status").Value + Case "1", "2" + ' Freigabe, N.Eingetr. + Case "3" + ' Ankunft + r.DefaultCellStyle.BackColor = Color.IndianRed + Case Else + 'Alle anderen Status: + If r.Cells("VoraussichtlichesEintreffen").Value IsNot DBNull.Value AndAlso IsDate(r.Cells("VoraussichtlichesEintreffen").Value) Then + + Dim VoraussichtlichesEintreffen = CDate(r.Cells("VoraussichtlichesEintreffen").Value) + + 'If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute + ' r.DefaultCellStyle.BackColor = Color.IndianRed + 'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(1).ToShortDateString) Then 'morgen + ' r.DefaultCellStyle.BackColor = Color.Orange + 'ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(3).ToShortDateString) Then 'Ümorgen+ÜÜmorgen + ' r.DefaultCellStyle.BackColor = Color.LightYellow + 'End If + + If CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.ToShortDateString) Then 'heute + r.DefaultCellStyle.BackColor = Color.Orange + ElseIf CDate(VoraussichtlichesEintreffen.ToShortDateString) <= CDate(Now.AddDays(2).ToShortDateString) Then 'morgen + r.DefaultCellStyle.BackColor = Color.LightYellow + End If + + Else + End If + End Select + End If + End If + + Next + + + + + + + '.Width = gridAviso.Width - gridVermerke.Width '.Sort(.Columns(3), System.ComponentModel.ListSortDirection.Descending) .SelectionMode = DataGridViewSelectionMode.FullRowSelect @@ -1545,7 +1627,7 @@ Public Class frmHauptfenster If (gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value Is DBNull.Value OrElse gridAviso.Rows(e.RowIndex).Cells("Ankunft").Value = LeerDatum) AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value IsNot DBNull.Value AndAlso gridAviso.Rows(e.RowIndex).Cells("TageBisEintreffen").Value <= 1 Then 'gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.ForeColor = Color.Red - gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold) + gridAviso.Rows(e.RowIndex).Cells("VoraussichtlichesEintreffen").Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold) End If End Select @@ -1846,14 +1928,14 @@ Public Class frmHauptfenster If frmLogin.AnmeldungOK Then Try - If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then - avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert - UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont) + If DateDiff(DateInterval.Second, hMerkZeit, Now) > 60 Then + avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) 'hMerkZeit wird in aviso_anzeigen aktualisiert + UsrCntlBenachrichtigungen1.initDgvAvisoBenachrichtigungen(Grid_aktiv, gridFont) - End If - Catch ex As Exception + End If + Catch ex As Exception - End Try + End Try If False Then 'NUR AKTUALISIEREN; WENN FENSTER AKTIV --> bei 2. Monitor PROBLEM Try @@ -2190,32 +2272,32 @@ Public Class frmHauptfenster End If - 'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + 'Select Case VERAG_PROG_ALLGEMEIN.cAviso.getFirmaByAvisoId(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) - ' Case "ATILLA" - ' If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then - ' Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu) - ' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then - ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) - ' Else - ' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown) - ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) - ' End If - ' End If - ' End If - ' Case Else - ' Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails) - ' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then - ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) - ' Else - ' usrcntl.changeCurrentSndId() - ' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown) - ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) - ' End If - ' End If - 'End Select + ' Case "ATILLA" + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("DAKOSY", Me.FindForm) Then + ' Dim usrcntl As usrcntlAktDetailsATILLANeu = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetailsATILLANeu) + ' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then + ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + ' Else + ' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown) + ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + ' End If + ' End If + ' End If + ' Case Else + ' Dim usrcntl As usrcntlAktDetails = DirectCast(pnlDetailsRechts.Controls(0), usrcntlAktDetails) + ' If aktWithoutCheckTime Or usrcntl.AvisoID <> tmpid Then + ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + ' Else + ' usrcntl.changeCurrentSndId() + ' If DateDiff(DateInterval.Second, usrcntl.aktiv, Now) > 60 Then 'Wenn die Details länger als 60 Sek inaktiv sind (Prüfung durch click und keydown) + ' Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + ' End If + ' End If + 'End Select - End If + End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, "LOG") End Try @@ -2425,19 +2507,19 @@ Public Class frmHauptfenster End If btnWichtigeStandort.Visible = False - Panel2.Visible = False - Label4.Visible = False - cboGrenzstelle.Visible = False - BürgschaftenExcelToolStripMenuItem.Visible = True - ToolStripMenuItem4.Visible = True - ToolStripMenuItem5.Visible = True - ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then - 'btnGenerelleGestellungen.Visible = False - ToolStripMenuItem4.Visible = True - ToolStripMenuItem5.Visible = True - ToolStripMenuItem6.Visible = True - Else 'VERAG - BürgschaftenExcelToolStripMenuItem.Visible = True + Panel2.Visible = False + Label4.Visible = False + cboGrenzstelle.Visible = False + BürgschaftenExcelToolStripMenuItem.Visible = True + ToolStripMenuItem4.Visible = True + ToolStripMenuItem5.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then + 'btnGenerelleGestellungen.Visible = False + ToolStripMenuItem4.Visible = True + ToolStripMenuItem5.Visible = True + ToolStripMenuItem6.Visible = True + Else 'VERAG + BürgschaftenExcelToolStripMenuItem.Visible = True ToolStripMenuItem4.Visible = True ToolStripMenuItem5.Visible = True ToolStripMenuItem6.Visible = True @@ -2445,13 +2527,32 @@ Public Class frmHauptfenster Button5.Visible = True End If End If - If SplitContainer2.Width > 800 Then - 'SplitContainer2.Panel2MinSize = 600 - SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750 - If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!! - ' If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900 + + + + 'Wenn Teamzuweisung --> Backoffice --> Meine Senungen größer! + If If(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId, 0) > 0 Then + splitMain.SplitterDistance = CInt(splitMain.Height / 2) + Else + + End If + 'If SplitContainer2.Width > 800 Then + ' 'SplitContainer2.Panel2MinSize = 600 + ' SplitContainer2.SplitterDistance = 130 'SplitContainer2.Width - 750 + ' If SplitContainer2.Panel2.Width > 1200 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 1200 '__> DAS"!!! + ' ' If SplitContainer2.Panel2.Width > 900 Then SplitContainer2.SplitterDistance = SplitContainer2.Width - 900 + 'End If + + If SplitContainer2.Width > 1000 Then + SplitContainer2.SplitterDistance = 350 'SplitContainer2.Width - 750 + Else + SplitContainer2.SplitterDistance = 160 'SplitContainer2.Width - 750 + End If + + + If My.Computer.Screen.WorkingArea.Width < 1300 Then 'tabAnkunft.Text = "ANKUNFT." 'tabErfasst.Text = "ERFASST" @@ -2464,6 +2565,10 @@ Public Class frmHauptfenster End If tbcntrAviso.Width = Panel1.Width VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) + + + + End Sub WithEvents timerStart As New Timer @@ -3655,6 +3760,11 @@ Public Class frmHauptfenster cboMyAvisoAnzeige.Visible = Not cbx_My_LKW.Checked Label17.Visible = Not cbx_My_LKW.Checked + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then + btnColor.Visible = Not cbx_My_LKW.Checked + Else + btnColor.Visible = False + End If If cbx_My_LKW.Checked Then lblMeineAviso.Text = "Meine Aviso:" Else @@ -3824,7 +3934,7 @@ Public Class frmHauptfenster End Sub Private Sub Button11_Click_1(sender As Object, e As EventArgs) Handles Button11.Click - CHMRC.VATTEST(InputBox("Token")) + cHMRC.VATTEST(InputBox("Token")) End Sub Private Sub GVMSUKIMportToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GVMSUKIMportToolStripMenuItem.Click @@ -4026,6 +4136,42 @@ Public Class frmHauptfenster Dim f As New frmNCTSRouten() f.ShowDialog(Me) End Sub + + Private Sub DTBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DTBToolStripMenuItem.Click + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then + VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = sender.text + VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = sender.text 'Nochmal, sonst wird es durch MA geändert + showMeNew() + Else + MsgBox("Keine Berechtigung!") + End If + End Sub + + Private Sub Button13_Click(sender As Object, e As EventArgs) Handles btnColor.Click + ctxtFarben.Show(Cursor.Position) + + End Sub + + Private Sub ToolStripMenuItem19_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem19.Click + btnColor.BackColor = Color.Red + meineAviso_anzeigen() + End Sub + + Private Sub ToolStripMenuItem20_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem20.Click + btnColor.BackColor = Color.Orange + meineAviso_anzeigen() + End Sub + + Private Sub ToolStripMenuItem21_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem21.Click + btnColor.BackColor = Color.Yellow + meineAviso_anzeigen() + End Sub + + + Private Sub ALLEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ALLEToolStripMenuItem.Click + btnColor.BackColor = Color.White + meineAviso_anzeigen() + End Sub End Class Public Class AvisoStatusFunctions @@ -4441,64 +4587,64 @@ Public Class AvisoStatusFunctions If GrenzstelleMail = "" And art <> 5 Then - '---------------------------------------- - Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL! - 'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + '---------------------------------------- + Exit Sub ' Wenn Grenzstelle leer / ??? --> Keine MAIL! + 'If GrenzstelleMail = "" Then GrenzstelleMail = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + End If + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO" + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI" + + If GrenzstelleMail <> "" Then + Dim Standort As New cStandort + + Standort = Standorte.LesenStandort(0, GrenzstelleMail, "") + + If Not IsNothing(Standort) Then + Select Case art + Case 1, 3 + If Standort.eMail_Ankunft_Betreff <> "" Then + hBetreff = Standort.eMail_Ankunft_Betreff + hBody = Standort.eMail_Ankunft_Text + End If + Case 2, 4 + If Standort.eMail_Freigabe_Betreff <> "" Then + hBetreff = Standort.eMail_Freigabe_Betreff + hBody = Standort.eMail_Freigabe_Text + End If + Case 5 + If Standort.eMail_Status_Betreff <> "" Then + hBetreff = Standort.eMail_Status_Betreff + hBody = Standort.eMail_Status_Text + End If + End Select End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then GrenzstelleMail = "FO" - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then GrenzstelleMail = "UNI" + End If - If GrenzstelleMail <> "" Then - Dim Standort As New cStandort - - Standort = Standorte.LesenStandort(0, GrenzstelleMail, "") - - If Not IsNothing(Standort) Then - Select Case art - Case 1, 3 - If Standort.eMail_Ankunft_Betreff <> "" Then - hBetreff = Standort.eMail_Ankunft_Betreff - hBody = Standort.eMail_Ankunft_Text - End If - Case 2, 4 - If Standort.eMail_Freigabe_Betreff <> "" Then - hBetreff = Standort.eMail_Freigabe_Betreff - hBody = Standort.eMail_Freigabe_Text - End If - Case 5 - If Standort.eMail_Status_Betreff <> "" Then - hBetreff = Standort.eMail_Status_Betreff - hBody = Standort.eMail_Status_Text - End If - End Select - End If - - End If - - Dim anhaenge As New List(Of String) - hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird. - hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge) + Dim anhaenge As New List(Of String) + hBetreff = Platzhalter_ersetzen(hBetreff, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, 0, AVISO, KundenNr, anhaenge) ' art 0 damit nicht beim betreff auch die DY-Daten durchsuht werden und die Sendungsliste erstellt wird. + hBody = Platzhalter_ersetzen(hBody, AVISO.LKW_Nr, AVISO.Grenzstelle, AVISO.AvisoId, art, AVISO, KundenNr, anhaenge) - hBody = hBody.Replace("%0", "
") + hBody = hBody.Replace("%0", "
") - hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht! + hBody = hBody.Replace("%Firma", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) ' gibts noch nicht! - 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX" - ' Case "VERAG" - ' Case "UNISPED" - ' hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz - 'End Select + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA '= "IMEX" + ' Case "VERAG" + ' Case "UNISPED" + ' hBody = hBody.Replace("VERAG", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) 'hier der Ersatz + 'End Select - Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId) + Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_STATUSMAIL, art,,, KundenNr, AVISO.AvisoId) - API.api_EMail = EMails - API.api_EMailCC = EMails_CC - API.api_EMailBCC = EMails_BCC - API.api_EMailSubject = hBetreff - API.api_EMailText = hBody - API.api_EMailAttCnt = anhaenge.Count + API.api_EMail = EMails + API.api_EMailCC = EMails_CC + API.api_EMailBCC = EMails_BCC + API.api_EMailSubject = hBetreff + API.api_EMailText = hBody + API.api_EMailAttCnt = anhaenge.Count If ForceMail <> "" Then @@ -4534,25 +4680,25 @@ Public Class AvisoStatusFunctions AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, MailArt & txt, 46, , "(AUTO)") Else - API.UPDTAE_ERR() - AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)") - End If + API.UPDTAE_ERR() + AvisoStatusFunctions.insertVermerkAllg(AVISO.AvisoId, "ERR: " & MailArt & " E-Mail konnte nicht gesendet werden!", 46, , "(AUTO)") End If - - 'OLD ---------------------------------- - If False Then - Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff - If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC - If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC - If hBody <> "" Then hMail += "&Body=" & hBody - Try - System.Diagnostics.Process.Start(hMail) - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten") - End Try - End If - ' ---------------------------------- End If + + 'OLD ---------------------------------- + If False Then + Dim hMail As String = "mailto:" & EMails & "?subject=" & hBetreff + If EMails_CC.ToString.Trim <> "" Then hMail += "&CC=" & EMails_CC + If EMails_BCC.ToString.Trim <> "" Then hMail += "&BCC=" & EMails_BCC + If hBody <> "" Then hMail += "&Body=" & hBody + Try + System.Diagnostics.Process.Start(hMail) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW, "Beim Mail-Versenden ist ein Fehler aufgetreten") + End Try + End If + ' ---------------------------------- + End If End Sub @@ -5656,20 +5802,26 @@ Public Class AvisoStatusFunctions SENDUNG_TMP.saveSachbearbeiter = True - If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then + If SENDUNG_TMP.tblSnd_Vorbereitet Is Nothing Then ' VB gesetzt! SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID SENDUNG_TMP.tblSnd_FilialeAbklaerung = VERAG_PROG_ALLGEMEIN.cAllgemein.getSTAMMFILIALE 'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then ' SENDUNG_TMP.tblSnd_QS_MA = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID 'End If + + 'Lt. Bespr. ML und TW (6.10.22) --> wenn VBQS gesetzt, soll MA leer sein: + SENDUNG_TMP.LetzterMitarbeiter = "" + SENDUNG_TMP.LetzterMitarbeiterId = -1 + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERIMEX" Then If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId IsNot Nothing Then SENDUNG_TMP.tblSnd_TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId End If SENDUNG_TMP.tblSnd_Vorbereitet = Now 'SENDUNG_TMP.tblSnd_Status=VERAG_PROG_ALLGEMEIN.vor ' Status macht keinen Sinn.. - AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) - Else - SENDUNG_TMP.tblSnd_Vorbereitet = Nothing + AvisoDAL.addAenderung(AvisoID, "Sendung auf VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) + Else + SENDUNG_TMP.tblSnd_Vorbereitet = Nothing AvisoDAL.addAenderung(AvisoID, "Sendung auf NICHT VORBEREITET gesetzt", "Sendung '" & SENDUNG_TMP.tblSnd_PosUnterNr & " " & SENDUNG_TMP.tblSnd_Empfaenger & "' auf NICHT VORBEREITET gesetzt von " & VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter & " am " & Format(Now, "dd.MM.yyyy HH:mm")) End If Return SENDUNG_TMP.SAVE() @@ -5919,10 +6071,10 @@ Public Class AvisoStatusFunctions Dim AtcMrn = "" Dim DsId = "" - Dim DsId2 = "" - Dim frist = "" - Dim gestellungsadresse = "" - Dim found = False + Dim DsId2 = "" + Dim frist = "" + Dim gestellungsadresse = "" + Dim found = False Select Case s.tblSnd_Abfertigungsart_ID Case 5, 6, 18, 24, 32, 33, 34, 37, 40 'Versand gestellungsadresse = "" & s.getNCTSAdress(True, True, False) & "" @@ -5989,10 +6141,10 @@ Public Class AvisoStatusFunctions End If End If Case Else - getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2) - If s.tblSnd_Abfertigungsart_ID = 23 Then - s.LOAD_HANDLING() - For Each hd In s.HANDLING + getDataFronDY_EZA(s.tblSnd_SendungID, AtcMrn, DsId, s.FilialenNr, s.AbfertigungsNr, DsId2) + If s.tblSnd_Abfertigungsart_ID = 23 Then + s.LOAD_HANDLING() + For Each hd In s.HANDLING AtcMrn &= hd.sndhdg_nr & ", " Next If AtcMrn.EndsWith(", ") Then AtcMrn = AtcMrn.Substring(0, AtcMrn.Length - 2) @@ -6291,7 +6443,7 @@ Public Class AvisoStatusFunctions myVermerk.VermerkCodeId = VermerkCodeId Dim VermerkeDAL As New cVermerkeDAL VermerkeDAL.SpeichernVermerk(myVermerk) - frmHauptfenster.Details_anzeigen(AvisoID) + If frmHauptfenster IsNot Nothing Then frmHauptfenster.Details_anzeigen(AvisoID) End Sub diff --git a/Aviso/frmLaufzettel.vb b/Aviso/frmLaufzettel.vb index 7035ca1..63bc597 100644 --- a/Aviso/frmLaufzettel.vb +++ b/Aviso/frmLaufzettel.vb @@ -163,12 +163,21 @@ Public Class frmLaufzettel btnLaufzettelDrucken.Enabled = True End If + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG + Case "WAI", "DTB" + CheckBox2.Checked = True + CheckBox3.Visible = False + CheckBox4.Checked = True + End Select + + 'pnlZumZoll - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "FRONTOFFICE" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "DTB" Then CheckBox2.Checked = False ' Wenn nicht FO, dann normal nicht gewählt... - If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "SUB" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" Then '... und nur in SUBEN ersichtlich + If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "SUB" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "WAI" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "DTB" Then '... und nur in SUBEN ersichtlich pnlZumZoll.Visible = False End If + End If If SENDUNG_LIST Is Nothing Then @@ -249,27 +258,36 @@ Public Class frmLaufzettel If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then - Try - Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_WAI(AVISO) + Try + Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_WAI(AVISO) If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try - Else - If Not CheckBox3.Checked And Not CheckBox4.Checked Then - MsgBox("Bitte 'AT ZOLL' oder 'DE ZOLL' auswählen!") - Exit Sub - End If + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "DTB" Then + Try + Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO_DTB(AVISO) + If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) + ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) + Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try + Else - Try - 'If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO, If(CheckBox3.Checked, "AT", If(CheckBox4.Checked, "DE", ""))) - Dim path = "" - If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_AT(AVISO) - If CheckBox4.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_DE(AVISO) + If Not CheckBox3.Checked And Not CheckBox4.Checked Then + MsgBox("Bitte 'AT ZOLL' oder 'DE ZOLL' auswählen!") + Exit Sub + End If + + Try + 'If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO(AVISO, If(CheckBox3.Checked, "AT", If(CheckBox4.Checked, "DE", ""))) + Dim path = "" + If CheckBox3.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_AT(AVISO) + If CheckBox4.Checked Then path = SDL.FormularManagerNEU.zumZOLL_AVISO_DE(AVISO) If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({path}, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) 'If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, cboPrinter.SelectedItem.ToString) '(New System.Drawing.Printing.PrinterSettings).PrinterName) Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try - End If + End If + + diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 37ac16e..7fb4f82 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -24,10 +24,10 @@ Partial Class frmSendungsdetailsNEU Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSendungsdetailsNEU)) - 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 DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -38,6 +38,7 @@ Partial Class frmSendungsdetailsNEU Me.btnDirektAnfuegen = New System.Windows.Forms.Button() Me.dgvAnhang = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel19 = New System.Windows.Forms.Panel() + Me.Button17 = New System.Windows.Forms.Button() Me.btnQuckScan = New System.Windows.Forms.Button() Me.Panel21 = New System.Windows.Forms.Panel() Me.Label53 = New System.Windows.Forms.Label() @@ -113,7 +114,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlDetails = New System.Windows.Forms.Panel() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.txtFrachtkosten = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtFrachtkostenEU = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label1 = New System.Windows.Forms.Label() Me.cbx = New System.Windows.Forms.CheckBox() Me.txtWarenwertWaehrung = New VERAG_PROG_ALLGEMEIN.MySearchBox() @@ -159,6 +160,11 @@ Partial Class frmSendungsdetailsNEU Me.btnKassenbuchEintrag = New System.Windows.Forms.Button() Me.btnLeihgeld = New System.Windows.Forms.Button() Me.Panel6 = New System.Windows.Forms.Panel() + Me.txtFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() + Me.Panel12 = New System.Windows.Forms.Panel() + Me.lblErr_FraechterKdNr = New System.Windows.Forms.Label() + Me.lblErr_EmpfKdNr = New System.Windows.Forms.Label() + Me.lblErr_AvisiererKdNr = New System.Windows.Forms.Label() Me.picKdAtrNr_Fraechter = New System.Windows.Forms.PictureBox() Me.picKdAtrNr_Empfänger = New System.Windows.Forms.PictureBox() Me.picKdAtrNr_Auftraggeber = New System.Windows.Forms.PictureBox() @@ -189,40 +195,14 @@ 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() Me.Panel13 = New System.Windows.Forms.Panel() - Me.Panel12 = New System.Windows.Forms.Panel() Me.Panel11 = New System.Windows.Forms.Panel() Me.Panel10 = New System.Windows.Forms.Panel() Me.txtFrachtfuehrerKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() @@ -231,9 +211,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.txtFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.KdSearchBox() Me.lblAbsender = New System.Windows.Forms.Label() Me.txtAbsenderKdNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label41 = New System.Windows.Forms.Label() @@ -382,9 +360,36 @@ 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.lblErr_AvisiererKdNr = New System.Windows.Forms.Label() - Me.lblErr_EmpfKdNr = New System.Windows.Forms.Label() - Me.lblErr_FraechterKdNr = New System.Windows.Forms.Label() + 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.txtFrachtkostenNichtEU = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Button18 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -566,6 +571,7 @@ Partial Class frmSendungsdetailsNEU ' 'Panel19 ' + Me.Panel19.Controls.Add(Me.Button17) Me.Panel19.Controls.Add(Me.btnQuckScan) Me.Panel19.Controls.Add(Me.Panel21) Me.Panel19.Controls.Add(Me.btnPDFZusammenfueren) @@ -579,13 +585,27 @@ Partial Class frmSendungsdetailsNEU Me.Panel19.Size = New System.Drawing.Size(1206, 45) Me.Panel19.TabIndex = 0 ' + 'Button17 + ' + Me.Button17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button17.Image = Global.AVISO.My.Resources.Resources.spedbuch_small + Me.Button17.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button17.Location = New System.Drawing.Point(724, 5) + Me.Button17.Name = "Button17" + Me.Button17.Size = New System.Drawing.Size(76, 34) + Me.Button17.TabIndex = 5 + Me.Button17.Text = "CMR" + Me.Button17.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button17.UseVisualStyleBackColor = True + ' 'btnQuckScan ' Me.btnQuckScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnQuckScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnQuckScan.Image = CType(resources.GetObject("btnQuckScan.Image"), System.Drawing.Image) Me.btnQuckScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnQuckScan.Location = New System.Drawing.Point(631, 5) + Me.btnQuckScan.Location = New System.Drawing.Point(595, 5) Me.btnQuckScan.Name = "btnQuckScan" Me.btnQuckScan.Size = New System.Drawing.Size(107, 34) Me.btnQuckScan.TabIndex = 4 @@ -608,7 +628,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel21.Location = New System.Drawing.Point(938, 0) Me.Panel21.Name = "Panel21" Me.Panel21.Size = New System.Drawing.Size(268, 45) - Me.Panel21.TabIndex = 6 + Me.Panel21.TabIndex = 7 ' 'Label53 ' @@ -705,7 +725,7 @@ Partial Class frmSendungsdetailsNEU Me.btnMailVorlage.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnMailVorlage.Image = Global.AVISO.My.Resources.Resources.email_big1 Me.btnMailVorlage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnMailVorlage.Location = New System.Drawing.Point(283, 5) + Me.btnMailVorlage.Location = New System.Drawing.Point(279, 5) Me.btnMailVorlage.Name = "btnMailVorlage" Me.btnMailVorlage.Padding = New System.Windows.Forms.Padding(0, 0, 20, 0) Me.btnMailVorlage.Size = New System.Drawing.Size(144, 34) @@ -719,11 +739,11 @@ Partial Class frmSendungsdetailsNEU Me.btnOptionen.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOptionen.Image = CType(resources.GetObject("btnOptionen.Image"), System.Drawing.Image) Me.btnOptionen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnOptionen.Location = New System.Drawing.Point(765, 5) + Me.btnOptionen.Location = New System.Drawing.Point(805, 5) Me.btnOptionen.Name = "btnOptionen" Me.btnOptionen.Padding = New System.Windows.Forms.Padding(0, 0, 20, 0) Me.btnOptionen.Size = New System.Drawing.Size(129, 34) - Me.btnOptionen.TabIndex = 5 + Me.btnOptionen.TabIndex = 6 Me.btnOptionen.Text = "Optionen" Me.btnOptionen.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnOptionen.UseVisualStyleBackColor = True @@ -733,7 +753,7 @@ Partial Class frmSendungsdetailsNEU Me.btnImportAssi.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnImportAssi.Image = CType(resources.GetObject("btnImportAssi.Image"), System.Drawing.Image) Me.btnImportAssi.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnImportAssi.Location = New System.Drawing.Point(495, 5) + Me.btnImportAssi.Location = New System.Drawing.Point(461, 5) Me.btnImportAssi.Name = "btnImportAssi" Me.btnImportAssi.Size = New System.Drawing.Size(129, 34) Me.btnImportAssi.TabIndex = 3 @@ -860,7 +880,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 @@ -868,7 +888,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 @@ -876,7 +896,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 ' @@ -914,7 +934,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 @@ -923,7 +943,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 @@ -932,7 +952,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 @@ -949,7 +969,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 @@ -957,7 +977,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 @@ -966,7 +986,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" ' 'ToolStripMenuItem12 @@ -1409,18 +1429,18 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.AllowUserToAddRows = False Me.gridVermerke.AllowUserToDeleteRows = False Me.gridVermerke.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridVermerke.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 0) @@ -1429,8 +1449,8 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.ReadOnly = True Me.gridVermerke.RowHeadersVisible = False Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle7 Me.gridVermerke.RowTemplate.Height = 20 Me.gridVermerke.RowTemplate.ReadOnly = True Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] @@ -1480,8 +1500,11 @@ Partial Class frmSendungsdetailsNEU ' 'TabPage4 ' - Me.TabPage4.Controls.Add(Me.txtFrachtkosten) + Me.TabPage4.Controls.Add(Me.Label6) Me.TabPage4.Controls.Add(Me.Label1) + Me.TabPage4.Controls.Add(Me.Button18) + Me.TabPage4.Controls.Add(Me.txtFrachtkostenNichtEU) + Me.TabPage4.Controls.Add(Me.txtFrachtkostenEU) Me.TabPage4.Controls.Add(Me.cbx) Me.TabPage4.Controls.Add(Me.txtWarenwertWaehrung) Me.TabPage4.Controls.Add(Me.lblWW) @@ -1491,7 +1514,6 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.Controls.Add(Me.rtbAnmerkungDispoliste) Me.TabPage4.Controls.Add(Me.btnImportaviso) Me.TabPage4.Controls.Add(Me.btnVorauszahlung) - Me.TabPage4.Controls.Add(Me.Button14) Me.TabPage4.Controls.Add(Me.Button12) Me.TabPage4.Controls.Add(Me.txtGewicht) Me.TabPage4.Controls.Add(Me.lblWarenbezeichnung) @@ -1507,6 +1529,8 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.Controls.Add(Me.cboPrinter) Me.TabPage4.Controls.Add(Me.rtbAnmerkung) Me.TabPage4.Controls.Add(Me.Panel22) + Me.TabPage4.Controls.Add(Me.Label7) + Me.TabPage4.Controls.Add(Me.Button14) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) @@ -1515,38 +1539,38 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.Text = "Aktendeckel" Me.TabPage4.UseVisualStyleBackColor = True ' - 'txtFrachtkosten + 'txtFrachtkostenEU ' - Me.txtFrachtkosten._DateTimeOnly = False - Me.txtFrachtkosten._numbersOnly = False - Me.txtFrachtkosten._numbersOnlyKommastellen = "" - Me.txtFrachtkosten._numbersOnlyTrennzeichen = True - Me.txtFrachtkosten._Prozent = False - Me.txtFrachtkosten._ShortDateNew = False - Me.txtFrachtkosten._ShortDateOnly = False - Me.txtFrachtkosten._TimeOnly = False - Me.txtFrachtkosten._TimeOnly_Seconds = False - Me.txtFrachtkosten._value = "" - Me.txtFrachtkosten._Waehrung = True - Me.txtFrachtkosten._WaehrungZeichen = True - Me.txtFrachtkosten.ForeColor = System.Drawing.Color.Black - Me.txtFrachtkosten.Location = New System.Drawing.Point(300, 77) - Me.txtFrachtkosten.MaxLineLength = -1 - Me.txtFrachtkosten.MaxLines_Warning = "" - Me.txtFrachtkosten.MaxLines_Warning_Label = Nothing - Me.txtFrachtkosten.Name = "txtFrachtkosten" - Me.txtFrachtkosten.Size = New System.Drawing.Size(64, 20) - Me.txtFrachtkosten.TabIndex = 13 - Me.txtFrachtkosten.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtFrachtkostenEU._DateTimeOnly = False + Me.txtFrachtkostenEU._numbersOnly = False + Me.txtFrachtkostenEU._numbersOnlyKommastellen = "" + Me.txtFrachtkostenEU._numbersOnlyTrennzeichen = True + Me.txtFrachtkostenEU._Prozent = False + Me.txtFrachtkostenEU._ShortDateNew = False + Me.txtFrachtkostenEU._ShortDateOnly = False + Me.txtFrachtkostenEU._TimeOnly = False + Me.txtFrachtkostenEU._TimeOnly_Seconds = False + Me.txtFrachtkostenEU._value = "" + Me.txtFrachtkostenEU._Waehrung = True + Me.txtFrachtkostenEU._WaehrungZeichen = True + Me.txtFrachtkostenEU.ForeColor = System.Drawing.Color.Black + Me.txtFrachtkostenEU.Location = New System.Drawing.Point(264, 57) + Me.txtFrachtkostenEU.MaxLineLength = -1 + Me.txtFrachtkostenEU.MaxLines_Warning = "" + Me.txtFrachtkostenEU.MaxLines_Warning_Label = Nothing + Me.txtFrachtkostenEU.Name = "txtFrachtkostenEU" + Me.txtFrachtkostenEU.Size = New System.Drawing.Size(50, 20) + Me.txtFrachtkostenEU.TabIndex = 12 + Me.txtFrachtkostenEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(232, 80) + Me.Label1.Location = New System.Drawing.Point(261, 43) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(55, 13) - Me.Label1.TabIndex = 12 - Me.Label1.Text = "Fracht (€):" + Me.Label1.Size = New System.Drawing.Size(40, 13) + Me.Label1.TabIndex = 13 + Me.Label1.Text = "Fracht:" ' 'cbx ' @@ -1554,7 +1578,7 @@ Partial Class frmSendungsdetailsNEU Me.cbx.Location = New System.Drawing.Point(310, 168) Me.cbx.Name = "cbx" Me.cbx.Size = New System.Drawing.Size(55, 17) - Me.cbx.TabIndex = 20 + Me.cbx.TabIndex = 23 Me.cbx.Text = "Laufz." Me.cbx.UseVisualStyleBackColor = True Me.cbx.Visible = False @@ -1573,10 +1597,10 @@ Partial Class frmSendungsdetailsNEU Me.txtWarenwertWaehrung.INVISIBLE_COLUMNS = Nothing Me.txtWarenwertWaehrung.key_visible = False Me.txtWarenwertWaehrung.KEYPARAM = Nothing - Me.txtWarenwertWaehrung.Location = New System.Drawing.Point(186, 77) + Me.txtWarenwertWaehrung.Location = New System.Drawing.Point(207, 77) Me.txtWarenwertWaehrung.Name = "txtWarenwertWaehrung" Me.txtWarenwertWaehrung.searchActive = True - Me.txtWarenwertWaehrung.Size = New System.Drawing.Size(40, 20) + Me.txtWarenwertWaehrung.Size = New System.Drawing.Size(51, 20) Me.txtWarenwertWaehrung.SQL_ORDER_BY = Nothing Me.txtWarenwertWaehrung.SQL_SELECT = Nothing Me.txtWarenwertWaehrung.SQL_WHERE = Nothing @@ -1613,7 +1637,7 @@ Partial Class frmSendungsdetailsNEU Me.txtWarenwert.MaxLines_Warning = "" Me.txtWarenwert.MaxLines_Warning_Label = Nothing Me.txtWarenwert.Name = "txtWarenwert" - Me.txtWarenwert.Size = New System.Drawing.Size(109, 20) + Me.txtWarenwert.Size = New System.Drawing.Size(130, 20) Me.txtWarenwert.TabIndex = 10 Me.txtWarenwert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -1627,7 +1651,7 @@ Partial Class frmSendungsdetailsNEU Me.Button21.Name = "Button21" Me.Button21.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.Button21.Size = New System.Drawing.Size(131, 30) - Me.Button21.TabIndex = 26 + Me.Button21.TabIndex = 29 Me.Button21.Text = "weitere Formulare" Me.Button21.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button21.UseVisualStyleBackColor = True @@ -1638,7 +1662,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAnmerkungDispoliste.Location = New System.Drawing.Point(3, 254) Me.lblAnmerkungDispoliste.Name = "lblAnmerkungDispoliste" Me.lblAnmerkungDispoliste.Size = New System.Drawing.Size(112, 13) - Me.lblAnmerkungDispoliste.TabIndex = 23 + Me.lblAnmerkungDispoliste.TabIndex = 26 Me.lblAnmerkungDispoliste.Text = "Anmerkung Dispoliste:" ' 'rtbAnmerkungDispoliste @@ -1646,7 +1670,7 @@ Partial Class frmSendungsdetailsNEU Me.rtbAnmerkungDispoliste.Location = New System.Drawing.Point(6, 268) Me.rtbAnmerkungDispoliste.Name = "rtbAnmerkungDispoliste" Me.rtbAnmerkungDispoliste.Size = New System.Drawing.Size(224, 31) - Me.rtbAnmerkungDispoliste.TabIndex = 25 + Me.rtbAnmerkungDispoliste.TabIndex = 28 Me.rtbAnmerkungDispoliste.Text = "" ' 'btnImportaviso @@ -1660,7 +1684,7 @@ Partial Class frmSendungsdetailsNEU Me.btnImportaviso.Name = "btnImportaviso" Me.btnImportaviso.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.btnImportaviso.Size = New System.Drawing.Size(131, 30) - Me.btnImportaviso.TabIndex = 22 + Me.btnImportaviso.TabIndex = 25 Me.btnImportaviso.Text = "Importaviso" Me.btnImportaviso.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnImportaviso.UseVisualStyleBackColor = True @@ -1677,7 +1701,7 @@ Partial Class frmSendungsdetailsNEU Me.btnVorauszahlung.Name = "btnVorauszahlung" Me.btnVorauszahlung.Padding = New System.Windows.Forms.Padding(0, 0, 10, 0) Me.btnVorauszahlung.Size = New System.Drawing.Size(131, 30) - Me.btnVorauszahlung.TabIndex = 24 + Me.btnVorauszahlung.TabIndex = 27 Me.btnVorauszahlung.Text = "Vorauskasse" Me.btnVorauszahlung.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnVorauszahlung.UseVisualStyleBackColor = True @@ -1693,7 +1717,7 @@ Partial Class frmSendungsdetailsNEU Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button14.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) Me.Button14.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.Button14.Location = New System.Drawing.Point(349, 61) + Me.Button14.Location = New System.Drawing.Point(239, 28) Me.Button14.Name = "Button14" Me.Button14.Padding = New System.Windows.Forms.Padding(0, 13, 0, 0) Me.Button14.Size = New System.Drawing.Size(15, 15) @@ -1707,7 +1731,7 @@ Partial Class frmSendungsdetailsNEU Me.Button12.Location = New System.Drawing.Point(49, 161) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(75, 23) - Me.Button12.TabIndex = 17 + Me.Button12.TabIndex = 20 Me.Button12.Text = "ATLAS" Me.Button12.UseVisualStyleBackColor = True Me.Button12.Visible = False @@ -1747,10 +1771,10 @@ Partial Class frmSendungsdetailsNEU 'Label35 ' Me.Label35.AutoSize = True - Me.Label35.Location = New System.Drawing.Point(232, 111) + Me.Label35.Location = New System.Drawing.Point(232, 112) Me.Label35.Name = "Label35" Me.Label35.Size = New System.Drawing.Size(131, 13) - Me.Label35.TabIndex = 15 + Me.Label35.TabIndex = 18 Me.Label35.Text = "Aktenzettel drucken/PDF:" ' 'lblCollGew @@ -1770,7 +1794,7 @@ Partial Class frmSendungsdetailsNEU Me.Button3.Margin = New System.Windows.Forms.Padding(0, 3, 0, 3) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(78, 60) - Me.Button3.TabIndex = 18 + Me.Button3.TabIndex = 21 Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button3.UseVisualStyleBackColor = True ' @@ -1782,7 +1806,7 @@ Partial Class frmSendungsdetailsNEU Me.Button8.Location = New System.Drawing.Point(310, 127) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(54, 60) - Me.Button8.TabIndex = 19 + Me.Button8.TabIndex = 22 Me.Button8.UseVisualStyleBackColor = True ' 'txtColli @@ -1815,7 +1839,7 @@ Partial Class frmSendungsdetailsNEU Me.rtbWarenbezeichnung.Location = New System.Drawing.Point(6, 41) Me.rtbWarenbezeichnung.MaxLength = 500 Me.rtbWarenbezeichnung.Name = "rtbWarenbezeichnung" - Me.rtbWarenbezeichnung.Size = New System.Drawing.Size(359, 36) + Me.rtbWarenbezeichnung.Size = New System.Drawing.Size(252, 36) Me.rtbWarenbezeichnung.TabIndex = 7 Me.rtbWarenbezeichnung.Text = "" ' @@ -1840,10 +1864,10 @@ Partial Class frmSendungsdetailsNEU 'lblAnmerkung ' Me.lblAnmerkung.AutoSize = True - Me.lblAnmerkung.Location = New System.Drawing.Point(6, 111) + Me.lblAnmerkung.Location = New System.Drawing.Point(6, 112) Me.lblAnmerkung.Name = "lblAnmerkung" Me.lblAnmerkung.Size = New System.Drawing.Size(64, 13) - Me.lblAnmerkung.TabIndex = 14 + Me.lblAnmerkung.TabIndex = 17 Me.lblAnmerkung.Text = "Anmerkung:" ' 'cboPrinter @@ -1857,25 +1881,25 @@ Partial Class frmSendungsdetailsNEU Me.cboPrinter.Location = New System.Drawing.Point(233, 187) Me.cboPrinter.Name = "cboPrinter" Me.cboPrinter.Size = New System.Drawing.Size(131, 21) - Me.cboPrinter.TabIndex = 21 + Me.cboPrinter.TabIndex = 24 ' 'rtbAnmerkung ' Me.rtbAnmerkung.Location = New System.Drawing.Point(6, 127) Me.rtbAnmerkung.Name = "rtbAnmerkung" Me.rtbAnmerkung.Size = New System.Drawing.Size(224, 124) - Me.rtbAnmerkung.TabIndex = 16 + Me.rtbAnmerkung.TabIndex = 19 Me.rtbAnmerkung.Text = "" ' 'Panel22 ' Me.Panel22.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel22.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.Panel22.Controls.Add(Me.txtBARzuKassieren) Me.Panel22.Controls.Add(Me.lblZuKass) - Me.Panel22.Location = New System.Drawing.Point(254, 0) + Me.Panel22.Controls.Add(Me.txtBARzuKassieren) + Me.Panel22.Location = New System.Drawing.Point(260, 0) Me.Panel22.Name = "Panel22" - Me.Panel22.Size = New System.Drawing.Size(115, 41) + Me.Panel22.Size = New System.Drawing.Size(108, 41) Me.Panel22.TabIndex = 2 Me.Panel22.TabStop = True ' @@ -1894,7 +1918,7 @@ Partial Class frmSendungsdetailsNEU Me.txtBARzuKassieren._Waehrung = True Me.txtBARzuKassieren._WaehrungZeichen = True Me.txtBARzuKassieren.ForeColor = System.Drawing.Color.Black - Me.txtBARzuKassieren.Location = New System.Drawing.Point(10, 16) + Me.txtBARzuKassieren.Location = New System.Drawing.Point(3, 16) Me.txtBARzuKassieren.MaxLineLength = -1 Me.txtBARzuKassieren.MaxLines_Warning = "" Me.txtBARzuKassieren.MaxLines_Warning_Label = Nothing @@ -1906,7 +1930,7 @@ Partial Class frmSendungsdetailsNEU 'lblZuKass ' Me.lblZuKass.AutoSize = True - Me.lblZuKass.Location = New System.Drawing.Point(8, 3) + Me.lblZuKass.Location = New System.Drawing.Point(1, 3) Me.lblZuKass.Name = "lblZuKass" Me.lblZuKass.Size = New System.Drawing.Size(100, 13) Me.lblZuKass.TabIndex = 0 @@ -2072,8 +2096,8 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle4.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle8.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle8 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 Me.clmnPreis.Name = "clmnPreis" @@ -2268,6 +2292,80 @@ Partial Class frmSendungsdetailsNEU Me.Panel6.Size = New System.Drawing.Size(838, 325) Me.Panel6.TabIndex = 1 ' + 'txtFrachtfuehrer + ' + Me.txtFrachtfuehrer._AlleFirmenCLUSTER = False + Me.txtFrachtfuehrer._AllowSetValue = True + Me.txtFrachtfuehrer._autoSizeGross = True + Me.txtFrachtfuehrer._display_Name1 = False + Me.txtFrachtfuehrer._displayAVISO_Email = False + Me.txtFrachtfuehrer._displayFullName = False + Me.txtFrachtfuehrer._displayWoelflKd = False + Me.txtFrachtfuehrer._hideIfListEmpty = True + Me.txtFrachtfuehrer._loadKdData = True + Me.txtFrachtfuehrer._UseFIRMA = "" + Me.txtFrachtfuehrer._ValueKdAndName = False + Me.txtFrachtfuehrer.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper + Me.txtFrachtfuehrer.dgvpos = "LEFT" + Me.txtFrachtfuehrer.KdName = Nothing + Me.txtFrachtfuehrer.KdNr = "-1" + Me.txtFrachtfuehrer.kdNrField = Nothing + Me.txtFrachtfuehrer.KdNrNullInt = Nothing + Me.txtFrachtfuehrer.Location = New System.Drawing.Point(120, 168) + Me.txtFrachtfuehrer.MaxLength = 50 + Me.txtFrachtfuehrer.Name = "txtFrachtfuehrer" + Me.txtFrachtfuehrer.nurAktive = False + Me.txtFrachtfuehrer.searchActive = True + Me.txtFrachtfuehrer.Size = New System.Drawing.Size(245, 20) + Me.txtFrachtfuehrer.TabIndex = 75 + Me.txtFrachtfuehrer.TIMER_SEARCH = True + Me.txtFrachtfuehrer.usrcntl = Nothing + ' + 'Panel12 + ' + Me.Panel12.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.Panel12.ForeColor = System.Drawing.SystemColors.ControlText + Me.Panel12.Location = New System.Drawing.Point(10, 155) + Me.Panel12.Name = "Panel12" + Me.Panel12.Size = New System.Drawing.Size(710, 1) + Me.Panel12.TabIndex = 69 + ' + 'lblErr_FraechterKdNr + ' + Me.lblErr_FraechterKdNr.AutoSize = True + Me.lblErr_FraechterKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblErr_FraechterKdNr.ForeColor = System.Drawing.Color.Red + Me.lblErr_FraechterKdNr.Location = New System.Drawing.Point(117, 156) + Me.lblErr_FraechterKdNr.Name = "lblErr_FraechterKdNr" + Me.lblErr_FraechterKdNr.Size = New System.Drawing.Size(141, 13) + Me.lblErr_FraechterKdNr.TabIndex = 72 + Me.lblErr_FraechterKdNr.Text = "Frächter Kdnr angeben!" + Me.lblErr_FraechterKdNr.Visible = False + ' + 'lblErr_EmpfKdNr + ' + Me.lblErr_EmpfKdNr.AutoSize = True + Me.lblErr_EmpfKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblErr_EmpfKdNr.ForeColor = System.Drawing.Color.Red + Me.lblErr_EmpfKdNr.Location = New System.Drawing.Point(120, 81) + Me.lblErr_EmpfKdNr.Name = "lblErr_EmpfKdNr" + Me.lblErr_EmpfKdNr.Size = New System.Drawing.Size(154, 13) + Me.lblErr_EmpfKdNr.TabIndex = 40 + Me.lblErr_EmpfKdNr.Text = "Empfänger Kdnr angeben!" + Me.lblErr_EmpfKdNr.Visible = False + ' + 'lblErr_AvisiererKdNr + ' + Me.lblErr_AvisiererKdNr.AutoSize = True + Me.lblErr_AvisiererKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) + Me.lblErr_AvisiererKdNr.ForeColor = System.Drawing.Color.Red + Me.lblErr_AvisiererKdNr.Location = New System.Drawing.Point(120, 7) + Me.lblErr_AvisiererKdNr.Name = "lblErr_AvisiererKdNr" + Me.lblErr_AvisiererKdNr.Size = New System.Drawing.Size(143, 13) + Me.lblErr_AvisiererKdNr.TabIndex = 10 + Me.lblErr_AvisiererKdNr.Text = "Avisierer Kdnr angeben!" + Me.lblErr_AvisiererKdNr.Visible = False + ' 'picKdAtrNr_Fraechter ' Me.picKdAtrNr_Fraechter.BackgroundImage = Global.AVISO.My.Resources.Resources.info @@ -2320,7 +2418,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlEAviso.Location = New System.Drawing.Point(552, 223) Me.pnlEAviso.Name = "pnlEAviso" Me.pnlEAviso.Size = New System.Drawing.Size(190, 36) - Me.pnlEAviso.TabIndex = 85 + Me.pnlEAviso.TabIndex = 88 Me.pnlEAviso.Visible = False ' 'Label46 @@ -2350,7 +2448,7 @@ Partial Class frmSendungsdetailsNEU Me.txtDyRef.MaxLength = 30 Me.txtDyRef.Name = "txtDyRef" Me.txtDyRef.Size = New System.Drawing.Size(159, 20) - Me.txtDyRef.TabIndex = 86 + Me.txtDyRef.TabIndex = 89 Me.txtDyRef.Visible = False ' 'picDy @@ -2429,7 +2527,7 @@ Partial Class frmSendungsdetailsNEU Me.Button16.Location = New System.Drawing.Point(386, 132) Me.Button16.Name = "Button16" Me.Button16.Size = New System.Drawing.Size(22, 22) - Me.Button16.TabIndex = 61 + Me.Button16.TabIndex = 63 Me.Button16.TabStop = False Me.Button16.Tag = "Kunde hinzufügen" Me.Button16.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -2445,7 +2543,7 @@ Partial Class frmSendungsdetailsNEU Me.Button15.Location = New System.Drawing.Point(386, 93) Me.Button15.Name = "Button15" Me.Button15.Size = New System.Drawing.Size(22, 22) - Me.Button15.TabIndex = 45 + Me.Button15.TabIndex = 47 Me.Button15.TabStop = False Me.Button15.Tag = "Kunde hinzufügen" Me.Button15.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -2461,7 +2559,7 @@ Partial Class frmSendungsdetailsNEU Me.Button11.Location = New System.Drawing.Point(386, 56) Me.Button11.Name = "Button11" Me.Button11.Size = New System.Drawing.Size(22, 22) - Me.Button11.TabIndex = 29 + Me.Button11.TabIndex = 30 Me.Button11.TabStop = False Me.Button11.Tag = "Kunde hinzufügen" Me.Button11.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -2490,7 +2588,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrFrachtfuehrer.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrFrachtfuehrer.Name = "txtKdAuftragsNrFrachtfuehrer" Me.txtKdAuftragsNrFrachtfuehrer.Size = New System.Drawing.Size(90, 20) - Me.txtKdAuftragsNrFrachtfuehrer.TabIndex = 74 + Me.txtKdAuftragsNrFrachtfuehrer.TabIndex = 77 ' 'txtKdAuftragsNrEmpfaenger ' @@ -2514,7 +2612,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrEmpfaenger.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrEmpfaenger.Name = "txtKdAuftragsNrEmpfaenger" Me.txtKdAuftragsNrEmpfaenger.Size = New System.Drawing.Size(90, 20) - Me.txtKdAuftragsNrEmpfaenger.TabIndex = 46 + Me.txtKdAuftragsNrEmpfaenger.TabIndex = 48 ' 'txtKdAuftragsNrAvisierer ' @@ -2540,7 +2638,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNrAvisierer.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNrAvisierer.Name = "txtKdAuftragsNrAvisierer" Me.txtKdAuftragsNrAvisierer.Size = New System.Drawing.Size(90, 20) - Me.txtKdAuftragsNrAvisierer.TabIndex = 15 + Me.txtKdAuftragsNrAvisierer.TabIndex = 16 ' 'cntxt ' @@ -2577,7 +2675,7 @@ Partial Class frmSendungsdetailsNEU Me.FlatButton4.Location = New System.Drawing.Point(365, 132) Me.FlatButton4.Name = "FlatButton4" Me.FlatButton4.Size = New System.Drawing.Size(22, 22) - Me.FlatButton4.TabIndex = 60 + Me.FlatButton4.TabIndex = 62 Me.FlatButton4.TabStop = False Me.FlatButton4.UseVisualStyleBackColor = True ' @@ -2592,7 +2690,7 @@ Partial Class frmSendungsdetailsNEU Me.FlatButton1.Location = New System.Drawing.Point(365, 93) Me.FlatButton1.Name = "FlatButton1" Me.FlatButton1.Size = New System.Drawing.Size(22, 22) - Me.FlatButton1.TabIndex = 44 + Me.FlatButton1.TabIndex = 46 Me.FlatButton1.TabStop = False Me.FlatButton1.UseVisualStyleBackColor = True ' @@ -2607,7 +2705,7 @@ Partial Class frmSendungsdetailsNEU Me.btnFrachtfuehrer.Location = New System.Drawing.Point(365, 167) Me.btnFrachtfuehrer.Name = "btnFrachtfuehrer" Me.btnFrachtfuehrer.Size = New System.Drawing.Size(22, 22) - Me.btnFrachtfuehrer.TabIndex = 73 + Me.btnFrachtfuehrer.TabIndex = 76 Me.btnFrachtfuehrer.TabStop = False Me.btnFrachtfuehrer.UseVisualStyleBackColor = True ' @@ -2622,7 +2720,7 @@ Partial Class frmSendungsdetailsNEU Me.FlatButton3.Location = New System.Drawing.Point(365, 56) Me.FlatButton3.Name = "FlatButton3" Me.FlatButton3.Size = New System.Drawing.Size(22, 22) - Me.FlatButton3.TabIndex = 28 + Me.FlatButton3.TabIndex = 29 Me.FlatButton3.TabStop = False Me.FlatButton3.UseVisualStyleBackColor = True ' @@ -2637,7 +2735,7 @@ Partial Class frmSendungsdetailsNEU Me.btnAvisierer.Location = New System.Drawing.Point(365, 19) Me.btnAvisierer.Name = "btnAvisierer" Me.btnAvisierer.Size = New System.Drawing.Size(22, 22) - Me.btnAvisierer.TabIndex = 14 + Me.btnAvisierer.TabIndex = 15 Me.btnAvisierer.TabStop = False Me.btnAvisierer.UseVisualStyleBackColor = True ' @@ -2650,7 +2748,7 @@ Partial Class frmSendungsdetailsNEU Me.Button4.Location = New System.Drawing.Point(696, 167) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(39, 21) - Me.Button4.TabIndex = 81 + Me.Button4.TabIndex = 84 Me.Button4.TabStop = False Me.Button4.Text = "LG" Me.Button4.UseVisualStyleBackColor = False @@ -2664,71 +2762,11 @@ Partial Class frmSendungsdetailsNEU Me.Button1.Location = New System.Drawing.Point(658, 167) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(41, 21) - Me.Button1.TabIndex = 80 + Me.Button1.TabIndex = 83 Me.Button1.TabStop = False 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 = 79 - 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 = 66 - 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 = 51 - 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 = 35 - 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 = 20 - Me.cntlAvisierer_Sonst.TabStop = False - Me.cntlAvisierer_Sonst.value = "" - ' 'lblSonstigesKosten ' Me.lblSonstigesKosten.AutoSize = True @@ -2752,7 +2790,7 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_Atr.Margin = New System.Windows.Forms.Padding(0) Me.btnAufschub_Atr.Name = "btnAufschub_Atr" Me.btnAufschub_Atr.Size = New System.Drawing.Size(77, 20) - Me.btnAufschub_Atr.TabIndex = 36 + Me.btnAufschub_Atr.TabIndex = 37 Me.btnAufschub_Atr.TabStop = False Me.btnAufschub_Atr.Text = "Aufschub" Me.btnAufschub_Atr.UseVisualStyleBackColor = False @@ -2771,7 +2809,7 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_Empf.Margin = New System.Windows.Forms.Padding(0) Me.btnAufschub_Empf.Name = "btnAufschub_Empf" Me.btnAufschub_Empf.Size = New System.Drawing.Size(77, 20) - Me.btnAufschub_Empf.TabIndex = 52 + Me.btnAufschub_Empf.TabIndex = 54 Me.btnAufschub_Empf.TabStop = False Me.btnAufschub_Empf.Text = "Aufschub" Me.btnAufschub_Empf.UseVisualStyleBackColor = False @@ -2790,252 +2828,12 @@ Partial Class frmSendungsdetailsNEU Me.btnAufschub_VERAG.Margin = New System.Windows.Forms.Padding(0) Me.btnAufschub_VERAG.Name = "btnAufschub_VERAG" Me.btnAufschub_VERAG.Size = New System.Drawing.Size(76, 20) - Me.btnAufschub_VERAG.TabIndex = 84 + Me.btnAufschub_VERAG.TabIndex = 87 Me.btnAufschub_VERAG.TabStop = False Me.btnAufschub_VERAG.Text = "VERAG" 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 = 78 - 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 = 77 - 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 = 76 - 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 = 75 - 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 = 65 - 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 = 64 - 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 = 63 - 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 = 62 - 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 = 50 - 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 = 49 - 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 = 48 - 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 = 47 - 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 = 34 - 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 = 33 - 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 = 32 - 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 = 31 - 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 = 19 - 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 = 18 - 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 = 17 - 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 = 16 - 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)) @@ -3071,7 +2869,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAvisierer.nurAktive = False Me.txtAvisierer.searchActive = True Me.txtAvisierer.Size = New System.Drawing.Size(245, 20) - Me.txtAvisierer.TabIndex = 13 + Me.txtAvisierer.TabIndex = 14 Me.txtAvisierer.TIMER_SEARCH = True Me.txtAvisierer.usrcntl = Nothing ' @@ -3100,7 +2898,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAuftraggeber.nurAktive = False Me.txtAuftraggeber.searchActive = True Me.txtAuftraggeber.Size = New System.Drawing.Size(245, 20) - Me.txtAuftraggeber.TabIndex = 27 + Me.txtAuftraggeber.TabIndex = 28 Me.txtAuftraggeber.TIMER_SEARCH = True Me.txtAuftraggeber.usrcntl = Nothing ' @@ -3111,16 +2909,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel13.Location = New System.Drawing.Point(10, 190) Me.Panel13.Name = "Panel13" Me.Panel13.Size = New System.Drawing.Size(710, 1) - Me.Panel13.TabIndex = 82 - ' - 'Panel12 - ' - Me.Panel12.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.Panel12.ForeColor = System.Drawing.SystemColors.ControlText - Me.Panel12.Location = New System.Drawing.Point(10, 155) - Me.Panel12.Name = "Panel12" - Me.Panel12.Size = New System.Drawing.Size(710, 1) - Me.Panel12.TabIndex = 67 + Me.Panel13.TabIndex = 85 ' 'Panel11 ' @@ -3129,7 +2918,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel11.Location = New System.Drawing.Point(10, 117) Me.Panel11.Name = "Panel11" Me.Panel11.Size = New System.Drawing.Size(710, 1) - Me.Panel11.TabIndex = 54 + Me.Panel11.TabIndex = 56 ' 'Panel10 ' @@ -3138,7 +2927,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel10.Location = New System.Drawing.Point(10, 80) Me.Panel10.Name = "Panel10" Me.Panel10.Size = New System.Drawing.Size(710, 1) - Me.Panel10.TabIndex = 38 + Me.Panel10.TabIndex = 39 ' 'txtFrachtfuehrerKdNr ' @@ -3163,7 +2952,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtfuehrerKdNr.Name = "txtFrachtfuehrerKdNr" Me.txtFrachtfuehrerKdNr.ReadOnly = True Me.txtFrachtfuehrerKdNr.Size = New System.Drawing.Size(101, 13) - Me.txtFrachtfuehrerKdNr.TabIndex = 68 + Me.txtFrachtfuehrerKdNr.TabIndex = 70 Me.txtFrachtfuehrerKdNr.TabStop = False ' 'Panel8 @@ -3173,7 +2962,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel8.Location = New System.Drawing.Point(10, 43) Me.Panel8.Name = "Panel8" Me.Panel8.Size = New System.Drawing.Size(710, 1) - Me.Panel8.TabIndex = 21 + Me.Panel8.TabIndex = 22 ' 'lblEmpfAufschubEustTxt ' @@ -3210,7 +2999,7 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfAufschubEust.ReadOnly = True Me.lblEmpfAufschubEust.RightToLeft = System.Windows.Forms.RightToLeft.No Me.lblEmpfAufschubEust.Size = New System.Drawing.Size(69, 13) - Me.lblEmpfAufschubEust.TabIndex = 53 + Me.lblEmpfAufschubEust.TabIndex = 55 Me.lblEmpfAufschubEust.TabStop = False Me.lblEmpfAufschubEust.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -3221,7 +3010,7 @@ Partial Class frmSendungsdetailsNEU Me.lblFrachtfuehrer.Location = New System.Drawing.Point(23, 172) Me.lblFrachtfuehrer.Name = "lblFrachtfuehrer" Me.lblFrachtfuehrer.Size = New System.Drawing.Size(64, 13) - Me.lblFrachtfuehrer.TabIndex = 71 + Me.lblFrachtfuehrer.TabIndex = 74 Me.lblFrachtfuehrer.Text = "Frachtführer" Me.lblFrachtfuehrer.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3231,15 +3020,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlT1.Location = New System.Drawing.Point(0, 193) Me.pnlT1.Name = "pnlT1" Me.pnlT1.Size = New System.Drawing.Size(549, 92) - Me.pnlT1.TabIndex = 83 - ' - '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.pnlT1.TabIndex = 86 ' 'Label43 ' @@ -3249,39 +3030,10 @@ Partial Class frmSendungsdetailsNEU Me.Label43.Location = New System.Drawing.Point(7, 168) Me.Label43.Name = "Label43" Me.Label43.Size = New System.Drawing.Size(17, 18) - Me.Label43.TabIndex = 70 + Me.Label43.TabIndex = 73 Me.Label43.Text = "5" Me.Label43.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'txtFrachtfuehrer - ' - Me.txtFrachtfuehrer._AlleFirmenCLUSTER = False - Me.txtFrachtfuehrer._AllowSetValue = True - Me.txtFrachtfuehrer._autoSizeGross = True - Me.txtFrachtfuehrer._display_Name1 = False - Me.txtFrachtfuehrer._displayAVISO_Email = False - Me.txtFrachtfuehrer._displayFullName = False - Me.txtFrachtfuehrer._displayWoelflKd = False - Me.txtFrachtfuehrer._hideIfListEmpty = True - Me.txtFrachtfuehrer._loadKdData = True - Me.txtFrachtfuehrer._UseFIRMA = "" - Me.txtFrachtfuehrer._ValueKdAndName = False - Me.txtFrachtfuehrer.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper - Me.txtFrachtfuehrer.dgvpos = "LEFT" - Me.txtFrachtfuehrer.KdName = Nothing - Me.txtFrachtfuehrer.KdNr = "-1" - Me.txtFrachtfuehrer.kdNrField = Nothing - Me.txtFrachtfuehrer.KdNrNullInt = Nothing - Me.txtFrachtfuehrer.Location = New System.Drawing.Point(120, 168) - Me.txtFrachtfuehrer.MaxLength = 50 - Me.txtFrachtfuehrer.Name = "txtFrachtfuehrer" - Me.txtFrachtfuehrer.nurAktive = False - Me.txtFrachtfuehrer.searchActive = True - Me.txtFrachtfuehrer.Size = New System.Drawing.Size(245, 20) - Me.txtFrachtfuehrer.TabIndex = 72 - Me.txtFrachtfuehrer.TIMER_SEARCH = True - Me.txtFrachtfuehrer.usrcntl = Nothing - ' 'lblAbsender ' Me.lblAbsender.AutoSize = True @@ -3289,7 +3041,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAbsender.Location = New System.Drawing.Point(23, 136) Me.lblAbsender.Name = "lblAbsender" Me.lblAbsender.Size = New System.Drawing.Size(52, 13) - Me.lblAbsender.TabIndex = 58 + Me.lblAbsender.TabIndex = 60 Me.lblAbsender.Text = "Absender" Me.lblAbsender.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3316,7 +3068,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAbsenderKdNr.Name = "txtAbsenderKdNr" Me.txtAbsenderKdNr.ReadOnly = True Me.txtAbsenderKdNr.Size = New System.Drawing.Size(101, 13) - Me.txtAbsenderKdNr.TabIndex = 55 + Me.txtAbsenderKdNr.TabIndex = 57 Me.txtAbsenderKdNr.TabStop = False ' 'Label41 @@ -3327,7 +3079,7 @@ Partial Class frmSendungsdetailsNEU Me.Label41.Location = New System.Drawing.Point(7, 133) Me.Label41.Name = "Label41" Me.Label41.Size = New System.Drawing.Size(17, 18) - Me.Label41.TabIndex = 57 + Me.Label41.TabIndex = 59 Me.Label41.Text = "4" Me.Label41.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3354,7 +3106,7 @@ Partial Class frmSendungsdetailsNEU Me.MyTextBox1.Name = "MyTextBox1" Me.MyTextBox1.ReadOnly = True Me.MyTextBox1.Size = New System.Drawing.Size(100, 13) - Me.MyTextBox1.TabIndex = 10 + Me.MyTextBox1.TabIndex = 11 Me.MyTextBox1.TabStop = False Me.MyTextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -3365,7 +3117,7 @@ Partial Class frmSendungsdetailsNEU Me.lblEmpfaenger.Location = New System.Drawing.Point(23, 97) Me.lblEmpfaenger.Name = "lblEmpfaenger" Me.lblEmpfaenger.Size = New System.Drawing.Size(78, 13) - Me.lblEmpfaenger.TabIndex = 42 + Me.lblEmpfaenger.TabIndex = 44 Me.lblEmpfaenger.Text = "(Rg)Empfänger" Me.lblEmpfaenger.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3377,7 +3129,7 @@ Partial Class frmSendungsdetailsNEU Me.Label39.Location = New System.Drawing.Point(7, 94) Me.Label39.Name = "Label39" Me.Label39.Size = New System.Drawing.Size(17, 18) - Me.Label39.TabIndex = 41 + Me.Label39.TabIndex = 43 Me.Label39.Text = "3" Me.Label39.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3404,7 +3156,7 @@ Partial Class frmSendungsdetailsNEU Me.txtEmpfaengerKdNr.Name = "txtEmpfaengerKdNr" Me.txtEmpfaengerKdNr.ReadOnly = True Me.txtEmpfaengerKdNr.Size = New System.Drawing.Size(99, 13) - Me.txtEmpfaengerKdNr.TabIndex = 39 + Me.txtEmpfaengerKdNr.TabIndex = 41 Me.txtEmpfaengerKdNr.TabStop = False ' 'txtAbsender @@ -3432,7 +3184,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAbsender.nurAktive = False Me.txtAbsender.searchActive = True Me.txtAbsender.Size = New System.Drawing.Size(245, 20) - Me.txtAbsender.TabIndex = 59 + Me.txtAbsender.TabIndex = 61 Me.txtAbsender.TIMER_SEARCH = True Me.txtAbsender.usrcntl = Nothing ' @@ -3460,7 +3212,7 @@ Partial Class frmSendungsdetailsNEU Me.txtEmpfaenger.nurAktive = False Me.txtEmpfaenger.searchActive = True Me.txtEmpfaenger.Size = New System.Drawing.Size(245, 20) - Me.txtEmpfaenger.TabIndex = 43 + Me.txtEmpfaenger.TabIndex = 45 Me.txtEmpfaenger.TIMER_SEARCH = True Me.txtEmpfaenger.usrcntl = Nothing ' @@ -3471,7 +3223,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAuftraggeber.Location = New System.Drawing.Point(23, 61) Me.lblAuftraggeber.Name = "lblAuftraggeber" Me.lblAuftraggeber.Size = New System.Drawing.Size(68, 13) - Me.lblAuftraggeber.TabIndex = 26 + Me.lblAuftraggeber.TabIndex = 27 Me.lblAuftraggeber.Text = "Auftraggeber" Me.lblAuftraggeber.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3483,7 +3235,7 @@ Partial Class frmSendungsdetailsNEU Me.Label37.Location = New System.Drawing.Point(7, 58) Me.Label37.Name = "Label37" Me.Label37.Size = New System.Drawing.Size(17, 18) - Me.Label37.TabIndex = 25 + Me.Label37.TabIndex = 26 Me.Label37.Text = "2" Me.Label37.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3512,7 +3264,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAtrAufschubEust.ReadOnly = True Me.lblAtrAufschubEust.RightToLeft = System.Windows.Forms.RightToLeft.No Me.lblAtrAufschubEust.Size = New System.Drawing.Size(69, 13) - Me.lblAtrAufschubEust.TabIndex = 37 + Me.lblAtrAufschubEust.TabIndex = 38 Me.lblAtrAufschubEust.TabStop = False Me.lblAtrAufschubEust.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' @@ -3523,7 +3275,7 @@ Partial Class frmSendungsdetailsNEU Me.lblAvisierer.Location = New System.Drawing.Point(23, 24) Me.lblAvisierer.Name = "lblAvisierer" Me.lblAvisierer.Size = New System.Drawing.Size(47, 13) - Me.lblAvisierer.TabIndex = 12 + Me.lblAvisierer.TabIndex = 13 Me.lblAvisierer.Text = "Avisierer" Me.lblAvisierer.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3570,7 +3322,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAuftraggeberKdNr.Name = "txtAuftraggeberKdNr" Me.txtAuftraggeberKdNr.ReadOnly = True Me.txtAuftraggeberKdNr.Size = New System.Drawing.Size(100, 13) - Me.txtAuftraggeberKdNr.TabIndex = 22 + Me.txtAuftraggeberKdNr.TabIndex = 23 Me.txtAuftraggeberKdNr.TabStop = False ' 'lblEUST @@ -3601,7 +3353,7 @@ Partial Class frmSendungsdetailsNEU Me.Label26.Location = New System.Drawing.Point(7, 20) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(17, 18) - Me.Label26.TabIndex = 11 + Me.Label26.TabIndex = 12 Me.Label26.Text = "1" Me.Label26.TextAlign = System.Drawing.ContentAlignment.TopRight ' @@ -3613,7 +3365,7 @@ Partial Class frmSendungsdetailsNEU Me.LinkLabel3.Location = New System.Drawing.Point(335, 44) Me.LinkLabel3.Name = "LinkLabel3" Me.LinkLabel3.Size = New System.Drawing.Size(54, 13) - Me.LinkLabel3.TabIndex = 24 + Me.LinkLabel3.TabIndex = 25 Me.LinkLabel3.TabStop = True Me.LinkLabel3.Text = "= Frächter" ' @@ -3625,7 +3377,7 @@ Partial Class frmSendungsdetailsNEU Me.LinkLabel1.Location = New System.Drawing.Point(273, 44) Me.LinkLabel1.Name = "LinkLabel1" Me.LinkLabel1.Size = New System.Drawing.Size(56, 13) - Me.LinkLabel1.TabIndex = 23 + Me.LinkLabel1.TabIndex = 24 Me.LinkLabel1.TabStop = True Me.LinkLabel1.Text = "= Avisierer" ' @@ -3637,7 +3389,7 @@ Partial Class frmSendungsdetailsNEU Me.LinkLabel2.Location = New System.Drawing.Point(312, 120) Me.LinkLabel2.Name = "LinkLabel2" Me.LinkLabel2.Size = New System.Drawing.Size(77, 13) - Me.LinkLabel2.TabIndex = 56 + Me.LinkLabel2.TabIndex = 58 Me.LinkLabel2.TabStop = True Me.LinkLabel2.Text = "= Auftraggeber" ' @@ -3649,7 +3401,7 @@ Partial Class frmSendungsdetailsNEU Me.lklAuftraggeber.Location = New System.Drawing.Point(312, 81) Me.lklAuftraggeber.Name = "lklAuftraggeber" Me.lklAuftraggeber.Size = New System.Drawing.Size(77, 13) - Me.lklAuftraggeber.TabIndex = 40 + Me.lklAuftraggeber.TabIndex = 42 Me.lklAuftraggeber.TabStop = True Me.lklAuftraggeber.Text = "= Auftraggeber" ' @@ -3714,7 +3466,7 @@ Partial Class frmSendungsdetailsNEU Me.txtKdAuftragsNr.MaxLines_Warning_Label = Nothing Me.txtKdAuftragsNr.Name = "txtKdAuftragsNr" Me.txtKdAuftragsNr.Size = New System.Drawing.Size(90, 20) - Me.txtKdAuftragsNr.TabIndex = 30 + Me.txtKdAuftragsNr.TabIndex = 31 ' 'LinkLabel4 ' @@ -3724,7 +3476,7 @@ Partial Class frmSendungsdetailsNEU Me.LinkLabel4.Location = New System.Drawing.Point(331, 155) Me.LinkLabel4.Name = "LinkLabel4" Me.LinkLabel4.Size = New System.Drawing.Size(56, 13) - Me.LinkLabel4.TabIndex = 69 + Me.LinkLabel4.TabIndex = 71 Me.LinkLabel4.TabStop = True Me.LinkLabel4.Text = "= Avisierer" ' @@ -4692,7 +4444,6 @@ 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" @@ -4961,41 +4712,367 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'lblErr_AvisiererKdNr + 'cntlFrachtfuehrer_Sonst ' - Me.lblErr_AvisiererKdNr.AutoSize = True - Me.lblErr_AvisiererKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblErr_AvisiererKdNr.ForeColor = System.Drawing.Color.Red - Me.lblErr_AvisiererKdNr.Location = New System.Drawing.Point(120, 7) - Me.lblErr_AvisiererKdNr.Name = "lblErr_AvisiererKdNr" - Me.lblErr_AvisiererKdNr.Size = New System.Drawing.Size(143, 13) - Me.lblErr_AvisiererKdNr.TabIndex = 18 - Me.lblErr_AvisiererKdNr.Text = "Avisierer Kdnr angeben!" - Me.lblErr_AvisiererKdNr.Visible = False + 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 = "" ' - 'lblErr_EmpfKdNr + 'cntlAbsender_Sonst ' - Me.lblErr_EmpfKdNr.AutoSize = True - Me.lblErr_EmpfKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblErr_EmpfKdNr.ForeColor = System.Drawing.Color.Red - Me.lblErr_EmpfKdNr.Location = New System.Drawing.Point(120, 81) - Me.lblErr_EmpfKdNr.Name = "lblErr_EmpfKdNr" - Me.lblErr_EmpfKdNr.Size = New System.Drawing.Size(154, 13) - Me.lblErr_EmpfKdNr.TabIndex = 95 - Me.lblErr_EmpfKdNr.Text = "Empfänger Kdnr angeben!" - Me.lblErr_EmpfKdNr.Visible = False + 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 = "" ' - 'lblErr_FraechterKdNr + 'cntlEmpfaenger_Sonst ' - Me.lblErr_FraechterKdNr.AutoSize = True - Me.lblErr_FraechterKdNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold) - Me.lblErr_FraechterKdNr.ForeColor = System.Drawing.Color.Red - Me.lblErr_FraechterKdNr.Location = New System.Drawing.Point(117, 156) - Me.lblErr_FraechterKdNr.Name = "lblErr_FraechterKdNr" - Me.lblErr_FraechterKdNr.Size = New System.Drawing.Size(141, 13) - Me.lblErr_FraechterKdNr.TabIndex = 96 - Me.lblErr_FraechterKdNr.Text = "Frächter Kdnr angeben!" - Me.lblErr_FraechterKdNr.Visible = False + 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 + ' + 'txtFrachtkostenNichtEU + ' + Me.txtFrachtkostenNichtEU._DateTimeOnly = False + Me.txtFrachtkostenNichtEU._numbersOnly = False + Me.txtFrachtkostenNichtEU._numbersOnlyKommastellen = "" + Me.txtFrachtkostenNichtEU._numbersOnlyTrennzeichen = True + Me.txtFrachtkostenNichtEU._Prozent = False + Me.txtFrachtkostenNichtEU._ShortDateNew = False + Me.txtFrachtkostenNichtEU._ShortDateOnly = False + Me.txtFrachtkostenNichtEU._TimeOnly = False + Me.txtFrachtkostenNichtEU._TimeOnly_Seconds = False + Me.txtFrachtkostenNichtEU._value = "" + Me.txtFrachtkostenNichtEU._Waehrung = True + Me.txtFrachtkostenNichtEU._WaehrungZeichen = True + Me.txtFrachtkostenNichtEU.ForeColor = System.Drawing.Color.Black + Me.txtFrachtkostenNichtEU.Location = New System.Drawing.Point(313, 57) + Me.txtFrachtkostenNichtEU.MaxLineLength = -1 + Me.txtFrachtkostenNichtEU.MaxLines_Warning = "" + Me.txtFrachtkostenNichtEU.MaxLines_Warning_Label = Nothing + Me.txtFrachtkostenNichtEU.Name = "txtFrachtkostenNichtEU" + Me.txtFrachtkostenNichtEU.Size = New System.Drawing.Size(50, 20) + Me.txtFrachtkostenNichtEU.TabIndex = 14 + Me.txtFrachtkostenNichtEU.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Label6.Location = New System.Drawing.Point(293, 43) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(21, 13) + Me.Label6.TabIndex = 16 + Me.Label6.Text = "EU" + ' + 'Label7 + ' + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.Label7.Location = New System.Drawing.Point(321, 43) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(47, 13) + Me.Label7.TabIndex = 15 + Me.Label7.Text = "Nicht EU" + ' + 'Button18 + ' + Me.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button18.Location = New System.Drawing.Point(264, 76) + Me.Button18.Name = "Button18" + Me.Button18.Size = New System.Drawing.Size(99, 21) + Me.Button18.TabIndex = 60 + Me.Button18.Text = "berechnen" + Me.Button18.UseVisualStyleBackColor = True ' 'frmSendungsdetailsNEU ' @@ -5424,7 +5501,7 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents clmnLeistung As DataGridViewTextBoxColumn Friend WithEvents clmnPreis As DataGridViewTextBoxColumn Friend WithEvents lblVK_BEarbeitungAbbrechen As LinkLabel - Friend WithEvents txtFrachtkosten As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtFrachtkostenEU As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label1 As Label Friend WithEvents ZollstoppAMBARToolStripMenuItem As ToolStripMenuItem Friend WithEvents ATANAKToolStripMenuItem As ToolStripMenuItem @@ -5451,4 +5528,9 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents lblErr_FraechterKdNr As Label Friend WithEvents lblErr_EmpfKdNr As Label Friend WithEvents lblErr_AvisiererKdNr As Label + Friend WithEvents Button17 As Button + Friend WithEvents txtFrachtkostenNichtEU As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label6 As Label + Friend WithEvents Label7 As Label + Friend WithEvents Button18 As Button End Class diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index 3859139..5e264b1 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -118,6 +118,103 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + AElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAAytJREFUOE+d + kmtIU2EYx3df01qiZYX0JfuYBEFF2U2JEgqESCgScYpQZlYalV20mpUVRuk03+k2L7Plpt0sO5ouK7tf + zcsSnYlCecl5vLy7uXOezuYpEhOqHzzwwvv8f/CHh/MTHo/H9/PznxUt25+kLiQGr98wkunpWTG+vn4+ + fD6fy679EZIkJx5CoVAUvDYsVqU1jpdXN43nEv2WHMJC3qlpHG9u73VGRspC/f3ne09sT8Uj4nJ5/OUr + N8Yo9C3DOY8HB98NA27HgHtsgM1WwPc7qd6OfiupUun2sbkpeERSqa/05Nky52F9f9+tLsCPBwC7ZZ9G + AX8YAfzMAriszTXwtOF997JlK9ew2Ul4ROvWb086eqnKcbEBsLoZsFv2sBdwPSOs6wdc2QO4qNk1ml5q + /pKRka1ns5PwiKJk578HJzc1h2TaamN1zobLL6iurNd0i/wRZUwhXLXKRtqS+ZweOWjAnUplEcFmJ+ER + 7Yw8M7TqwMfWoNQxtC3fUXCkiiqT19Pa1Ic0SqqkmHHd3qF23N2lHG3IzdVMLwoJjZKFx+QNbM1xoORK + F1K8pZHeDOhmF6DCFkByI41kWkeBvNT8LSUlY3qRROLts+9o4VCczqa5+opGNb2AmuyATE5AL4YBlZgA + pVVTqvonr1tFIrEXm52ER8QcAGfJkuCQs4r7HZpGu/rN0Hj+IEWjURpQu51SVXW71ApFOWRmFn/dvGlL + uFjAEXvSv8GKOByBQCRZsWJzXOL+C905xcSn9j6LvmeALLtn/NhXcfNBa3LyxdaiwsrOiuxjddd2Lyzx + 9ebOnUhO8Ev0kwULAleHhcl00dGHiLi4I0RERAIhEAi9REKh+FxCrMGkDQer6TRk7w0smT+bG8DGpoqm + Q8DjiOPXzdR2KIPAZToJuOkEXNmzWDOPlf21yM1MMWdOYqikpA0tZWTHYYyRZcUvKmZqzvknkRufGdyA + hA1emrY8t+wEU/MM5MUvNNjGyBnsyt/jI+EGJIZIis3ump/ToOelBiinXcp+/xtMzbmJG7wMhqvHQH7q + GthsjMjd738Gj5ASh80mtVrtUpqmOT8ASDXvdskQmQUAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1531,6 +1628,9 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== + + 296, 17 + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1542,103 +1642,18 @@ 296, 17 - - - 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 - AElFTkSuQmCC - - + + True + + + True + + + True + + + True + True @@ -1883,6 +1898,9 @@ 174, 17 + + 404, 17 + 596, 17 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index e0c6470..5e7f3be 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -30,6 +30,7 @@ Public Class frmSendungsdetailsNEU Dim usrcntl_FISKAL As usrCntlSND_NCTSFiskalEndempf Dim usrcntl_ATA As usrCntlSND_Handling Dim usrcntl_ATB As usrCntlSND_ATBGestellung + Dim usrcntl_AUSFUHR As usrCntlSND_Ausfuhr Sub New() @@ -135,28 +136,31 @@ Public Class frmSendungsdetailsNEU lblErr_EmpfKdNr.Visible = False lblErr_FraechterKdNr.Visible = False - Select Case CInt((SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)) - Case <= 0, 10 - Case Else - If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr, "0")) <= 0 Then lblErr_AvisiererKdNr.Visible = True : Return False - If SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr <= 0 Then lblErr_EmpfKdNr.Visible = True : Return False - If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr, "0")) <= 0 Then lblErr_FraechterKdNr.Visible = True : Return False - End Select - If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + 'Aktuell noch nicht! + 'Select Case CInt((SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID)) + ' Case <= 0, 10 + ' Case Else + ' If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr, "0")) <= 0 Then lblErr_AvisiererKdNr.Visible = True : Return False + ' If SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr <= 0 Then lblErr_EmpfKdNr.Visible = True : Return False + ' If CInt(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr, "0")) <= 0 Then lblErr_FraechterKdNr.Visible = True : Return False + 'End Select + If Not SENDUNG_LIST(CURRENT_INDEX).tblSnd_Fremdspedition Then - If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then - 'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen. - Else - If FilialeAktFirma <> "" Then - If Panel6.Enabled Then 'wenn gesperrt, auch keine Prüfung! - If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False - If Not txtAuftraggeber.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False - If Not txtEmpfaenger.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False - If Not txtFrachtfuehrer.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False - If Not txtAbsender.checkFirma(FilialeAktFirma) Then MsgBox("Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + If SENDUNG_LIST(CURRENT_INDEX).FilialenNr = 5801 Or (SENDUNG_LIST(CURRENT_INDEX).FilialenNr.ToString = VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE And VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER) Then + 'Firma=Cluster, zB Front-Office --> darf alle Firmen auswählen. + Else + If FilialeAktFirma <> "" Then + If Panel6.Enabled Then 'wenn gesperrt, auch keine Prüfung! + If Not txtAvisierer.checkFirma(FilialeAktFirma) Then MsgBox("Avisierer: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + If Not txtAuftraggeber.checkFirma(FilialeAktFirma) Then MsgBox("Auftraggeber: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + If Not txtEmpfaenger.checkFirma(FilialeAktFirma) Then MsgBox("Empfänger: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + If Not txtFrachtfuehrer.checkFirma(FilialeAktFirma) Then MsgBox("Frachtführer: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + If Not txtAbsender.checkFirma(FilialeAktFirma) Then MsgBox("Absender: Es wurde eine Kundennummer einer fremden Firma ausgewählt. Sendung kann nicht gespeichert werden.") : Return False + End If End If End If + End If Return True End Function @@ -275,7 +279,7 @@ Public Class frmSendungsdetailsNEU AVISO = AvisoDAL.LesenAviso(AvisoId, "") - txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] As Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate Is null Or StartDate< GETDATE()) And (EndDate Is null Or EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200) + txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] , [Description] As Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate Is null Or StartDate< GETDATE()) And (EndDate Is null Or EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200) If AVISO.Grenzstelle.Replace("???", "") = "" Then 'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") @@ -372,6 +376,7 @@ Public Class frmSendungsdetailsNEU ' cboZolltarif.changeItem("0") usrcntl_NCTS = New usrCntlSND_NCTSGestellungsadresse + usrcntl_AUSFUHR = New usrCntlSND_Ausfuhr usrcntl_FISKAL = New usrCntlSND_NCTSFiskalEndempf 'usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZollanmeldungen", Me) Then @@ -1128,7 +1133,8 @@ Public Class frmSendungsdetailsNEU - txtFrachtkosten.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "") + txtFrachtkostenEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten, "") + txtFrachtkostenNichtEU.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU, "") txtWarenwert.Text = If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert, "") txtWarenwertWaehrung.SET_VALUE(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung, "")) @@ -1267,6 +1273,7 @@ Public Class frmSendungsdetailsNEU pnlT1.Controls.Clear() usrcntl_NCTS.reset() + usrcntl_AUSFUHR.reset() usrcntl_FISKAL.reset() usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) @@ -1283,7 +1290,7 @@ Public Class frmSendungsdetailsNEU ' txtT1Verzollungsadresse.Text = "" Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID - Case 5, 6 + Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42 If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then usrcntl_NCTS.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId) usrcntl_NCTS.setValues() @@ -1305,6 +1312,25 @@ Public Class frmSendungsdetailsNEU Case 26, 28 usrcntl_FISKAL.rtbFiskalEndempf.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_EUFiskalEmpfaenger, "") pnlT1.Controls.Add(usrcntl_FISKAL) + Case 7 + If (SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId IsNot Nothing) Then + usrcntl_AUSFUHR.NCTS_GA = New cNCTSGestellungsadressen(SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId) + usrcntl_AUSFUHR.setValues() + End If + 'trotzdem überschreiben: + usrcntl_AUSFUHR.txtT1Verzollungsadresse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse, "") + usrcntl_AUSFUHR.txtT1VerzollungsadresseStrasse.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse, "") + usrcntl_AUSFUHR.txtT1VerzollungsadressePlz.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_PLZ, "") + usrcntl_AUSFUHR.txtT1VerzollungsadresseOrt.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ort, "") + usrcntl_AUSFUHR.sbT1VerzollungsadresseLand.SET_VALUE(loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Land, "")) + usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI, "") + usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI_NL.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL, "") + usrcntl_AUSFUHR.txtT1VerzollungsadresseAnspr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner, "") + usrcntl_AUSFUHR.txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(loadValue(SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle, "")) + usrcntl_AUSFUHR.cbxNCTSAufDispo.Checked = SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO + + pnlT1.Controls.Add(usrcntl_AUSFUHR) + Case 23 usrcntl_ATA.txtATAold.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATANr, "") usrcntl_ATA.txtATCMRNFremd.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATCMRN_Fremd, "") @@ -1646,7 +1672,7 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).tblSnd_EUFiskalEmpfaenger = Nothing Select Case SENDUNG_LIST(CURRENT_INDEX).tblSnd_Abfertigungsart_ID - Case 5, 6 + Case 5, 6, 18, 32, 24, 33, 34, 37, 40, 42 If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_NCTSGestellungsadresse) Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse = usrcntl_NCTS.txtT1Verzollungsadresse.Text SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse = usrcntl_NCTS.txtT1VerzollungsadresseStrasse.Text @@ -1661,6 +1687,21 @@ Public Class frmSendungsdetailsNEU SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO = usrcntl_NCTS.cbxNCTSAufDispo.Checked End If + Case 7 + If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_Ausfuhr) Then + SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSVerzollungsadresse = usrcntl_AUSFUHR.txtT1Verzollungsadresse.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Strasse = usrcntl_AUSFUHR.txtT1VerzollungsadresseStrasse.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_PLZ = usrcntl_AUSFUHR.txtT1VerzollungsadressePlz.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ort = usrcntl_AUSFUHR.txtT1VerzollungsadresseOrt.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Land = usrcntl_AUSFUHR.sbT1VerzollungsadresseLand._value + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI = usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_EORI_NL = usrcntl_AUSFUHR.txtT1VerzollungsadresseEORI_NL.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Verzollungsadresse_Ansprechpartner = usrcntl_AUSFUHR.txtT1VerzollungsadresseAnspr.Text + SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle = usrcntl_AUSFUHR.txtT1VerzollungsadresseBestimmungszollstelle._value + SENDUNG_LIST(CURRENT_INDEX).NCTS_ngaId = If(usrcntl_AUSFUHR.NCTS_GA IsNot Nothing, usrcntl_AUSFUHR.NCTS_GA.nga_id, Nothing) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_NCTSaufDISPO = usrcntl_AUSFUHR.cbxNCTSAufDispo.Checked + End If + Case 26, 28 ' SENDUNG_LIST(CURRENT_INDEX).tblSnd_Endempfaenger = txtT1Verzollungsadresse.Text If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_NCTSFiskalEndempf) Then @@ -1682,7 +1723,9 @@ Public Class frmSendungsdetailsNEU End Select - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkosten.Text) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtkosten = SQL.isNullNothingDbl(txtFrachtkostenEU.Text) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtkostenNichtEU = SQL.isNullNothingDbl(txtFrachtkostenNichtEU.Text) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenwert = SQL.isNullNothingDbl(txtWarenwert.Text) SENDUNG_LIST(CURRENT_INDEX).tblSnd_WarenwertWaehrung = SQL.isNullNothing(txtWarenwertWaehrung._value) @@ -2125,8 +2168,14 @@ Public Class frmSendungsdetailsNEU pnlT1.Controls.Clear() Select Case cboAbfertigungsart._value - Case "5", "6", "24", "33", "34" + Case "5", "18", "32" pnlT1.Controls.Add(usrcntl_NCTS) + ' usrcntl_NCTS.Label33.Text = "NCTS-" & vbNewLine & "Gestellungsadr." + Case "6", "24", "33", "34", "37", "40", "42" + pnlT1.Controls.Add(usrcntl_NCTS) +' usrcntl_NCTS.Label33.Text = "Amtsplatz/" & vbNewLine & "Zollstopp" + Case "7" + pnlT1.Controls.Add(usrcntl_AUSFUHR) Case "26", "28" pnlT1.Controls.Add(usrcntl_FISKAL) @@ -3821,7 +3870,13 @@ Public Class frmSendungsdetailsNEU 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 @@ -5310,12 +5365,41 @@ Public Class frmSendungsdetailsNEU Me.Cursor = Cursors.Default End Sub - Sub calculateFreightcost() + Private Sub Button17_Click_2(sender As Object, e As EventArgs) Handles Button17.Click + Dim f As New SDL.frmCMR - Dim frmFrachtkostenBerechnen = New frmFrachtkostenBerechnen(txtAbsenderKdNr._value, txtEmpfaengerKdNr._value) + f.btnCMRtoAkt.Visible = True + f.txtCMRName.Visible = True + + + If txtAbsender.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtAbsender.Text = txtAbsender.KdData_ADRESSEN.getAdressFromatted() + If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted() + If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted() + + f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, ""))) + + f.uCmr.txtKfz.Text = AVISO.LKW_Nr + f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr + + If f.ShowDialog(Me) 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, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + initAnhang() + + End If - If frmFrachtkostenBerechnen.ShowDialog() = DialogResult.OK Then - ' TODO -> Übergabe Parameter Frachtanteil End If End Sub + + Private Sub Button18_Click_1(sender As Object, e As EventArgs) Handles Button18.Click + MsgBox("Funktion noch nicht verfügbar!") + End Sub End Class diff --git a/Aviso/usrCntlSND_Ausfuhr.Designer.vb b/Aviso/usrCntlSND_Ausfuhr.Designer.vb new file mode 100644 index 0000000..422e2d7 --- /dev/null +++ b/Aviso/usrCntlSND_Ausfuhr.Designer.vb @@ -0,0 +1,455 @@ + +Partial Class usrCntlSND_Ausfuhr + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.pnlT1 = New System.Windows.Forms.Panel() + Me.cbxNCTSAufDispo = New System.Windows.Forms.CheckBox() + Me.picDel = New System.Windows.Forms.PictureBox() + Me.txtT1Verzollungsadresse = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label5 = New System.Windows.Forms.Label() + Me.lblNGAId = New System.Windows.Forms.Label() + Me.btn = New System.Windows.Forms.Button() + Me.txtT1VerzollungsadresseEORI_NL = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.txtT1VerzollungsadresseAnspr = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.sbT1VerzollungsadresseLand = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.txtT1VerzollungsadresseEORI = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.Label9 = New System.Windows.Forms.Label() + Me.txtT1VerzollungsadresseOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtT1VerzollungsadressePlz = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtT1VerzollungsadresseStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label33 = New System.Windows.Forms.Label() + Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() + Me.pnlT1.SuspendLayout() + CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'pnlT1 + ' + Me.pnlT1.Controls.Add(Me.cbxNCTSAufDispo) + Me.pnlT1.Controls.Add(Me.picDel) + Me.pnlT1.Controls.Add(Me.txtT1Verzollungsadresse) + Me.pnlT1.Controls.Add(Me.Label5) + Me.pnlT1.Controls.Add(Me.lblNGAId) + Me.pnlT1.Controls.Add(Me.btn) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseEORI_NL) + Me.pnlT1.Controls.Add(Me.Label2) + Me.pnlT1.Controls.Add(Me.Label3) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseAnspr) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseBestimmungszollstelle) + Me.pnlT1.Controls.Add(Me.Label1) + Me.pnlT1.Controls.Add(Me.sbT1VerzollungsadresseLand) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseEORI) + Me.pnlT1.Controls.Add(Me.Label9) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseOrt) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadressePlz) + Me.pnlT1.Controls.Add(Me.txtT1VerzollungsadresseStrasse) + Me.pnlT1.Controls.Add(Me.Label33) + Me.pnlT1.Controls.Add(Me.LinkLabel4) + Me.pnlT1.Location = New System.Drawing.Point(0, 0) + Me.pnlT1.Name = "pnlT1" + Me.pnlT1.Size = New System.Drawing.Size(549, 101) + Me.pnlT1.TabIndex = 0 + ' + 'cbxNCTSAufDispo + ' + Me.cbxNCTSAufDispo.AutoSize = True + Me.cbxNCTSAufDispo.Checked = True + Me.cbxNCTSAufDispo.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxNCTSAufDispo.Location = New System.Drawing.Point(397, 75) + Me.cbxNCTSAufDispo.Name = "cbxNCTSAufDispo" + Me.cbxNCTSAufDispo.Size = New System.Drawing.Size(96, 17) + Me.cbxNCTSAufDispo.TabIndex = 19 + Me.cbxNCTSAufDispo.Text = "Adr. auf Dispo." + Me.cbxNCTSAufDispo.UseVisualStyleBackColor = True + Me.cbxNCTSAufDispo.Visible = False + ' + 'picDel + ' + Me.picDel.BackgroundImage = Global.AVISO.My.Resources.Resources.del + Me.picDel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picDel.Cursor = System.Windows.Forms.Cursors.Hand + Me.picDel.Location = New System.Drawing.Point(100, 52) + Me.picDel.Name = "picDel" + Me.picDel.Size = New System.Drawing.Size(15, 15) + Me.picDel.TabIndex = 18 + Me.picDel.TabStop = False + Me.picDel.Visible = False + ' + 'txtT1Verzollungsadresse + ' + Me.txtT1Verzollungsadresse._allowFreitext = True + Me.txtT1Verzollungsadresse._AllowSetValue = False + Me.txtT1Verzollungsadresse._allowSpaceAsSplitter = False + Me.txtT1Verzollungsadresse._autoSizeGross = False + Me.txtT1Verzollungsadresse._hideIfListEmpty = True + Me.txtT1Verzollungsadresse._value = Nothing + Me.txtT1Verzollungsadresse.conn_art = "FMZOLL" + Me.txtT1Verzollungsadresse.dgvpos = "LEFT" + Me.txtT1Verzollungsadresse.DISPLAY_PARAM = Nothing + Me.txtT1Verzollungsadresse.INVISIBLE_COLUMNS = Nothing + Me.txtT1Verzollungsadresse.key_visible = False + Me.txtT1Verzollungsadresse.KEYPARAM = Nothing + Me.txtT1Verzollungsadresse.Location = New System.Drawing.Point(121, 11) + Me.txtT1Verzollungsadresse.Name = "txtT1Verzollungsadresse" + Me.txtT1Verzollungsadresse.searchActive = True + Me.txtT1Verzollungsadresse.Size = New System.Drawing.Size(269, 20) + Me.txtT1Verzollungsadresse.SQL_ORDER_BY = Nothing + Me.txtT1Verzollungsadresse.SQL_SELECT = Nothing + Me.txtT1Verzollungsadresse.SQL_WHERE = Nothing + Me.txtT1Verzollungsadresse.SQL_WhereParamList = Nothing + Me.txtT1Verzollungsadresse.TabIndex = 1 + Me.txtT1Verzollungsadresse.usrcntl = Nothing + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(23, 52) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(19, 13) + Me.Label5.TabIndex = 8 + Me.Label5.Text = "Id:" + ' + 'lblNGAId + ' + Me.lblNGAId.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblNGAId.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblNGAId.Location = New System.Drawing.Point(48, 52) + Me.lblNGAId.Name = "lblNGAId" + Me.lblNGAId.Size = New System.Drawing.Size(46, 17) + Me.lblNGAId.TabIndex = 9 + Me.lblNGAId.Text = "-" + Me.lblNGAId.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'btn + ' + Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.btn.Location = New System.Drawing.Point(438, 51) + Me.btn.Name = "btn" + Me.btn.Size = New System.Drawing.Size(108, 23) + Me.btn.TabIndex = 17 + Me.btn.Text = "speichern" + Me.btn.UseVisualStyleBackColor = True + ' + 'txtT1VerzollungsadresseEORI_NL + ' + Me.txtT1VerzollungsadresseEORI_NL._allowFreitext = False + Me.txtT1VerzollungsadresseEORI_NL._AllowSetValue = False + Me.txtT1VerzollungsadresseEORI_NL._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseEORI_NL._autoSizeGross = False + Me.txtT1VerzollungsadresseEORI_NL._hideIfListEmpty = True + Me.txtT1VerzollungsadresseEORI_NL._value = Nothing + Me.txtT1VerzollungsadresseEORI_NL.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseEORI_NL.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseEORI_NL.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseEORI_NL.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseEORI_NL.key_visible = False + Me.txtT1VerzollungsadresseEORI_NL.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseEORI_NL.Location = New System.Drawing.Point(455, 30) + Me.txtT1VerzollungsadresseEORI_NL.MaxLength = 4 + Me.txtT1VerzollungsadresseEORI_NL.Name = "txtT1VerzollungsadresseEORI_NL" + Me.txtT1VerzollungsadresseEORI_NL.searchActive = True + Me.txtT1VerzollungsadresseEORI_NL.Size = New System.Drawing.Size(91, 20) + Me.txtT1VerzollungsadresseEORI_NL.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseEORI_NL.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseEORI_NL.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseEORI_NL.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseEORI_NL.TabIndex = 7 + Me.txtT1VerzollungsadresseEORI_NL.usrcntl = Nothing + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(396, 33) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(53, 13) + Me.Label2.TabIndex = 6 + Me.Label2.Text = "EORI-NL:" + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(23, 75) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(51, 13) + Me.Label3.TabIndex = 15 + Me.Label3.Text = "Zollstelle:" + ' + 'txtT1VerzollungsadresseAnspr + ' + Me.txtT1VerzollungsadresseAnspr._allowFreitext = False + Me.txtT1VerzollungsadresseAnspr._AllowSetValue = False + Me.txtT1VerzollungsadresseAnspr._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseAnspr._autoSizeGross = False + Me.txtT1VerzollungsadresseAnspr._hideIfListEmpty = True + Me.txtT1VerzollungsadresseAnspr._value = Nothing + Me.txtT1VerzollungsadresseAnspr.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseAnspr.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseAnspr.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseAnspr.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseAnspr.key_visible = False + Me.txtT1VerzollungsadresseAnspr.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseAnspr.Location = New System.Drawing.Point(438, 49) + Me.txtT1VerzollungsadresseAnspr.MaxLength = 35 + Me.txtT1VerzollungsadresseAnspr.Name = "txtT1VerzollungsadresseAnspr" + Me.txtT1VerzollungsadresseAnspr.searchActive = True + Me.txtT1VerzollungsadresseAnspr.Size = New System.Drawing.Size(108, 20) + Me.txtT1VerzollungsadresseAnspr.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseAnspr.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseAnspr.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseAnspr.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseAnspr.TabIndex = 14 + Me.txtT1VerzollungsadresseAnspr.usrcntl = Nothing + Me.txtT1VerzollungsadresseAnspr.Visible = False + ' + 'txtT1VerzollungsadresseBestimmungszollstelle + ' + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True + Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseBestimmungszollstelle.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False + Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72) + Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 50 + Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" + Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True + Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(269, 20) + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseBestimmungszollstelle.TabIndex = 16 + Me.txtT1VerzollungsadresseBestimmungszollstelle.usrcntl = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(396, 52) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(40, 13) + Me.Label1.TabIndex = 13 + Me.Label1.Text = "Anspr.:" + Me.Label1.Visible = False + ' + 'sbT1VerzollungsadresseLand + ' + Me.sbT1VerzollungsadresseLand._allowFreitext = False + Me.sbT1VerzollungsadresseLand._AllowSetValue = False + Me.sbT1VerzollungsadresseLand._allowSpaceAsSplitter = False + Me.sbT1VerzollungsadresseLand._autoSizeGross = False + Me.sbT1VerzollungsadresseLand._hideIfListEmpty = True + Me.sbT1VerzollungsadresseLand._value = Nothing + Me.sbT1VerzollungsadresseLand.conn_art = "FMZOLL" + Me.sbT1VerzollungsadresseLand.dgvpos = "LEFT" + Me.sbT1VerzollungsadresseLand.DISPLAY_PARAM = Nothing + Me.sbT1VerzollungsadresseLand.INVISIBLE_COLUMNS = Nothing + Me.sbT1VerzollungsadresseLand.key_visible = False + Me.sbT1VerzollungsadresseLand.KEYPARAM = Nothing + Me.sbT1VerzollungsadresseLand.Location = New System.Drawing.Point(121, 49) + Me.sbT1VerzollungsadresseLand.MaxLength = 20 + Me.sbT1VerzollungsadresseLand.Name = "sbT1VerzollungsadresseLand" + Me.sbT1VerzollungsadresseLand.searchActive = True + Me.sbT1VerzollungsadresseLand.Size = New System.Drawing.Size(32, 20) + Me.sbT1VerzollungsadresseLand.SQL_ORDER_BY = Nothing + Me.sbT1VerzollungsadresseLand.SQL_SELECT = Nothing + Me.sbT1VerzollungsadresseLand.SQL_WHERE = Nothing + Me.sbT1VerzollungsadresseLand.SQL_WhereParamList = Nothing + Me.sbT1VerzollungsadresseLand.TabIndex = 10 + Me.sbT1VerzollungsadresseLand.usrcntl = Nothing + ' + 'txtT1VerzollungsadresseEORI + ' + Me.txtT1VerzollungsadresseEORI._allowFreitext = False + Me.txtT1VerzollungsadresseEORI._AllowSetValue = False + Me.txtT1VerzollungsadresseEORI._allowSpaceAsSplitter = False + Me.txtT1VerzollungsadresseEORI._autoSizeGross = False + Me.txtT1VerzollungsadresseEORI._hideIfListEmpty = True + Me.txtT1VerzollungsadresseEORI._value = Nothing + Me.txtT1VerzollungsadresseEORI.conn_art = "FMZOLL" + Me.txtT1VerzollungsadresseEORI.dgvpos = "LEFT" + Me.txtT1VerzollungsadresseEORI.DISPLAY_PARAM = Nothing + Me.txtT1VerzollungsadresseEORI.INVISIBLE_COLUMNS = Nothing + Me.txtT1VerzollungsadresseEORI.key_visible = False + Me.txtT1VerzollungsadresseEORI.KEYPARAM = Nothing + Me.txtT1VerzollungsadresseEORI.Location = New System.Drawing.Point(438, 11) + Me.txtT1VerzollungsadresseEORI.MaxLength = 17 + Me.txtT1VerzollungsadresseEORI.Name = "txtT1VerzollungsadresseEORI" + Me.txtT1VerzollungsadresseEORI.searchActive = True + Me.txtT1VerzollungsadresseEORI.Size = New System.Drawing.Size(108, 20) + Me.txtT1VerzollungsadresseEORI.SQL_ORDER_BY = Nothing + Me.txtT1VerzollungsadresseEORI.SQL_SELECT = Nothing + Me.txtT1VerzollungsadresseEORI.SQL_WHERE = Nothing + Me.txtT1VerzollungsadresseEORI.SQL_WhereParamList = Nothing + Me.txtT1VerzollungsadresseEORI.TabIndex = 2 + Me.txtT1VerzollungsadresseEORI.usrcntl = Nothing + ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Location = New System.Drawing.Point(396, 14) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(36, 13) + Me.Label9.TabIndex = 4 + Me.Label9.Text = "EORI:" + ' + 'txtT1VerzollungsadresseOrt + ' + Me.txtT1VerzollungsadresseOrt._DateTimeOnly = False + Me.txtT1VerzollungsadresseOrt._numbersOnly = False + Me.txtT1VerzollungsadresseOrt._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadresseOrt._numbersOnlyTrennzeichen = True + Me.txtT1VerzollungsadresseOrt._Prozent = False + Me.txtT1VerzollungsadresseOrt._ShortDateNew = False + Me.txtT1VerzollungsadresseOrt._ShortDateOnly = False + Me.txtT1VerzollungsadresseOrt._TimeOnly = False + Me.txtT1VerzollungsadresseOrt._TimeOnly_Seconds = False + Me.txtT1VerzollungsadresseOrt._value = Nothing + Me.txtT1VerzollungsadresseOrt._Waehrung = False + Me.txtT1VerzollungsadresseOrt._WaehrungZeichen = True + Me.txtT1VerzollungsadresseOrt.ForeColor = System.Drawing.Color.Black + Me.txtT1VerzollungsadresseOrt.Location = New System.Drawing.Point(213, 49) + Me.txtT1VerzollungsadresseOrt.MaxLength = 35 + Me.txtT1VerzollungsadresseOrt.MaxLineLength = -1 + Me.txtT1VerzollungsadresseOrt.MaxLines_Warning = "" + Me.txtT1VerzollungsadresseOrt.MaxLines_Warning_Label = Nothing + Me.txtT1VerzollungsadresseOrt.Name = "txtT1VerzollungsadresseOrt" + Me.txtT1VerzollungsadresseOrt.Size = New System.Drawing.Size(177, 20) + Me.txtT1VerzollungsadresseOrt.TabIndex = 12 + ' + 'txtT1VerzollungsadressePlz + ' + Me.txtT1VerzollungsadressePlz._DateTimeOnly = False + Me.txtT1VerzollungsadressePlz._numbersOnly = False + Me.txtT1VerzollungsadressePlz._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadressePlz._numbersOnlyTrennzeichen = True + Me.txtT1VerzollungsadressePlz._Prozent = False + Me.txtT1VerzollungsadressePlz._ShortDateNew = False + Me.txtT1VerzollungsadressePlz._ShortDateOnly = False + Me.txtT1VerzollungsadressePlz._TimeOnly = False + Me.txtT1VerzollungsadressePlz._TimeOnly_Seconds = False + Me.txtT1VerzollungsadressePlz._value = Nothing + Me.txtT1VerzollungsadressePlz._Waehrung = False + Me.txtT1VerzollungsadressePlz._WaehrungZeichen = True + Me.txtT1VerzollungsadressePlz.ForeColor = System.Drawing.Color.Black + Me.txtT1VerzollungsadressePlz.Location = New System.Drawing.Point(152, 49) + Me.txtT1VerzollungsadressePlz.MaxLength = 9 + Me.txtT1VerzollungsadressePlz.MaxLineLength = -1 + Me.txtT1VerzollungsadressePlz.MaxLines_Warning = "" + Me.txtT1VerzollungsadressePlz.MaxLines_Warning_Label = Nothing + Me.txtT1VerzollungsadressePlz.Name = "txtT1VerzollungsadressePlz" + Me.txtT1VerzollungsadressePlz.Size = New System.Drawing.Size(62, 20) + Me.txtT1VerzollungsadressePlz.TabIndex = 11 + ' + 'txtT1VerzollungsadresseStrasse + ' + Me.txtT1VerzollungsadresseStrasse._DateTimeOnly = False + Me.txtT1VerzollungsadresseStrasse._numbersOnly = False + Me.txtT1VerzollungsadresseStrasse._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadresseStrasse._numbersOnlyTrennzeichen = True + Me.txtT1VerzollungsadresseStrasse._Prozent = False + Me.txtT1VerzollungsadresseStrasse._ShortDateNew = False + Me.txtT1VerzollungsadresseStrasse._ShortDateOnly = False + Me.txtT1VerzollungsadresseStrasse._TimeOnly = False + Me.txtT1VerzollungsadresseStrasse._TimeOnly_Seconds = False + Me.txtT1VerzollungsadresseStrasse._value = Nothing + Me.txtT1VerzollungsadresseStrasse._Waehrung = False + Me.txtT1VerzollungsadresseStrasse._WaehrungZeichen = True + Me.txtT1VerzollungsadresseStrasse.ForeColor = System.Drawing.Color.Black + Me.txtT1VerzollungsadresseStrasse.Location = New System.Drawing.Point(121, 30) + Me.txtT1VerzollungsadresseStrasse.MaxLength = 35 + Me.txtT1VerzollungsadresseStrasse.MaxLineLength = -1 + Me.txtT1VerzollungsadresseStrasse.MaxLines_Warning = "" + Me.txtT1VerzollungsadresseStrasse.MaxLines_Warning_Label = Nothing + Me.txtT1VerzollungsadresseStrasse.Name = "txtT1VerzollungsadresseStrasse" + Me.txtT1VerzollungsadresseStrasse.Size = New System.Drawing.Size(269, 20) + Me.txtT1VerzollungsadresseStrasse.TabIndex = 5 + ' + 'Label33 + ' + Me.Label33.AutoSize = True + Me.Label33.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label33.Location = New System.Drawing.Point(23, 14) + Me.Label33.Name = "Label33" + Me.Label33.Size = New System.Drawing.Size(57, 26) + Me.Label33.TabIndex = 3 + Me.Label33.Text = "Amtsplatz/" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zollstopp" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) + ' + 'LinkLabel4 + ' + Me.LinkLabel4.AutoSize = True + Me.LinkLabel4.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) + Me.LinkLabel4.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(30, Byte), Integer), CType(CType(90, Byte), Integer)) + Me.LinkLabel4.Location = New System.Drawing.Point(319, -2) + Me.LinkLabel4.Name = "LinkLabel4" + Me.LinkLabel4.Size = New System.Drawing.Size(41, 9) + Me.LinkLabel4.TabIndex = 0 + Me.LinkLabel4.TabStop = True + Me.LinkLabel4.Text = "= Absender" + ' + 'usrCntlSND_Ausfuhr + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.pnlT1) + Me.Name = "usrCntlSND_Ausfuhr" + Me.Size = New System.Drawing.Size(549, 94) + Me.pnlT1.ResumeLayout(False) + Me.pnlT1.PerformLayout() + CType(Me.picDel, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + Friend WithEvents pnlT1 As System.Windows.Forms.Panel + Friend WithEvents sbT1VerzollungsadresseLand As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents txtT1VerzollungsadresseEORI As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents Label9 As System.Windows.Forms.Label + Friend WithEvents txtT1VerzollungsadresseOrt As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtT1VerzollungsadressePlz As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents txtT1VerzollungsadresseStrasse As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Label33 As System.Windows.Forms.Label + Friend WithEvents LinkLabel4 As System.Windows.Forms.LinkLabel + Friend WithEvents txtT1VerzollungsadresseAnspr As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents txtT1VerzollungsadresseBestimmungszollstelle As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents Label1 As System.Windows.Forms.Label + Friend WithEvents Label3 As System.Windows.Forms.Label + Friend WithEvents txtT1VerzollungsadresseEORI_NL As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents btn As Button + Friend WithEvents Label5 As Label + Friend WithEvents lblNGAId As Label + Friend WithEvents txtT1Verzollungsadresse As VERAG_PROG_ALLGEMEIN.MySearchBox + Friend WithEvents picDel As PictureBox + Friend WithEvents cbxNCTSAufDispo As CheckBox +End Class diff --git a/Aviso/usrCntlSND_Ausfuhr.resx b/Aviso/usrCntlSND_Ausfuhr.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Aviso/usrCntlSND_Ausfuhr.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Aviso/usrCntlSND_Ausfuhr.vb b/Aviso/usrCntlSND_Ausfuhr.vb new file mode 100644 index 0000000..1e66bff --- /dev/null +++ b/Aviso/usrCntlSND_Ausfuhr.vb @@ -0,0 +1,134 @@ +Public Class usrCntlSND_Ausfuhr + + Public NCTS_GA As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + + + Sub New() + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + + End Sub + + Sub New(id) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(id) + + + + End Sub + + + Public Sub setValues() + txtT1Verzollungsadresse.Text = If(NCTS_GA.nga_name, "") + txtT1VerzollungsadresseStrasse.Text = If(NCTS_GA.nga_strasse, "") + txtT1VerzollungsadressePlz.Text = If(NCTS_GA.nga_plz, "") + txtT1VerzollungsadresseOrt.Text = If(NCTS_GA.nga_ort, "") + sbT1VerzollungsadresseLand.SET_VALUE(If(NCTS_GA.nga_land, "")) + + txtT1VerzollungsadresseAnspr.Text = If(NCTS_GA.nga_Ansprechpartner, "") + txtT1VerzollungsadresseEORI.Text = If(NCTS_GA.nga_EORI, "") + txtT1VerzollungsadresseEORI_NL.Text = If(NCTS_GA.nga_EORI_NL, "") + txtT1VerzollungsadresseBestimmungszollstelle.SET_VALUE(If(NCTS_GA.nga_bestZollst, "")) + + + lblNGAId.Text = If(NCTS_GA.nga_id > 0, NCTS_GA.nga_id, "-") + picDel.Visible = (NCTS_GA.nga_id > 0) + End Sub + + + Public Sub getValues() + NCTS_GA.nga_name = txtT1Verzollungsadresse.Text + NCTS_GA.nga_strasse = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseStrasse.Text) + NCTS_GA.nga_plz = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadressePlz.Text) + NCTS_GA.nga_ort = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseOrt.Text) + NCTS_GA.nga_land = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(sbT1VerzollungsadresseLand._value) + + NCTS_GA.nga_Ansprechpartner = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseAnspr.Text) + NCTS_GA.nga_EORI = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI.Text) + NCTS_GA.nga_EORI_NL = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseEORI_NL.Text) + NCTS_GA.nga_bestZollst = VERAG_PROG_ALLGEMEIN.SQL.isNullNothing(txtT1VerzollungsadresseBestimmungszollstelle._value) + End Sub + + Private Sub LinkLabel4_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel4.LinkClicked + Try + If Me.FindForm.GetType Is GetType(frmSendungsdetailsNEU) Then + Dim f = DirectCast(Me.FindForm, frmSendungsdetailsNEU) + If f.txtAbsender.KdNr > 0 AndAlso f.txtAbsender.KdData_ADRESSEN IsNot Nothing Then + txtT1Verzollungsadresse.Text = (If(f.txtAbsender.KdData_ADRESSEN.Name_1, "") & " " & If(f.txtAbsender.KdData_ADRESSEN.Name_2, "")).trim + txtT1VerzollungsadresseStrasse.Text = If(f.txtAbsender.KdData_ADRESSEN.Straße, "") + txtT1VerzollungsadressePlz.Text = If(f.txtAbsender.KdData_ADRESSEN.PLZ, "") + txtT1VerzollungsadresseOrt.Text = If(f.txtAbsender.KdData_ADRESSEN.Ort, "") + + sbT1VerzollungsadresseLand.SET_VALUE(SDL.cProgramFunctions.getISO2Land(If(f.txtAbsender.KdData_ADRESSEN.LandKz, ""))) + + If f.txtAbsender.KdData_KUNDE IsNot Nothing Then + txtT1VerzollungsadresseEORI.Text = If(f.txtAbsender.KdData_KUNDE.EORITIN, "") + txtT1VerzollungsadresseEORI_NL.Text = If(f.txtAbsender.KdData_KUNDE.EORITIN_NL, "") + + End If + Else + txtT1Verzollungsadresse.Text = f.txtAbsender.Text + End If + End If + Catch ex As Exception + + End Try + End Sub + + Private Sub usrCntlSND_NCTSGestellungsadresse_Load(sender As Object, e As EventArgs) Handles Me.Load + If NCTS_GA Is Nothing Then : NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + Else : setValues() : End If + + + ' txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) + txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as displayPARAM FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "displayPARAM", "FMZOLL", True, 400, 200, {"displayPARAM", "Code"}) + + sbT1VerzollungsadresseLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code] display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) + txtT1Verzollungsadresse.initSearchBox(Me.FindForm, " [nga_id] ,[nga_name] as Name,isnull(nga_ort,'') as Ort FROM tblNCTSGestellungsadressen", {"nga_id", "nga_name", "nga_ort", "nga_strasse", "nga_bestZollst", "nga_EORI"}, " nga_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", "nga_id", "nga_id", "Name", "FMZOLL", , 400, 200, {"nga_id"}) + End Sub + + + Sub reset() + NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + setValues() + End Sub + + Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click + Save_Me() + + End Sub + + Function Save_Me() As Boolean + + getValues() + Save_Me = NCTS_GA.SAVE + lblNGAId.Text = NCTS_GA.nga_id + + End Function + + Private Sub txtT1Verzollungsadresse_VALUE_CHANGED() Handles txtT1Verzollungsadresse.VALUE_CHANGED + If txtT1Verzollungsadresse._value <> "" Then + NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen(txtT1Verzollungsadresse._value) + setValues() + End If + + End Sub + + Private Sub lblNGAId_Click(sender As Object, e As EventArgs) Handles lblNGAId.Click + reset() + End Sub + + Private Sub picDel_Click(sender As Object, e As EventArgs) Handles picDel.Click + If vbYes = MsgBox("Möchten Sie die NCTS-Gestellungsadresse wirklich löschen?", vbYesNoCancel + MsgBoxStyle.DefaultButton2) Then + NCTS_GA.DELETE() + NCTS_GA = New VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + setValues() + End If + End Sub + +End Class diff --git a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb index 4148e12..2508857 100644 --- a/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb +++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.Designer.vb @@ -102,6 +102,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.txtT1Verzollungsadresse._allowFreitext = True Me.txtT1Verzollungsadresse._AllowSetValue = False + Me.txtT1Verzollungsadresse._allowSpaceAsSplitter = False Me.txtT1Verzollungsadresse._autoSizeGross = False Me.txtT1Verzollungsadresse._hideIfListEmpty = True Me.txtT1Verzollungsadresse._value = Nothing @@ -158,6 +159,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.txtT1VerzollungsadresseEORI_NL._allowFreitext = False Me.txtT1VerzollungsadresseEORI_NL._AllowSetValue = False + Me.txtT1VerzollungsadresseEORI_NL._allowSpaceAsSplitter = False Me.txtT1VerzollungsadresseEORI_NL._autoSizeGross = False Me.txtT1VerzollungsadresseEORI_NL._hideIfListEmpty = True Me.txtT1VerzollungsadresseEORI_NL._value = Nothing @@ -201,6 +203,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.txtT1VerzollungsadresseAnspr._allowFreitext = False Me.txtT1VerzollungsadresseAnspr._AllowSetValue = False + Me.txtT1VerzollungsadresseAnspr._allowSpaceAsSplitter = False Me.txtT1VerzollungsadresseAnspr._autoSizeGross = False Me.txtT1VerzollungsadresseAnspr._hideIfListEmpty = True Me.txtT1VerzollungsadresseAnspr._value = Nothing @@ -227,6 +230,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.txtT1VerzollungsadresseBestimmungszollstelle._allowFreitext = False Me.txtT1VerzollungsadresseBestimmungszollstelle._AllowSetValue = False + Me.txtT1VerzollungsadresseBestimmungszollstelle._allowSpaceAsSplitter = False Me.txtT1VerzollungsadresseBestimmungszollstelle._autoSizeGross = False Me.txtT1VerzollungsadresseBestimmungszollstelle._hideIfListEmpty = True Me.txtT1VerzollungsadresseBestimmungszollstelle._value = Nothing @@ -237,7 +241,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse Me.txtT1VerzollungsadresseBestimmungszollstelle.key_visible = False Me.txtT1VerzollungsadresseBestimmungszollstelle.KEYPARAM = Nothing Me.txtT1VerzollungsadresseBestimmungszollstelle.Location = New System.Drawing.Point(121, 72) - Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 8 + Me.txtT1VerzollungsadresseBestimmungszollstelle.MaxLength = 50 Me.txtT1VerzollungsadresseBestimmungszollstelle.Name = "txtT1VerzollungsadresseBestimmungszollstelle" Me.txtT1VerzollungsadresseBestimmungszollstelle.searchActive = True Me.txtT1VerzollungsadresseBestimmungszollstelle.Size = New System.Drawing.Size(269, 20) @@ -262,6 +266,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.sbT1VerzollungsadresseLand._allowFreitext = False Me.sbT1VerzollungsadresseLand._AllowSetValue = False + Me.sbT1VerzollungsadresseLand._allowSpaceAsSplitter = False Me.sbT1VerzollungsadresseLand._autoSizeGross = False Me.sbT1VerzollungsadresseLand._hideIfListEmpty = True Me.sbT1VerzollungsadresseLand._value = Nothing @@ -287,6 +292,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse ' Me.txtT1VerzollungsadresseEORI._allowFreitext = False Me.txtT1VerzollungsadresseEORI._AllowSetValue = False + Me.txtT1VerzollungsadresseEORI._allowSpaceAsSplitter = False Me.txtT1VerzollungsadresseEORI._autoSizeGross = False Me.txtT1VerzollungsadresseEORI._hideIfListEmpty = True Me.txtT1VerzollungsadresseEORI._value = Nothing @@ -322,10 +328,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse Me.txtT1VerzollungsadresseOrt._DateTimeOnly = False Me.txtT1VerzollungsadresseOrt._numbersOnly = False Me.txtT1VerzollungsadresseOrt._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadresseOrt._numbersOnlyTrennzeichen = True Me.txtT1VerzollungsadresseOrt._Prozent = False Me.txtT1VerzollungsadresseOrt._ShortDateNew = False Me.txtT1VerzollungsadresseOrt._ShortDateOnly = False Me.txtT1VerzollungsadresseOrt._TimeOnly = False + Me.txtT1VerzollungsadresseOrt._TimeOnly_Seconds = False Me.txtT1VerzollungsadresseOrt._value = Nothing Me.txtT1VerzollungsadresseOrt._Waehrung = False Me.txtT1VerzollungsadresseOrt._WaehrungZeichen = True @@ -344,10 +352,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse Me.txtT1VerzollungsadressePlz._DateTimeOnly = False Me.txtT1VerzollungsadressePlz._numbersOnly = False Me.txtT1VerzollungsadressePlz._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadressePlz._numbersOnlyTrennzeichen = True Me.txtT1VerzollungsadressePlz._Prozent = False Me.txtT1VerzollungsadressePlz._ShortDateNew = False Me.txtT1VerzollungsadressePlz._ShortDateOnly = False Me.txtT1VerzollungsadressePlz._TimeOnly = False + Me.txtT1VerzollungsadressePlz._TimeOnly_Seconds = False Me.txtT1VerzollungsadressePlz._value = Nothing Me.txtT1VerzollungsadressePlz._Waehrung = False Me.txtT1VerzollungsadressePlz._WaehrungZeichen = True @@ -366,10 +376,12 @@ Partial Class usrCntlSND_NCTSGestellungsadresse Me.txtT1VerzollungsadresseStrasse._DateTimeOnly = False Me.txtT1VerzollungsadresseStrasse._numbersOnly = False Me.txtT1VerzollungsadresseStrasse._numbersOnlyKommastellen = "" + Me.txtT1VerzollungsadresseStrasse._numbersOnlyTrennzeichen = True Me.txtT1VerzollungsadresseStrasse._Prozent = False Me.txtT1VerzollungsadresseStrasse._ShortDateNew = False Me.txtT1VerzollungsadresseStrasse._ShortDateOnly = False Me.txtT1VerzollungsadresseStrasse._TimeOnly = False + Me.txtT1VerzollungsadresseStrasse._TimeOnly_Seconds = False Me.txtT1VerzollungsadresseStrasse._value = Nothing Me.txtT1VerzollungsadresseStrasse._Waehrung = False Me.txtT1VerzollungsadresseStrasse._WaehrungZeichen = True @@ -391,7 +403,7 @@ Partial Class usrCntlSND_NCTSGestellungsadresse Me.Label33.Name = "Label33" Me.Label33.Size = New System.Drawing.Size(83, 26) Me.Label33.TabIndex = 3 - Me.Label33.Text = "NCTS-" & Global.Microsoft.VisualBasic.ChrW(10) & "Gestellungsadr.:" + Me.Label33.Text = "NCTS-" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Gestellungsadr.:" ' 'LinkLabel4 ' diff --git a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb index 7a92ec1..134a296 100644 --- a/Aviso/usrCntlSND_NCTSGestellungsadresse.vb +++ b/Aviso/usrCntlSND_NCTSGestellungsadresse.vb @@ -86,7 +86,7 @@ ' txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) - txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Description] +' (' +left(Code,2)+')' as display FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "display", "FMZOLL", , 400, 200, {"display", "Code"}) + txtT1VerzollungsadresseBestimmungszollstelle.initSearchBox(Me.FindForm, "[Code] ,[Code] as Nr,Description as Dienststelle,left(Code,2) as Land,[Code] +' - ' + [Description] +' (' +left(Code,2)+')' as displayPARAM FROM [tbl_DY_ZollDE_C0141_Zollstellen]", {" [Code]", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", " left(Code,2),[Description]", "Code", "displayPARAM", "FMZOLL", True, 400, 200, {"displayPARAM", "Code"}) sbT1VerzollungsadresseLand.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land,[Code] display FROM tbl_DY_ZollDE_C0008_LaenderFull", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "display", "FMZOLL", , 400, 200) txtT1Verzollungsadresse.initSearchBox(Me.FindForm, " [nga_id] ,[nga_name] as Name,isnull(nga_ort,'') as Ort FROM tblNCTSGestellungsadressen", {"nga_id", "nga_name", "nga_ort", "nga_strasse", "nga_bestZollst", "nga_EORI"}, " nga_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", "nga_id", "nga_id", "Name", "FMZOLL", , 400, 200, {"nga_id"}) diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 77faecf..782b3af 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -1993,16 +1993,18 @@ Public Class usrcntlAktDetails DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_gray_small + DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen" If r.Cells("LetzterMitarbeiterId").Value IsNot DBNull.Value AndAlso r.Cells("LetzterMitarbeiterId").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_blue_small DirectCast(r.Cells("SenungWeiterleiten"), DataGridViewImageCell).Value = My.Resources.weiterleiten_small1 - Else + DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Bereits 'meine Sendung'" + ElseIf r.Cells("LetzterMitarbeiterId").Value IsNot DBNull.Value AndAlso CInt(r.Cells("LetzterMitarbeiterId").Value) > 0 Then If r.Cells("tblSnd_VG_MA").Value IsNot DBNull.Value Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).Value = My.Resources.personCheck_small + If r.Cells("LetzterMitarbeiter").Value IsNot DBNull.Value AndAlso r.Cells("LetzterMitarbeiter").Value <> "" Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung von '" & r.Cells("LetzterMitarbeiter").Value & "' übernehmen" End If - DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen" + ' DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung übernehmen" End If - If r.Cells("LetzterMitarbeiter").Value IsNot DBNull.Value Then DirectCast(r.Cells("SenungUebernehmen"), DataGridViewImageCell).ToolTipText = "Sendung von '" & r.Cells("LetzterMitarbeiter").Value & "' übernehmen" If dgvSendungen.Columns("SendungFakturiert") IsNot Nothing Then If (r.Cells("tblSnd_Fakturiert").Value) IsNot DBNull.Value Then diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 7f80e49..e955a83 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -517,7 +517,20 @@ Public Class usrcntlAktDetailsATILLANeu Try If dgvanhaenge.SelectedRows.Count > 0 Then - Process.Start(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(dgvanhaenge.SelectedRows(0).Cells("anh_docId").Value)) + 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 Catch ex As Exception @@ -1537,6 +1550,7 @@ Public Class usrcntlAktDetailsATILLANeu f.btnCMRtoAkt.Visible = True f.txtCMRName.Visible = True + f.txtCMRName.Visible = True If f.ShowDialog(Me) Then diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index f001e2a..6399a8f 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -303,6 +303,12 @@ Always + + + {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} + DAKOSY_Worker_lib + +