From 58e2e38da5fafaa6bf7b63715d6c5f5f1d3154f8 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 15 Sep 2023 14:59:11 +0200 Subject: [PATCH 1/5] Vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 1fb219d..8804c5f 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From 7367b518c53fe82e4c476e0b75dcdb2e36b8d83d Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 15 Sep 2023 16:24:56 +0200 Subject: [PATCH 2/5] Vers --- Aviso/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 8804c5f..5b3b1c5 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + From edf36f56e176bf485d625c2409fb0aa6a3e1e39b Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 18 Sep 2023 20:17:50 +0200 Subject: [PATCH 3/5] Hautptfenster Suche Absender --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfenster.Designer.vb | 83 ++++++++++++++++++++----------- Aviso/frmHauptfenster.vb | 1 + 3 files changed, 57 insertions(+), 31 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 5b3b1c5..3636290 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index f345918..ec81e26 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -133,6 +133,7 @@ Partial Class frmHauptfenster Me.AdministrationEssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WarenorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DatevBuchungsexportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.APIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LKWBerichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatistikADMINToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -326,6 +327,8 @@ Partial Class frmHauptfenster Me.pnlTime = New System.Windows.Forms.Panel() Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.pnlSearch = New System.Windows.Forms.Panel() + Me.lblAbsender = New System.Windows.Forms.Label() + Me.txtAbsender = New System.Windows.Forms.TextBox() Me.txtDyRef = New System.Windows.Forms.TextBox() Me.Label19 = New System.Windows.Forms.Label() Me.lblErwLKWID = New System.Windows.Forms.Label() @@ -378,7 +381,6 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() - Me.APIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -1054,6 +1056,12 @@ Partial Class frmHauptfenster Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" Me.DatevBuchungsexportToolStripMenuItem.Visible = False ' + 'APIToolStripMenuItem + ' + Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem" + Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.APIToolStripMenuItem.Text = "API" + ' 'StatistikToolStripMenuItem ' Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1}) @@ -2756,7 +2764,7 @@ Partial Class frmHauptfenster Me.tbcntrAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.tbcntrAviso.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.tbcntrAviso.ItemSize = New System.Drawing.Size(60, 30) - Me.tbcntrAviso.Location = New System.Drawing.Point(-1, 188) + Me.tbcntrAviso.Location = New System.Drawing.Point(-1, 216) Me.tbcntrAviso.Name = "tbcntrAviso" Me.tbcntrAviso.Padding = New System.Drawing.Point(12, 3) Me.tbcntrAviso.SelectedIndex = 0 @@ -2871,7 +2879,7 @@ Partial Class frmHauptfenster DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill - Me.gridAviso.Location = New System.Drawing.Point(0, 220) + Me.gridAviso.Location = New System.Drawing.Point(0, 248) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True @@ -2891,7 +2899,7 @@ Partial Class frmHauptfenster Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 67) + Me.gridAviso.Size = New System.Drawing.Size(815, 39) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' @@ -2925,7 +2933,7 @@ Partial Class frmHauptfenster Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(815, 220) + Me.Panel1.Size = New System.Drawing.Size(815, 248) Me.Panel1.TabIndex = 2 ' 'txtBestimmungszollstelle @@ -3126,6 +3134,8 @@ Partial Class frmHauptfenster ' 'pnlSearch ' + Me.pnlSearch.Controls.Add(Me.lblAbsender) + Me.pnlSearch.Controls.Add(Me.txtAbsender) Me.pnlSearch.Controls.Add(Me.txtDyRef) Me.pnlSearch.Controls.Add(Me.Label19) Me.pnlSearch.Controls.Add(Me.lblErwLKWID) @@ -3150,24 +3160,43 @@ Partial Class frmHauptfenster Me.pnlSearch.Controls.Add(Me.cbxAlle) Me.pnlSearch.Location = New System.Drawing.Point(-2, 79) Me.pnlSearch.Name = "pnlSearch" - Me.pnlSearch.Size = New System.Drawing.Size(723, 108) + Me.pnlSearch.Size = New System.Drawing.Size(723, 135) Me.pnlSearch.TabIndex = 16 Me.pnlSearch.Visible = False ' + 'lblAbsender + ' + Me.lblAbsender.AutoSize = True + Me.lblAbsender.ForeColor = System.Drawing.Color.White + Me.lblAbsender.Location = New System.Drawing.Point(8, 40) + Me.lblAbsender.Name = "lblAbsender" + Me.lblAbsender.Size = New System.Drawing.Size(55, 13) + Me.lblAbsender.TabIndex = 23 + Me.lblAbsender.Text = "Absender:" + ' + 'txtAbsender + ' + Me.txtAbsender.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtAbsender.Location = New System.Drawing.Point(79, 35) + Me.txtAbsender.MaxLength = 100 + Me.txtAbsender.Name = "txtAbsender" + Me.txtAbsender.Size = New System.Drawing.Size(236, 23) + Me.txtAbsender.TabIndex = 2 + ' 'txtDyRef ' Me.txtDyRef.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtDyRef.Location = New System.Drawing.Point(389, 61) + Me.txtDyRef.Location = New System.Drawing.Point(389, 84) Me.txtDyRef.MaxLength = 100 Me.txtDyRef.Name = "txtDyRef" Me.txtDyRef.Size = New System.Drawing.Size(216, 23) - Me.txtDyRef.TabIndex = 21 + Me.txtDyRef.TabIndex = 10 ' 'Label19 ' Me.Label19.AutoSize = True Me.Label19.ForeColor = System.Drawing.Color.White - Me.Label19.Location = New System.Drawing.Point(316, 66) + Me.Label19.Location = New System.Drawing.Point(316, 89) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(48, 13) Me.Label19.TabIndex = 20 @@ -3177,7 +3206,7 @@ Partial Class frmHauptfenster ' Me.lblErwLKWID.AutoSize = True Me.lblErwLKWID.ForeColor = System.Drawing.Color.White - Me.lblErwLKWID.Location = New System.Drawing.Point(8, 66) + Me.lblErwLKWID.Location = New System.Drawing.Point(8, 89) Me.lblErwLKWID.Name = "lblErwLKWID" Me.lblErwLKWID.Size = New System.Drawing.Size(46, 13) Me.lblErwLKWID.TabIndex = 19 @@ -3186,7 +3215,7 @@ Partial Class frmHauptfenster 'txtlkwId ' Me.txtlkwId.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtlkwId.Location = New System.Drawing.Point(79, 61) + Me.txtlkwId.Location = New System.Drawing.Point(79, 84) Me.txtlkwId.MaxLength = 100 Me.txtlkwId.Name = "txtlkwId" Me.txtlkwId.Size = New System.Drawing.Size(236, 23) @@ -3196,7 +3225,7 @@ Partial Class frmHauptfenster ' Me.cbxNE.AutoSize = True Me.cbxNE.ForeColor = System.Drawing.Color.White - Me.cbxNE.Location = New System.Drawing.Point(553, 86) + Me.cbxNE.Location = New System.Drawing.Point(553, 111) Me.cbxNE.Name = "cbxNE" Me.cbxNE.Size = New System.Drawing.Size(110, 17) Me.cbxNE.TabIndex = 16 @@ -3207,7 +3236,7 @@ Partial Class frmHauptfenster ' Me.cbxFreigabe.AutoSize = True Me.cbxFreigabe.ForeColor = System.Drawing.Color.White - Me.cbxFreigabe.Location = New System.Drawing.Point(462, 86) + Me.cbxFreigabe.Location = New System.Drawing.Point(462, 111) Me.cbxFreigabe.Name = "cbxFreigabe" Me.cbxFreigabe.Size = New System.Drawing.Size(85, 17) Me.cbxFreigabe.TabIndex = 15 @@ -3218,7 +3247,7 @@ Partial Class frmHauptfenster ' Me.cbxAnkunft.AutoSize = True Me.cbxAnkunft.ForeColor = System.Drawing.Color.White - Me.cbxAnkunft.Location = New System.Drawing.Point(393, 86) + Me.cbxAnkunft.Location = New System.Drawing.Point(393, 111) Me.cbxAnkunft.Name = "cbxAnkunft" Me.cbxAnkunft.Size = New System.Drawing.Size(63, 17) Me.cbxAnkunft.TabIndex = 14 @@ -3229,7 +3258,7 @@ Partial Class frmHauptfenster ' Me.cbxVorg.AutoSize = True Me.cbxVorg.ForeColor = System.Drawing.Color.White - Me.cbxVorg.Location = New System.Drawing.Point(294, 86) + Me.cbxVorg.Location = New System.Drawing.Point(294, 111) Me.cbxVorg.Name = "cbxVorg" Me.cbxVorg.Size = New System.Drawing.Size(100, 17) Me.cbxVorg.TabIndex = 13 @@ -3240,7 +3269,7 @@ Partial Class frmHauptfenster ' Me.cbxVorb.AutoSize = True Me.cbxVorb.ForeColor = System.Drawing.Color.White - Me.cbxVorb.Location = New System.Drawing.Point(193, 86) + Me.cbxVorb.Location = New System.Drawing.Point(193, 111) Me.cbxVorb.Name = "cbxVorb" Me.cbxVorb.Size = New System.Drawing.Size(95, 17) Me.cbxVorb.TabIndex = 12 @@ -3251,7 +3280,7 @@ Partial Class frmHauptfenster ' Me.cbxErfasst.AutoSize = True Me.cbxErfasst.ForeColor = System.Drawing.Color.White - Me.cbxErfasst.Location = New System.Drawing.Point(129, 86) + Me.cbxErfasst.Location = New System.Drawing.Point(129, 111) Me.cbxErfasst.Name = "cbxErfasst" Me.cbxErfasst.Size = New System.Drawing.Size(58, 17) Me.cbxErfasst.TabIndex = 11 @@ -3262,7 +3291,7 @@ Partial Class frmHauptfenster ' Me.Label14.AutoSize = True Me.Label14.ForeColor = System.Drawing.Color.White - Me.Label14.Location = New System.Drawing.Point(8, 87) + Me.Label14.Location = New System.Drawing.Point(8, 112) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(40, 13) Me.Label14.TabIndex = 8 @@ -3316,7 +3345,7 @@ Partial Class frmHauptfenster ' Me.lblErwEmpfänger.AutoSize = True Me.lblErwEmpfänger.ForeColor = System.Drawing.Color.White - Me.lblErwEmpfänger.Location = New System.Drawing.Point(8, 40) + Me.lblErwEmpfänger.Location = New System.Drawing.Point(8, 62) Me.lblErwEmpfänger.Name = "lblErwEmpfänger" Me.lblErwEmpfänger.Size = New System.Drawing.Size(61, 13) Me.lblErwEmpfänger.TabIndex = 6 @@ -3325,11 +3354,11 @@ Partial Class frmHauptfenster 'txtEmpfänger ' Me.txtEmpfänger.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtEmpfänger.Location = New System.Drawing.Point(79, 35) + Me.txtEmpfänger.Location = New System.Drawing.Point(79, 57) Me.txtEmpfänger.MaxLength = 100 Me.txtEmpfänger.Name = "txtEmpfänger" Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23) - Me.txtEmpfänger.TabIndex = 5 + Me.txtEmpfänger.TabIndex = 3 ' 'cboFiliale ' @@ -3352,7 +3381,7 @@ Partial Class frmHauptfenster Me.txtAbfertigungsnummer.MaxLength = 8 Me.txtAbfertigungsnummer.Name = "txtAbfertigungsnummer" Me.txtAbfertigungsnummer.Size = New System.Drawing.Size(147, 23) - Me.txtAbfertigungsnummer.TabIndex = 4 + Me.txtAbfertigungsnummer.TabIndex = 5 ' 'lblErwFilialePos ' @@ -3378,7 +3407,7 @@ Partial Class frmHauptfenster ' Me.cbxAlle.AutoSize = True Me.cbxAlle.ForeColor = System.Drawing.Color.White - Me.cbxAlle.Location = New System.Drawing.Point(79, 86) + Me.cbxAlle.Location = New System.Drawing.Point(79, 111) Me.cbxAlle.Name = "cbxAlle" Me.cbxAlle.Size = New System.Drawing.Size(43, 17) Me.cbxAlle.TabIndex = 10 @@ -3619,12 +3648,6 @@ Partial Class frmHauptfenster Me.Panel4.Size = New System.Drawing.Size(170, 25) Me.Panel4.TabIndex = 4 ' - 'APIToolStripMenuItem - ' - Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem" - Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22) - Me.APIToolStripMenuItem.Text = "API" - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4043,4 +4066,6 @@ Partial Class frmHauptfenster Friend WithEvents CarnetTIRALTToolStripMenuItem As ToolStripMenuItem Friend WithEvents DatevBuchungsexportToolStripMenuItem As ToolStripMenuItem Friend WithEvents APIToolStripMenuItem As ToolStripMenuItem + Friend WithEvents lblAbsender As Label + Friend WithEvents txtAbsender As TextBox End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index e0c987f..e3edb3a 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -904,6 +904,7 @@ Public Class frmHauptfenster Dim hSQLSnd = "" hSQLSnd &= " AND ( SELECT COUNT(*) FROM tblSendungen where tblSnd_AvisoId=AvisoId " If txtEmpfänger.Text <> "" Then hSQLSnd &= " AND tblSnd_Empfaenger LIKE '" & txtEmpfänger.Text.Replace("*", "%") & "%' " : srchkrit = True + If txtAbsender.Text <> "" Then hSQLSnd &= " AND tblSnd_Absender LIKE '" & txtAbsender.Text.Replace("*", "%") & "%' " : srchkrit = True If txtAuftraggeber.Text <> "" Then hSQLSnd &= " AND tblSnd_Auftraggeber LIKE '" & txtAuftraggeber.Text.Replace("*", "%") & "%' " : srchkrit = True If txtKdAuftragsnr.Text <> "" Then hSQLSnd &= " AND (tblSnd_KdAuftragsNr LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrAvisierer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrEmpfaenger LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%' OR tblSnd_KdAuftragsNrFrachtfuehrer LIKE '" & txtKdAuftragsnr.Text.Replace("*", "%") & "%') " : srchkrit = True If cboFiliale._value <> "" Then hSQLSnd &= " AND FilialenNr ='" & cboFiliale._value & "'" : srchkrit = True From 6e2166588bd68b688aa5e494c05eeee191e2584b Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 20 Sep 2023 10:54:38 +0200 Subject: [PATCH 4/5] ATEZ Kor --- Aviso/frmATEZ_NCTS.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index ce0b7f4..75bdc52 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -118,6 +118,7 @@ Public Class frmATEZ_NCTS .VERAG_LRN = lblBezugsnummer.Text .LicensePlateContainerNo = txtLKWId.Text .DAKOSY_TemplateCode = cboStammreferenz._value + If .DAKOSY_TemplateCode = "" Then .DAKOSY_TemplateCode = "*OWN" .DAKOSY_Procedure = cboProzedur._value .DAKOSY_IOPartner = txtDyMandant.Text .DAKOSY_Division3 = txtDyNiederlassung.Text @@ -221,7 +222,7 @@ Public Class frmATEZ_NCTS Else - If azetId = -1 Then atezData.fehlerbeschreibung = "Request has been sent, but no header received!" + If azetId = "-1" Then atezData.fehlerbeschreibung = "Request has been sent, but no header received!" atezData.status = "Sent" atezData.atezId = IIf(azetId IsNot Nothing, azetId, "") Return atezData.SAVE() From 3f3b2ea7830c7d663736e2f50a704ca5bb58c9d4 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Sun, 24 Sep 2023 23:03:47 +0200 Subject: [PATCH 5/5] NCTS 5 --- .../frmAvisoWeiterleiten.Designer.vb | 38 +++++++++++++------ .../Benachrichtigung/frmAvisoWeiterleiten.vb | 9 ++++- .../usrCntlBenachrichtigungen.vb | 11 +++++- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/usrcntlAktDetails.vb | 27 ++++++++++--- 5 files changed, 67 insertions(+), 22 deletions(-) diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.Designer.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.Designer.vb index a334c26..37033c6 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.Designer.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.Designer.vb @@ -82,6 +82,7 @@ Partial Class frmAvisoWeiterleiten Me.Button1 = New System.Windows.Forms.Button() Me.Label5 = New System.Windows.Forms.Label() Me.rtbVermerk = New System.Windows.Forms.RichTextBox() + Me.Button2 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() @@ -111,7 +112,7 @@ Partial Class frmAvisoWeiterleiten Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(979, 37) + Me.pnl.Size = New System.Drawing.Size(1112, 37) Me.pnl.TabIndex = 0 ' 'Label3 @@ -119,7 +120,7 @@ Partial Class frmAvisoWeiterleiten Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) - Me.Label3.Location = New System.Drawing.Point(823, 7) + Me.Label3.Location = New System.Drawing.Point(956, 7) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(109, 24) Me.Label3.TabIndex = 8 @@ -129,7 +130,7 @@ Partial Class frmAvisoWeiterleiten ' Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pic.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 - Me.pic.Location = New System.Drawing.Point(935, 3) + Me.pic.Location = New System.Drawing.Point(1068, 3) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(44, 32) Me.pic.TabIndex = 7 @@ -229,10 +230,12 @@ Partial Class frmAvisoWeiterleiten Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = False Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False Me.MyTextBox1._value = "" Me.MyTextBox1._Waehrung = False Me.MyTextBox1._WaehrungZeichen = True @@ -255,7 +258,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(320, 37) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(659, 702) + Me.Panel4.Size = New System.Drawing.Size(792, 702) Me.Panel4.TabIndex = 20 ' 'Panel1 @@ -267,7 +270,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left Me.Panel1.Location = New System.Drawing.Point(200, 57) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(449, 468) + Me.Panel1.Size = New System.Drawing.Size(577, 468) Me.Panel1.TabIndex = 20 ' 'flpFirma @@ -275,7 +278,7 @@ Partial Class frmAvisoWeiterleiten Me.flpFirma.Dock = System.Windows.Forms.DockStyle.Fill Me.flpFirma.Location = New System.Drawing.Point(0, 28) Me.flpFirma.Name = "flpFirma" - Me.flpFirma.Size = New System.Drawing.Size(447, 438) + Me.flpFirma.Size = New System.Drawing.Size(575, 438) Me.flpFirma.TabIndex = 1 ' 'Panel3 @@ -286,7 +289,7 @@ Partial Class frmAvisoWeiterleiten 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(447, 28) + Me.Panel3.Size = New System.Drawing.Size(575, 28) Me.Panel3.TabIndex = 2 ' 'Label1 @@ -588,10 +591,11 @@ Partial Class frmAvisoWeiterleiten Me.MyFlowLayoutPanel1.Controls.Add(Me.btnVERIMEX) Me.MyFlowLayoutPanel1.Controls.Add(Me.btnAMBAR) Me.MyFlowLayoutPanel1.Controls.Add(Me.btnATILLA) + Me.MyFlowLayoutPanel1.Controls.Add(Me.Button2) Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(657, 57) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(790, 57) Me.MyFlowLayoutPanel1.TabIndex = 21 ' 'btnVERAG @@ -664,7 +668,7 @@ Partial Class frmAvisoWeiterleiten ' Me.btnATILLA.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.btnATILLA.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.btnATILLA.Location = New System.Drawing.Point(3, 52) + Me.btnATILLA.Location = New System.Drawing.Point(657, 3) Me.btnATILLA.Name = "btnATILLA" Me.btnATILLA.Size = New System.Drawing.Size(120, 43) Me.btnATILLA.TabIndex = 11 @@ -682,7 +686,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel5.Location = New System.Drawing.Point(0, 525) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(657, 175) + Me.Panel5.Size = New System.Drawing.Size(790, 175) Me.Panel5.TabIndex = 22 ' 'Label6 @@ -758,12 +762,23 @@ Partial Class frmAvisoWeiterleiten Me.rtbVermerk.TabIndex = 0 Me.rtbVermerk.Text = "" ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup + Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.Button2.Location = New System.Drawing.Point(3, 52) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(120, 43) + Me.Button2.TabIndex = 12 + Me.Button2.Text = "WARENORT" + Me.Button2.UseVisualStyleBackColor = True + ' 'frmAvisoWeiterleiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(979, 739) + Me.ClientSize = New System.Drawing.Size(1112, 739) Me.Controls.Add(Me.Panel4) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.pnl) @@ -854,4 +869,5 @@ Partial Class frmAvisoWeiterleiten Friend WithEvents btnVERIMEX As Button Friend WithEvents btnAMBAR As Button Friend WithEvents btnATILLA As Button + Friend WithEvents Button2 As Button End Class diff --git a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb index 7892337..80eacaa 100644 --- a/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb +++ b/Aviso/Benachrichtigung/frmAvisoWeiterleiten.vb @@ -121,6 +121,9 @@ Public Class frmAvisoWeiterleiten Case "B" text = "An '" & bezeichnung & "' gegeben." WeiterleitungTextTV = bezeichnung + Case "W" + text = "An '" & bezeichnung & "' gegeben." + WeiterleitungTextTV = bezeichnung End Select @@ -252,7 +255,7 @@ Public Class frmAvisoWeiterleiten ' initButtons(sender) 'End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click, btnVERIMEX.Click, btnAMBAR.Click, btnATILLA.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click, btnVERIMEX.Click, btnAMBAR.Click, btnATILLA.Click, Button2.Click 'flpAbteilung.Controls.Clear() flpTeams.Controls.Clear() ' flpNiederlassung.Controls.Clear() @@ -316,6 +319,9 @@ Public Class frmAvisoWeiterleiten ElseIf sender Is btnAMBAR Then addBtn(flpFirma, "F", "AMBAR", "AMBAR", True) + ElseIf sender Is Button2 Then + addBtn(flpFirma, "W", "FO_WIHD", "KÖRFEZ 61", True, "VERAG") + End If initButtonsTop(sender) @@ -423,4 +429,5 @@ Public Class frmAvisoWeiterleiten dgvAnmhaenge.ClearSelection() End Sub + End Class \ No newline at end of file diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index de5f84e..4827574 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -34,12 +34,18 @@ Public Class usrCntlBenachrichtigungen Dim whereMA = " AND ( 1<>1 " + 'WARENORT + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + whereMA &= " OR (ab_TO_Art='W' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "') " - If cbxNeukunden.Checked Then + 'NEUKUNDEN + ElseIf 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 + + 'SONST Else If cbxCluster.Checked Then @@ -66,13 +72,14 @@ Public Class usrCntlBenachrichtigungen End If End If + + End If whereMA &= " ) " Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & " ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC" - Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) ' List.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID)) 'If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts... diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 3636290..792748d 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index 6e866de..d64acb8 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -251,7 +251,8 @@ Public Class usrcntlAktDetails If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("WARENORT", "AVISO") Then btnOptionen.Enabled = False btnLkwBeleg.Visible = False - tbcntlVermerke.TabPages.Remove(tbAnhang) + 'tbcntlVermerke.TabPages.Remove(tbAnhang) + Button18.Visible = False btnDipoListeEmail.Visible = False btnLZDruckDIGITAL.Visible = False @@ -768,11 +769,21 @@ Public Class usrcntlAktDetails btnQuckScan.Visible = True End If + Dim AktSndAnhaenge = " AND isnull(anh_SendungsId,0) <=0 " + If dgvSendungen.SelectedRows.Count > 0 Then + AktSndAnhaenge = " AND ( isnull(anh_SendungsId,0) <=0 OR isnull(anh_SendungsId,0)='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value & "' ) " + End If + + Dim WhereWO = " " + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + WhereWO = " AND isnull(anh_SendungsId,0) <> 0 " + End If + Button18.Visible = True - Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge] - WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 - ORDER BY - case + Dim hSQL As String = " Select [anh_id],[anh_Name],[anh_docId],CASE WHEN (anh_SendungsId is null OR anh_SendungsId <=0) AND anh_Art='' THEN '***' ELSE [anh_Art] END as [anh_Art],[anh_Typ], anh_markiert FROM [tblAvisoAnhaenge] + WHERE [anh_AvisoId]='" & AvisoID & "' " & AktSndAnhaenge & " " & WhereWO & " + ORDER BY anh_SendungsId desc, + case when [anh_Art] = 'ATR-EUR1' then 0 when [anh_Art] = 'Rechnung' then 1 when [anh_Art] = 'eFatura' then 1.1 @@ -1814,7 +1825,11 @@ Public Class usrcntlAktDetails Private Sub dgvSendungen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvSendungen.SelectionChanged If sendAktiv Then If dgvSendungen.SelectedRows.Count > 0 Then - If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 + If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then + If tbcntlVermerke.SelectedIndex <> 2 And tbcntlVermerke.SelectedIndex <> 3 Then tbcntlVermerke.SelectedIndex = 2 + Else + If tbcntlVermerke.SelectedIndex <> 2 Then tbcntlVermerke.SelectedIndex = 2 ' Wennnnciht WO, soll immer zu den Sendungsvermerken gesprungen werdne. + End If Else If tbcntlVermerke.SelectedIndex <> 0 Then tbcntlVermerke.SelectedIndex = 0 End If