From 631b988378a1bd0c30c8e5e7c7b42847edd19afe Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Mon, 4 Nov 2024 15:13:17 +0100 Subject: [PATCH] Neuhaus VW Ablauf --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmAddAktenvermerkShort.Designer.vb | 43 ++- Aviso/frmAddAktenvermerkShort.vb | 56 +-- Aviso/frmHauptfenster.Designer.vb | 246 ++++++------ Aviso/frmHauptfenster.resx | 10 +- Aviso/frmHauptfenster.vb | 444 +++++++++++++++------- Aviso/frmSendungsdetailsNEU.resx | 200 +++++----- Aviso/frmSendungsdetailsNEU.vb | 107 ++++-- 8 files changed, 686 insertions(+), 424 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 779dc6c..063aebc 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/frmAddAktenvermerkShort.Designer.vb b/Aviso/frmAddAktenvermerkShort.Designer.vb index 342ea10..404e287 100644 --- a/Aviso/frmAddAktenvermerkShort.Designer.vb +++ b/Aviso/frmAddAktenvermerkShort.Designer.vb @@ -66,6 +66,8 @@ Partial Class frmAddAktenvermerkShort Me.Label16 = New System.Windows.Forms.Label() Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.btnVerwahrung = New System.Windows.Forms.Button() + Me.Label5 = New System.Windows.Forms.Label() Me.pnlAktenVermerk.SuspendLayout() Me.Panel1.SuspendLayout() Me.pnl.SuspendLayout() @@ -76,6 +78,8 @@ Partial Class frmAddAktenvermerkShort ' Me.pnlAktenVermerk.BackColor = System.Drawing.Color.White Me.pnlAktenVermerk.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnlAktenVermerk.Controls.Add(Me.Label5) + Me.pnlAktenVermerk.Controls.Add(Me.btnVerwahrung) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWUmmelden) Me.pnlAktenVermerk.Controls.Add(Me.btnLKWumgemeldet) Me.pnlAktenVermerk.Controls.Add(Me.btnDEZollDIGITAL) @@ -542,12 +546,11 @@ Partial Class frmAddAktenvermerkShort 'btnLKWStandzeitFeierteage ' Me.btnLKWStandzeitFeierteage.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnLKWStandzeitFeierteage.Image = Global.AVISO.My.Resources.Resources.android_clock_s Me.btnLKWStandzeitFeierteage.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnLKWStandzeitFeierteage.Location = New System.Drawing.Point(298, 33) + Me.btnLKWStandzeitFeierteage.Location = New System.Drawing.Point(298, 100) Me.btnLKWStandzeitFeierteage.Margin = New System.Windows.Forms.Padding(0) Me.btnLKWStandzeitFeierteage.Name = "btnLKWStandzeitFeierteage" - Me.btnLKWStandzeitFeierteage.Size = New System.Drawing.Size(89, 83) + Me.btnLKWStandzeitFeierteage.Size = New System.Drawing.Size(89, 36) Me.btnLKWStandzeitFeierteage.TabIndex = 87 Me.btnLKWStandzeitFeierteage.Text = "LKW Standzeit Feiertag(e)" Me.btnLKWStandzeitFeierteage.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -558,12 +561,12 @@ Partial Class frmAddAktenvermerkShort Me.btnLKWStandzeitWE.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnLKWStandzeitWE.Image = CType(resources.GetObject("btnLKWStandzeitWE.Image"), System.Drawing.Image) Me.btnLKWStandzeitWE.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnLKWStandzeitWE.Location = New System.Drawing.Point(205, 33) + Me.btnLKWStandzeitWE.Location = New System.Drawing.Point(298, 33) Me.btnLKWStandzeitWE.Margin = New System.Windows.Forms.Padding(0) Me.btnLKWStandzeitWE.Name = "btnLKWStandzeitWE" Me.btnLKWStandzeitWE.Size = New System.Drawing.Size(89, 83) Me.btnLKWStandzeitWE.TabIndex = 86 - Me.btnLKWStandzeitWE.Text = "LKW Standzeit Wochenende" + Me.btnLKWStandzeitWE.Text = "StZt.Wochenende" Me.btnLKWStandzeitWE.TextAlign = System.Drawing.ContentAlignment.BottomCenter Me.btnLKWStandzeitWE.UseVisualStyleBackColor = True ' @@ -623,7 +626,7 @@ Partial Class frmAddAktenvermerkShort Me.Label16.AutoSize = True Me.Label16.BackColor = System.Drawing.Color.Transparent Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(202, 20) + Me.Label16.Location = New System.Drawing.Point(295, 20) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(60, 13) Me.Label16.TabIndex = 9 @@ -641,6 +644,32 @@ Partial Class frmAddAktenvermerkShort Me.XXXToolStripMenuItem.Size = New System.Drawing.Size(95, 22) Me.XXXToolStripMenuItem.Text = "XXX" ' + 'btnVerwahrung + ' + Me.btnVerwahrung.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnVerwahrung.Image = Global.AVISO.My.Resources.Resources.auftrag3 + Me.btnVerwahrung.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnVerwahrung.Location = New System.Drawing.Point(205, 33) + Me.btnVerwahrung.Margin = New System.Windows.Forms.Padding(0) + Me.btnVerwahrung.Name = "btnVerwahrung" + Me.btnVerwahrung.Padding = New System.Windows.Forms.Padding(0, 8, 0, 0) + Me.btnVerwahrung.Size = New System.Drawing.Size(89, 83) + Me.btnVerwahrung.TabIndex = 110 + Me.btnVerwahrung.Text = "Verwahrung Kontrolle OK" + Me.btnVerwahrung.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnVerwahrung.UseVisualStyleBackColor = True + ' + 'Label5 + ' + Me.Label5.AutoSize = True + Me.Label5.BackColor = System.Drawing.Color.Transparent + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(202, 17) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(78, 13) + Me.Label5.TabIndex = 112 + Me.Label5.Text = "Verwahrung:" + ' 'frmAddAktenvermerkShort ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -705,4 +734,6 @@ Partial Class frmAddAktenvermerkShort Friend WithEvents btnLKWUmmelden As Button Friend WithEvents cntxt As ContextMenuStrip Friend WithEvents XXXToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Label5 As Label + Friend WithEvents btnVerwahrung As Button End Class diff --git a/Aviso/frmAddAktenvermerkShort.vb b/Aviso/frmAddAktenvermerkShort.vb index d283552..2271ea2 100644 --- a/Aviso/frmAddAktenvermerkShort.vb +++ b/Aviso/frmAddAktenvermerkShort.vb @@ -96,6 +96,7 @@ Public Class frmAddAktenvermerkShort btnDEZollDIGITAL.Text = "Zoll DE " & vbNewLine & "fertig" End If btnLKWFertig.Text = If(myAviso.LKW_fertig, "LKW nicht fertig", "LKW fertig") + btnVerwahrung.Text = If(myAviso.VerwahrungStatus = 0, "Verwahrung - kontrolliert", "Verwahrung - NICHT kontrolliert") txtFreigabeInfo.Text = If(myAviso.Freigabe_Info, "") @@ -145,6 +146,7 @@ Public Class frmAddAktenvermerkShort If c Is btnAnkunft Then enabledTmp = True If c Is btnFreigabe Then enabledTmp = True If c Is btnLKWFertig Then enabledTmp = True + If c Is btnVerwahrung Then enabledTmp = True If c Is btnLKWStandzeitWE Then enabledTmp = True If c Is btnLKWStandzeitFeierteage Then enabledTmp = True If c Is btnClose Then enabledTmp = True @@ -160,7 +162,7 @@ Public Class frmAddAktenvermerkShort Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSpaetAvisiert.Click, btnLKWStandzeitWE.Click, btnLKWStandzeitFeierteage.Click, btnZollATEingereicht.Click, btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Click, btnQS.Click, btnErfasst.Click, btnVorbereitet.Click, btnVorgeschrieben.Click, btnAnkunft.Click, - btnFreigabe.Click, btnNichtEingetroffen.Click, btnNichtAvisiert.Click, btnAktUebernehmen.Click, btnLKWFertig.Click, btnSonstiges.Click, btnDispoangefordert.Click, btnDEZollDIGITAL.Click, btnLKWumgemeldet.Click + btnFreigabe.Click, btnNichtEingetroffen.Click, btnNichtAvisiert.Click, btnAktUebernehmen.Click, btnLKWFertig.Click, btnSonstiges.Click, btnDispoangefordert.Click, btnDEZollDIGITAL.Click, btnLKWumgemeldet.Click, btnVerwahrung.Click If sender Is Nothing Then MsgBox("Es wurde kein Vermerk ausgewählt. Der Datensatz kann nicht gespeichert werden.", vbInformation) @@ -249,11 +251,11 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli '-------------------------------------------------------------------------------------------------------------------------------------------------------- 'Sendungen durchlaufen und die Fiskal - Checkliste bei AT Fiskal anzeigen (je SND) Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) - VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN + VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN - If SENDUNG_LIST IsNot Nothing Then + If SENDUNG_LIST IsNot Nothing Then - For Each SND In SENDUNG_LIST + For Each SND In SENDUNG_LIST If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ATDE_FISKAL_CHECKLISTE") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "AVISO") Then Select Case SND.tblSnd_Abfertigungsart_ID Case 28 ' --> DE FISKAL @@ -272,20 +274,20 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli 'VERANLAGUNGSKUNDE If SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblKundenErweitert] where [Veranlagungskunde]=1 and kde_KundenNr IN ('" & SND.tblSnd_AbsenderKdNr & "','" & SND.tblSnd_AuftraggeberKdNr & "')", "FMZOLL") > 0 Then - Dim f As New frmATZollEingereichtSetzenEV(myAviso, SND) - If f.ShowDialog() = DialogResult.OK Then - If f.cbxEmpf.Checked Then + Dim f As New frmATZollEingereichtSetzenEV(myAviso, SND) + If f.ShowDialog() = DialogResult.OK Then + If f.cbxEmpf.Checked Then AvisoStatusFunctions.insertSendungsVermerk(SND.tblSnd_SendungID, myAviso.AvisoID, "Veranlagungs-Checkliste - OK (ZA auf Empf)", 114) Else AvisoStatusFunctions.insertSendungsVermerk(SND.tblSnd_SendungID, myAviso.AvisoID, "Veranlagungs-Checkliste - OK", 113) End If - Else - Exit Sub ' --> YOU'RE OUT! - End If + Else + Exit Sub ' --> YOU'RE OUT! End If - '-------------------------------------------------------------------------------------------------------------------------------------------------------- - Next - End If + End If + '-------------------------------------------------------------------------------------------------------------------------------------------------------- + Next + End If '-------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -304,9 +306,9 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, 0, AvisoID) 'LÄDT alle SENDUNGSDATEN - If SENDUNG_LIST IsNot Nothing Then + If SENDUNG_LIST IsNot Nothing Then - For Each SND In SENDUNG_LIST + For Each SND In SENDUNG_LIST If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("ATDE_FISKAL_CHECKLISTE") Or VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", "AVISO") Then 'Sendungen durchlaufen und die Fiskal - Checkliste bei AT Fiskal anzeigen (je SND) @@ -330,7 +332,7 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli '-------------------------------------------------------------------------------------------------------------------------------------------------------- 'VERANLAGUNGSKUNDE - If sql.getValueTxtBySql("SELECT COUNT(*) FROM [tblKundenErweitert] where [Veranlagungskunde]=1 and kde_KundenNr IN ('" & SND.tblSnd_AbsenderKdNr & "','" & SND.tblSnd_AuftraggeberKdNr & "')", "FMZOLL") > 0 Then + If SQL.getValueTxtBySql("SELECT COUNT(*) FROM [tblKundenErweitert] where [Veranlagungskunde]=1 and kde_KundenNr IN ('" & SND.tblSnd_AbsenderKdNr & "','" & SND.tblSnd_AuftraggeberKdNr & "')", "FMZOLL") > 0 Then Dim f As New frmATZollEingereichtSetzenEV(myAviso, SND) If f.ShowDialog() = DialogResult.OK Then @@ -353,14 +355,14 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli insertVermerk("AT Zoll eingereicht", 19) - 'If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then - ' Try - ' Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(myAviso, "AT") - ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName) - ' Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try - 'End If - End If - ElseIf sender Is btnLKWStandzeitWE Then + 'If vbYes = MsgBox("Fahrer-Anweisung ""zum Zollamt gehen"" ausdrucken?", vbYesNo) Then + ' Try + ' Dim path = SDL.FormularManagerNEU.zumZOLL_AVISO(myAviso, "AT") + ' If path <> "" Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaGS(path, (New System.Drawing.Printing.PrinterSettings).PrinterName) + ' Catch ex As Exception : MsgBox(ex.Message & ex.StackTrace) : End Try + 'End If + End If + ElseIf sender Is btnLKWStandzeitWE Then insertVermerk("LKW Standzeit Wochenende", 21) ElseIf sender Is btnLKWStandzeitFeierteage Then insertVermerk("LKW Standzeit Feiertag(e)", 22) @@ -419,6 +421,11 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If + ElseIf sender Is btnVerwahrung Then + If VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.VerwahrungOK(AvisoID) Then + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If ElseIf sender Is btnSonstiges Then insertVermerk(txtSonstiges.Text, 46) ElseIf sender Is btnDispoangefordert Then @@ -485,4 +492,5 @@ btnZollDEEingereicht.Click, btnSBG.Click, btnNKD.Click, btnWAI.Click, btnSFD.Cli Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnLKWUmmelden.Click cntxt.Show(Cursor.Position) End Sub + End Class diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 28133f3..48b2ee6 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -284,12 +284,12 @@ Partial Class frmHauptfenster Me.lblHinweis = New System.Windows.Forms.Label() Me.Label20 = New System.Windows.Forms.Label() Me.pnlLinksOben = New System.Windows.Forms.Panel() - Me.Button7 = New System.Windows.Forms.Button() Me.Label22 = New System.Windows.Forms.Label() - Me.Button12 = New System.Windows.Forms.Button() + Me.btnE_Aviso = New System.Windows.Forms.Button() Me.btnNeu = New System.Windows.Forms.Button() Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() + Me.Button7 = New System.Windows.Forms.Button() Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() Me.pic = New System.Windows.Forms.PictureBox() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() @@ -329,6 +329,7 @@ Partial Class frmHauptfenster Me.splitMain = New System.Windows.Forms.SplitContainer() Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() + Me.CheckBox1 = New System.Windows.Forms.CheckBox() Me.TabControl1 = New System.Windows.Forms.TabControl() Me.tbSndAlle = New System.Windows.Forms.TabPage() Me.tbSndOffen = New System.Windows.Forms.TabPage() @@ -550,7 +551,7 @@ Partial Class frmHauptfenster Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.mnuFragezeichen, Me.BREXITToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1202, 25) + Me.MenuStrip1.Size = New System.Drawing.Size(1132, 20) Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -560,7 +561,7 @@ Partial Class frmHauptfenster Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AvisoTVToolStripMenuItem, Me.SecretAvisoToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.SpracheWechselnToolStripMenuItem, Me.StandarddruckerWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) Me.mnuProgramm.ForeColor = System.Drawing.Color.Black Me.mnuProgramm.Name = "mnuProgramm" - Me.mnuProgramm.Size = New System.Drawing.Size(78, 21) + Me.mnuProgramm.Size = New System.Drawing.Size(78, 16) Me.mnuProgramm.Text = "Verwaltung" ' 'mnuFirmen @@ -898,7 +899,7 @@ Partial Class frmHauptfenster ' Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.GesamtsicherheitenToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator23, Me.toolOriginalATR, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.ToolStripSeparator11, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.ToolStripSeparator24, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem, Me.FIBUSachkontenToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" - Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21) + Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 16) Me.FunktionenToolStripMenuItem.Text = "Funktionen" ' 'GenerelleGestellungenDurchsuchenToolStripMenuItem @@ -1170,7 +1171,7 @@ Partial Class frmHauptfenster 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}) Me.StatistikToolStripMenuItem.ForeColor = System.Drawing.Color.Black Me.StatistikToolStripMenuItem.Name = "StatistikToolStripMenuItem" - Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 21) + Me.StatistikToolStripMenuItem.Size = New System.Drawing.Size(83, 16) Me.StatistikToolStripMenuItem.Text = "Auswertung" ' 'LKWBerichtToolStripMenuItem @@ -1228,7 +1229,7 @@ Partial Class frmHauptfenster Me.ToolStripFormulare.ImageAlign = System.Drawing.ContentAlignment.BottomRight Me.ToolStripFormulare.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.ToolStripFormulare.Name = "ToolStripFormulare" - Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 21) + Me.ToolStripFormulare.Size = New System.Drawing.Size(73, 16) Me.ToolStripFormulare.Text = "Formulare" ' 'MANAGERToolStripMenuItem @@ -1446,7 +1447,7 @@ Partial Class frmHauptfenster Me.mnuFragezeichen.ForeColor = System.Drawing.Color.Black Me.mnuFragezeichen.ImageTransparentColor = System.Drawing.Color.Brown Me.mnuFragezeichen.Name = "mnuFragezeichen" - Me.mnuFragezeichen.Size = New System.Drawing.Size(111, 21) + Me.mnuFragezeichen.Size = New System.Drawing.Size(111, 16) Me.mnuFragezeichen.Text = "Info/Handbücher" ' 'VerfahrenshandbücherToolStripMenuItem @@ -1538,7 +1539,7 @@ Partial Class frmHauptfenster ' Me.BREXITToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GVMSToolStripMenuItem, Me.GVMSUKIMportToolStripMenuItem, Me.GVMSBeschreibungToolStripMenuItem, Me.ToolStripSeparator14, Me.TicketIBFInlandBorderFacilitiesToolStripMenuItem, Me.TicketIBFBeschreibungToolStripMenuItem, Me.IBFStatusToolStripMenuItem, Me.ToolStripSeparator15, Me.FREnveloppeSmartBorderToolStripMenuItem, Me.ToolStripSeparator16, Me.PBNIrelandFähreToolStripMenuItem, Me.ToolStripSeparator20, Me.WARENORTToolStripMenuItem, Me.ToolStripMenuItem14, Me.ToolStripSeparator18, Me.EORIUKGeneriertenToolStripMenuItem, Me.KAPKentAccessPermitToolStripMenuItem}) Me.BREXITToolStripMenuItem.Name = "BREXITToolStripMenuItem" - Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 21) + Me.BREXITToolStripMenuItem.Size = New System.Drawing.Size(55, 16) Me.BREXITToolStripMenuItem.Text = "BREXIT" Me.BREXITToolStripMenuItem.Visible = False ' @@ -1745,8 +1746,9 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.Controls.Add(Me.lblMitarbeiter) Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) + Me.pnlDetailsRechts.MinimumSize = New System.Drawing.Size(200, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(266, 598) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(350, 390) Me.pnlDetailsRechts.TabIndex = 0 ' 'lblMitarbeiter @@ -1756,7 +1758,7 @@ Partial Class frmHauptfenster Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -63) + Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -271) Me.lblMitarbeiter.Name = "lblMitarbeiter" Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) Me.lblMitarbeiter.TabIndex = 1 @@ -1806,9 +1808,9 @@ Partial Class frmHauptfenster Me.Top.Controls.Add(Me.btnKunden) Me.Top.Controls.Add(Me.btnSpedBuch) Me.Top.Dock = System.Windows.Forms.DockStyle.Top - Me.Top.Location = New System.Drawing.Point(0, 25) + Me.Top.Location = New System.Drawing.Point(0, 20) Me.Top.Name = "Top" - Me.Top.Size = New System.Drawing.Size(1372, 52) + Me.Top.Size = New System.Drawing.Size(1302, 63) Me.Top.TabIndex = 6 ' 'Button1 @@ -1827,7 +1829,7 @@ Partial Class frmHauptfenster Me.lblUsrname.BackColor = System.Drawing.Color.White Me.lblUsrname.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblUsrname.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblUsrname.Location = New System.Drawing.Point(1252, 34) + Me.lblUsrname.Location = New System.Drawing.Point(1182, 34) Me.lblUsrname.Name = "lblUsrname" Me.lblUsrname.Size = New System.Drawing.Size(75, 13) Me.lblUsrname.TabIndex = 86 @@ -1839,7 +1841,7 @@ Partial Class frmHauptfenster Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblFimaAviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblFimaAviso.ForeColor = System.Drawing.Color.Black - Me.lblFimaAviso.Location = New System.Drawing.Point(1308, 20) + Me.lblFimaAviso.Location = New System.Drawing.Point(1238, 20) Me.lblFimaAviso.Name = "lblFimaAviso" Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) Me.lblFimaAviso.TabIndex = 11 @@ -1864,7 +1866,7 @@ Partial Class frmHauptfenster Me.btnMAVerzeichnis.ForeColor = System.Drawing.Color.Black Me.btnMAVerzeichnis.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s Me.btnMAVerzeichnis.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnMAVerzeichnis.Location = New System.Drawing.Point(758, 6) + Me.btnMAVerzeichnis.Location = New System.Drawing.Point(688, 6) Me.btnMAVerzeichnis.Name = "btnMAVerzeichnis" Me.btnMAVerzeichnis.Size = New System.Drawing.Size(107, 39) Me.btnMAVerzeichnis.TabIndex = 13 @@ -1884,7 +1886,7 @@ Partial Class frmHauptfenster Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1109, -6) + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1039, -6) Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) Me.btnMitarbeiterKonto.TabIndex = 86 @@ -1900,7 +1902,7 @@ Partial Class frmHauptfenster Me.btnKontakt.ForeColor = System.Drawing.Color.Black Me.btnKontakt.Image = Global.AVISO.My.Resources.Resources.Telefonliste_small Me.btnKontakt.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnKontakt.Location = New System.Drawing.Point(869, 6) + Me.btnKontakt.Location = New System.Drawing.Point(799, 6) Me.btnKontakt.Name = "btnKontakt" Me.btnKontakt.Size = New System.Drawing.Size(119, 39) Me.btnKontakt.TabIndex = 12 @@ -1918,7 +1920,7 @@ Partial Class frmHauptfenster Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button2.ForeColor = System.Drawing.Color.White - Me.Button2.Location = New System.Drawing.Point(1250, 3) + Me.Button2.Location = New System.Drawing.Point(1180, 3) Me.Button2.Name = "Button2" Me.Button2.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.Button2.Size = New System.Drawing.Size(45, 20) @@ -1949,7 +1951,7 @@ Partial Class frmHauptfenster Me.lblGrenzstelle.BackColor = System.Drawing.Color.White Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblGrenzstelle.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblGrenzstelle.Location = New System.Drawing.Point(1311, 34) + Me.lblGrenzstelle.Location = New System.Drawing.Point(1241, 34) Me.lblGrenzstelle.Name = "lblGrenzstelle" Me.lblGrenzstelle.Size = New System.Drawing.Size(60, 13) Me.lblGrenzstelle.TabIndex = 0 @@ -1961,7 +1963,7 @@ Partial Class frmHauptfenster Me.lblVersion.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblVersion.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblVersion.ForeColor = System.Drawing.Color.Black - Me.lblVersion.Location = New System.Drawing.Point(1303, 6) + Me.lblVersion.Location = New System.Drawing.Point(1233, 6) Me.lblVersion.Name = "lblVersion" Me.lblVersion.Size = New System.Drawing.Size(68, 13) Me.lblVersion.TabIndex = 6 @@ -1993,7 +1995,7 @@ Partial Class frmHauptfenster Me.btnDienstplan.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnDienstplan.ForeColor = System.Drawing.Color.Black Me.btnDienstplan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnDienstplan.Location = New System.Drawing.Point(991, 6) + Me.btnDienstplan.Location = New System.Drawing.Point(921, 6) Me.btnDienstplan.Margin = New System.Windows.Forms.Padding(0) Me.btnDienstplan.Name = "btnDienstplan" Me.btnDienstplan.Size = New System.Drawing.Size(87, 39) @@ -2308,7 +2310,7 @@ Partial Class frmHauptfenster 'SplitContainer2.Panel2 ' Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) - Me.SplitContainer2.Size = New System.Drawing.Size(720, 300) + Me.SplitContainer2.Size = New System.Drawing.Size(396, 300) Me.SplitContainer2.SplitterDistance = 164 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 @@ -2408,39 +2410,22 @@ Partial Class frmHauptfenster ' 'pnlLinksOben ' - Me.pnlLinksOben.Controls.Add(Me.Button7) Me.pnlLinksOben.Controls.Add(Me.Label22) - Me.pnlLinksOben.Controls.Add(Me.Button12) + Me.pnlLinksOben.Controls.Add(Me.btnE_Aviso) Me.pnlLinksOben.Controls.Add(Me.btnNeu) + Me.pnlLinksOben.Controls.Add(Me.Button7) 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(164, 91) Me.pnlLinksOben.TabIndex = 1 ' - 'Button7 - ' - Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) - Me.Button7.ForeColor = System.Drawing.Color.Black - Me.Button7.Image = CType(resources.GetObject("Button7.Image"), System.Drawing.Image) - Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button7.Location = New System.Drawing.Point(5, 39) - Me.Button7.MaximumSize = New System.Drawing.Size(121, 35) - Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(121, 35) - Me.Button7.TabIndex = 11 - Me.Button7.Text = "Sendung" - Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button7.UseVisualStyleBackColor = True - Me.Button7.Visible = False - ' 'Label22 ' Me.Label22.BackColor = System.Drawing.Color.Red Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label22.ForeColor = System.Drawing.Color.White - Me.Label22.Location = New System.Drawing.Point(92, 89) + Me.Label22.Location = New System.Drawing.Point(92, 48) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(28, 19) Me.Label22.TabIndex = 10 @@ -2448,21 +2433,21 @@ Partial Class frmHauptfenster Me.Label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.Label22.Visible = False ' - 'Button12 + 'btnE_Aviso ' - Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button12.ForeColor = System.Drawing.Color.Black - Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button12.Location = New System.Drawing.Point(5, 80) - Me.Button12.MaximumSize = New System.Drawing.Size(121, 34) - Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(121, 34) - Me.Button12.TabIndex = 1 - Me.Button12.Text = "eAVISO" - Me.Button12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button12.UseVisualStyleBackColor = True - Me.Button12.Visible = False + Me.btnE_Aviso.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnE_Aviso.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnE_Aviso.ForeColor = System.Drawing.Color.Black + Me.btnE_Aviso.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnE_Aviso.Location = New System.Drawing.Point(5, 39) + Me.btnE_Aviso.MaximumSize = New System.Drawing.Size(121, 34) + Me.btnE_Aviso.Name = "btnE_Aviso" + Me.btnE_Aviso.Size = New System.Drawing.Size(121, 34) + Me.btnE_Aviso.TabIndex = 1 + Me.btnE_Aviso.Text = "eAVISO" + Me.btnE_Aviso.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnE_Aviso.UseVisualStyleBackColor = True + Me.btnE_Aviso.Visible = False ' 'btnNeu ' @@ -2494,6 +2479,23 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem17.Size = New System.Drawing.Size(110, 22) Me.ToolStripMenuItem17.Text = "ATILLA" ' + 'Button7 + ' + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.Button7.ForeColor = System.Drawing.Color.Black + Me.Button7.Image = CType(resources.GetObject("Button7.Image"), System.Drawing.Image) + Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button7.Location = New System.Drawing.Point(70, 39) + Me.Button7.MaximumSize = New System.Drawing.Size(121, 35) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(121, 35) + Me.Button7.TabIndex = 11 + Me.Button7.Text = "Sendung" + Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button7.UseVisualStyleBackColor = True + Me.Button7.Visible = False + ' 'picAVISOMessenger ' Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -2531,8 +2533,8 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(555, 300) - Me.SplitContainer3.SplitterDistance = 134 + Me.SplitContainer3.Size = New System.Drawing.Size(231, 300) + Me.SplitContainer3.SplitterDistance = 54 Me.SplitContainer3.TabIndex = 3 ' 'UsrCntlBenachrichtigungen1 @@ -2541,7 +2543,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(134, 300) + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(54, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' 'pnl @@ -2552,7 +2554,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(417, 300) + Me.pnl.Size = New System.Drawing.Size(173, 300) Me.pnl.TabIndex = 0 ' 'Button10 @@ -2610,7 +2612,7 @@ Partial Class frmHauptfenster Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(417, 279) + Me.gridMyAviso.Size = New System.Drawing.Size(173, 279) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 @@ -2630,7 +2632,7 @@ 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(417, 21) + Me.Panel6.Size = New System.Drawing.Size(173, 21) Me.Panel6.TabIndex = 1 ' 'cbx_My_Brexit @@ -2638,7 +2640,7 @@ Partial Class frmHauptfenster Me.cbx_My_Brexit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_Brexit.AutoSize = True Me.cbx_My_Brexit.ForeColor = System.Drawing.Color.White - Me.cbx_My_Brexit.Location = New System.Drawing.Point(-162, 3) + Me.cbx_My_Brexit.Location = New System.Drawing.Point(-406, 3) Me.cbx_My_Brexit.Name = "cbx_My_Brexit" Me.cbx_My_Brexit.Size = New System.Drawing.Size(65, 17) Me.cbx_My_Brexit.TabIndex = 28 @@ -2650,7 +2652,7 @@ Partial Class frmHauptfenster ' 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(326, -1) + Me.btnColor.Location = New System.Drawing.Point(82, -1) Me.btnColor.Name = "btnColor" Me.btnColor.Size = New System.Drawing.Size(36, 23) Me.btnColor.TabIndex = 27 @@ -2680,7 +2682,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(42, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(-202, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 @@ -2690,7 +2692,7 @@ Partial Class frmHauptfenster Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblMySnd_Grenzstelle.AutoSize = True Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White - Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-26, 4) + Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-270, 4) Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle" Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(62, 13) Me.lblMySnd_Grenzstelle.TabIndex = 25 @@ -2701,7 +2703,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(-82, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(-326, 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 @@ -2715,7 +2717,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(374, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(130, 3) Me.cboMy_QS.Name = "cboMy_QS" Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 @@ -2729,7 +2731,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(393, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(149, 3) Me.cboMy_VB.Name = "cboMy_VB" Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 @@ -2747,7 +2749,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(161, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(-83, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 @@ -2757,7 +2759,7 @@ Partial Class frmHauptfenster Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblMySND_Anzeige.AutoSize = True Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White - Me.lblMySND_Anzeige.Location = New System.Drawing.Point(112, 3) + Me.lblMySND_Anzeige.Location = New System.Drawing.Point(-132, 3) Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige" Me.lblMySND_Anzeige.Size = New System.Drawing.Size(48, 13) Me.lblMySND_Anzeige.TabIndex = 20 @@ -2767,7 +2769,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(690, 6) + Me.lblAkte.Location = New System.Drawing.Point(446, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -2802,7 +2804,7 @@ Partial Class frmHauptfenster Me.tabVorgeschrieben.Location = New System.Drawing.Point(4, 34) Me.tabVorgeschrieben.Name = "tabVorgeschrieben" Me.tabVorgeschrieben.Padding = New System.Windows.Forms.Padding(3) - Me.tabVorgeschrieben.Size = New System.Drawing.Size(385, 0) + Me.tabVorgeschrieben.Size = New System.Drawing.Size(121, 0) Me.tabVorgeschrieben.TabIndex = 3 Me.tabVorgeschrieben.Text = "3.Vorgeschrieben" ' @@ -2813,7 +2815,7 @@ Partial Class frmHauptfenster Me.tabFreigegeben.Location = New System.Drawing.Point(4, 34) Me.tabFreigegeben.Name = "tabFreigegeben" Me.tabFreigegeben.Padding = New System.Windows.Forms.Padding(3) - Me.tabFreigegeben.Size = New System.Drawing.Size(385, 0) + Me.tabFreigegeben.Size = New System.Drawing.Size(121, 0) Me.tabFreigegeben.TabIndex = 5 Me.tabFreigegeben.Text = "5. Freigegeben" ' @@ -2824,7 +2826,7 @@ Partial Class frmHauptfenster Me.tabNichtEingetroffen.Location = New System.Drawing.Point(4, 34) Me.tabNichtEingetroffen.Name = "tabNichtEingetroffen" Me.tabNichtEingetroffen.Padding = New System.Windows.Forms.Padding(3) - Me.tabNichtEingetroffen.Size = New System.Drawing.Size(385, 0) + Me.tabNichtEingetroffen.Size = New System.Drawing.Size(121, 0) Me.tabNichtEingetroffen.TabIndex = 6 Me.tabNichtEingetroffen.Text = "Nicht eingetroffen" ' @@ -2835,7 +2837,7 @@ Partial Class frmHauptfenster Me.tabAnkunft.Location = New System.Drawing.Point(4, 34) Me.tabAnkunft.Name = "tabAnkunft" Me.tabAnkunft.Padding = New System.Windows.Forms.Padding(3) - Me.tabAnkunft.Size = New System.Drawing.Size(385, 0) + Me.tabAnkunft.Size = New System.Drawing.Size(121, 0) Me.tabAnkunft.TabIndex = 4 Me.tabAnkunft.Text = "4. Ankunft" ' @@ -2846,7 +2848,7 @@ Partial Class frmHauptfenster Me.tabVorbereitet.Location = New System.Drawing.Point(4, 34) Me.tabVorbereitet.Name = "tabVorbereitet" Me.tabVorbereitet.Padding = New System.Windows.Forms.Padding(3) - Me.tabVorbereitet.Size = New System.Drawing.Size(385, 0) + Me.tabVorbereitet.Size = New System.Drawing.Size(121, 0) Me.tabVorbereitet.TabIndex = 2 Me.tabVorbereitet.Text = "2.Vorbereitet QS" ' @@ -2855,7 +2857,7 @@ Partial Class frmHauptfenster Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top Me.pnlAktOption.Location = New System.Drawing.Point(0, 0) Me.pnlAktOption.Name = "pnlAktOption" - Me.pnlAktOption.Size = New System.Drawing.Size(720, 5) + Me.pnlAktOption.Size = New System.Drawing.Size(396, 5) Me.pnlAktOption.TabIndex = 1 ' 'Button8 @@ -2865,7 +2867,7 @@ Partial Class frmHauptfenster Me.Button8.ForeColor = System.Drawing.Color.Black Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image) Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.Location = New System.Drawing.Point(286, 214) + Me.Button8.Location = New System.Drawing.Point(-38, 214) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(89, 34) Me.Button8.TabIndex = 3 @@ -2882,7 +2884,7 @@ Partial Class frmHauptfenster Me.btnFertig.ForeColor = System.Drawing.Color.Black Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image) Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFertig.Location = New System.Drawing.Point(390, 214) + Me.btnFertig.Location = New System.Drawing.Point(66, 214) Me.btnFertig.Name = "btnFertig" Me.btnFertig.Size = New System.Drawing.Size(102, 34) Me.btnFertig.TabIndex = 0 @@ -2899,7 +2901,7 @@ Partial Class frmHauptfenster Me.tabAlle.Location = New System.Drawing.Point(4, 34) Me.tabAlle.Name = "tabAlle" Me.tabAlle.Padding = New System.Windows.Forms.Padding(3) - Me.tabAlle.Size = New System.Drawing.Size(385, 0) + Me.tabAlle.Size = New System.Drawing.Size(121, 0) Me.tabAlle.TabIndex = 0 Me.tabAlle.Text = "Alle LKW" ' @@ -2910,7 +2912,7 @@ Partial Class frmHauptfenster Me.tabErfasst.Location = New System.Drawing.Point(4, 34) Me.tabErfasst.Name = "tabErfasst" Me.tabErfasst.Padding = New System.Windows.Forms.Padding(3) - Me.tabErfasst.Size = New System.Drawing.Size(385, 0) + Me.tabErfasst.Size = New System.Drawing.Size(121, 0) Me.tabErfasst.TabIndex = 1 Me.tabErfasst.Text = "1. Erfasst" ' @@ -2933,14 +2935,14 @@ Partial Class frmHauptfenster Me.tbcntrAviso.Name = "tbcntrAviso" Me.tbcntrAviso.Padding = New System.Drawing.Point(12, 3) Me.tbcntrAviso.SelectedIndex = 0 - Me.tbcntrAviso.Size = New System.Drawing.Size(393, 32) + Me.tbcntrAviso.Size = New System.Drawing.Size(129, 37) Me.tbcntrAviso.TabIndex = 10 ' 'tabVERIMEX ' Me.tabVERIMEX.Location = New System.Drawing.Point(4, 34) Me.tabVERIMEX.Name = "tabVERIMEX" - Me.tabVERIMEX.Size = New System.Drawing.Size(385, 0) + Me.tabVERIMEX.Size = New System.Drawing.Size(121, 0) Me.tabVERIMEX.TabIndex = 7 Me.tabVERIMEX.Text = "VERIMEX" Me.tabVERIMEX.UseVisualStyleBackColor = True @@ -2949,7 +2951,7 @@ Partial Class frmHauptfenster ' Me.tabINDONESIEN.Location = New System.Drawing.Point(4, 34) Me.tabINDONESIEN.Name = "tabINDONESIEN" - Me.tabINDONESIEN.Size = New System.Drawing.Size(385, 0) + Me.tabINDONESIEN.Size = New System.Drawing.Size(121, 0) Me.tabINDONESIEN.TabIndex = 8 Me.tabINDONESIEN.Text = "INDONESIEN" Me.tabINDONESIEN.UseVisualStyleBackColor = True @@ -2959,20 +2961,21 @@ Partial Class frmHauptfenster Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.IsSplitterFixed = True - Me.SplitContainer1.Location = New System.Drawing.Point(379, 77) + Me.SplitContainer1.Location = New System.Drawing.Point(252, 83) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 ' Me.SplitContainer1.Panel1.Controls.Add(Me.pnlDetailsLinks) - Me.SplitContainer1.Panel1MinSize = 724 + Me.SplitContainer1.Panel1MinSize = 0 ' 'SplitContainer1.Panel2 ' Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) - Me.SplitContainer1.Size = New System.Drawing.Size(993, 600) - Me.SplitContainer1.SplitterDistance = 724 + Me.SplitContainer1.Panel2MinSize = 200 + Me.SplitContainer1.Size = New System.Drawing.Size(1050, 611) + Me.SplitContainer1.SplitterDistance = 500 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 ' @@ -2985,7 +2988,7 @@ Partial Class frmHauptfenster Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564) Me.pnlDetailsLinks.Name = "pnlDetailsLinks" - Me.pnlDetailsLinks.Size = New System.Drawing.Size(722, 598) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(398, 564) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -3009,8 +3012,8 @@ Partial Class frmHauptfenster ' Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2) Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) - Me.splitMain.Size = New System.Drawing.Size(720, 596) - Me.splitMain.SplitterDistance = 287 + Me.splitMain.Size = New System.Drawing.Size(396, 562) + Me.splitMain.SplitterDistance = 253 Me.splitMain.TabIndex = 0 ' 'gridAviso @@ -3063,13 +3066,14 @@ 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(720, 39) + Me.gridAviso.Size = New System.Drawing.Size(396, 5) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel1.Controls.Add(Me.CheckBox1) Me.Panel1.Controls.Add(Me.TabControl1) Me.Panel1.Controls.Add(Me.txtBestimmungszollstelle) Me.Panel1.Controls.Add(Me.Label10) @@ -3098,9 +3102,23 @@ 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(720, 248) + Me.Panel1.Size = New System.Drawing.Size(396, 248) Me.Panel1.TabIndex = 2 ' + 'CheckBox1 + ' + Me.CheckBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.CheckBox1.AutoSize = True + Me.CheckBox1.Checked = True + Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked + Me.CheckBox1.ForeColor = System.Drawing.Color.White + Me.CheckBox1.Location = New System.Drawing.Point(-310, 55) + Me.CheckBox1.Name = "CheckBox1" + Me.CheckBox1.Size = New System.Drawing.Size(50, 17) + Me.CheckBox1.TabIndex = 28 + Me.CheckBox1.Text = "LKW" + Me.CheckBox1.UseVisualStyleBackColor = True + ' 'TabControl1 ' Me.TabControl1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -3114,7 +3132,7 @@ Partial Class frmHauptfenster Me.TabControl1.Name = "TabControl1" Me.TabControl1.Padding = New System.Drawing.Point(12, 3) Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(393, 32) + Me.TabControl1.Size = New System.Drawing.Size(129, 11) Me.TabControl1.TabIndex = 27 Me.TabControl1.Visible = False ' @@ -3126,7 +3144,7 @@ Partial Class frmHauptfenster Me.tbSndAlle.Location = New System.Drawing.Point(4, 34) Me.tbSndAlle.Name = "tbSndAlle" Me.tbSndAlle.Padding = New System.Windows.Forms.Padding(3) - Me.tbSndAlle.Size = New System.Drawing.Size(385, 0) + Me.tbSndAlle.Size = New System.Drawing.Size(121, 0) Me.tbSndAlle.TabIndex = 0 Me.tbSndAlle.Text = "Alle Sendungen" ' @@ -3137,7 +3155,7 @@ Partial Class frmHauptfenster Me.tbSndOffen.Location = New System.Drawing.Point(4, 34) Me.tbSndOffen.Name = "tbSndOffen" Me.tbSndOffen.Padding = New System.Windows.Forms.Padding(3) - Me.tbSndOffen.Size = New System.Drawing.Size(385, 0) + Me.tbSndOffen.Size = New System.Drawing.Size(121, 0) Me.tbSndOffen.TabIndex = 1 Me.tbSndOffen.Text = "Offen" ' @@ -3145,7 +3163,7 @@ Partial Class frmHauptfenster ' Me.tbSndFreigegeben.Location = New System.Drawing.Point(4, 34) Me.tbSndFreigegeben.Name = "tbSndFreigegeben" - Me.tbSndFreigegeben.Size = New System.Drawing.Size(385, 0) + Me.tbSndFreigegeben.Size = New System.Drawing.Size(121, 0) Me.tbSndFreigegeben.TabIndex = 2 Me.tbSndFreigegeben.Text = "Freigegeben" Me.tbSndFreigegeben.UseVisualStyleBackColor = True @@ -3279,7 +3297,7 @@ Partial Class frmHauptfenster Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblEintraege.BackColor = System.Drawing.Color.Transparent Me.lblEintraege.ForeColor = System.Drawing.Color.White - Me.lblEintraege.Location = New System.Drawing.Point(490, 56) + Me.lblEintraege.Location = New System.Drawing.Point(166, 56) Me.lblEintraege.Name = "lblEintraege" Me.lblEintraege.Size = New System.Drawing.Size(169, 15) Me.lblEintraege.TabIndex = 14 @@ -3327,7 +3345,7 @@ Partial Class frmHauptfenster Me.pnlTime.Controls.Add(Me.Label5) Me.pnlTime.Location = New System.Drawing.Point(446, 0) Me.pnlTime.Name = "pnlTime" - Me.pnlTime.Size = New System.Drawing.Size(342, 57) + Me.pnlTime.Size = New System.Drawing.Size(74, 57) Me.pnlTime.TabIndex = 12 ' 'MyComboBox1 @@ -3374,7 +3392,7 @@ 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, 135) + Me.pnlSearch.Size = New System.Drawing.Size(823, 135) Me.pnlSearch.TabIndex = 16 Me.pnlSearch.Visible = False ' @@ -3840,7 +3858,7 @@ Partial Class frmHauptfenster 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(1372, 25) + Me.Panel3.Size = New System.Drawing.Size(1302, 20) Me.Panel3.TabIndex = 87 ' 'Panel4 @@ -3849,13 +3867,14 @@ Partial Class frmHauptfenster Me.Panel4.Controls.Add(Me.btnClose) Me.Panel4.Controls.Add(Me.btnMinimieren) Me.Panel4.Dock = System.Windows.Forms.DockStyle.Right - Me.Panel4.Location = New System.Drawing.Point(1202, 0) + Me.Panel4.Location = New System.Drawing.Point(1132, 0) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(170, 25) + Me.Panel4.Size = New System.Drawing.Size(170, 20) Me.Panel4.TabIndex = 4 ' 'cntVerag ' + Me.cntVerag.ImageScalingSize = New System.Drawing.Size(20, 20) Me.cntVerag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZertifikateToolStripMenuItem, Me.HomepageToolStripMenuItem}) Me.cntVerag.Name = "cntVerag" Me.cntVerag.Size = New System.Drawing.Size(134, 48) @@ -3889,9 +3908,9 @@ Partial Class frmHauptfenster Me.pnlLeft.Controls.Add(Me.Panel5) Me.pnlLeft.Controls.Add(Me.Panel7) Me.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left - Me.pnlLeft.Location = New System.Drawing.Point(0, 77) + Me.pnlLeft.Location = New System.Drawing.Point(0, 83) Me.pnlLeft.Name = "pnlLeft" - Me.pnlLeft.Size = New System.Drawing.Size(379, 600) + Me.pnlLeft.Size = New System.Drawing.Size(252, 611) Me.pnlLeft.TabIndex = 88 Me.pnlLeft.Visible = False ' @@ -3901,15 +3920,15 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51) Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2" - Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(379, 232) + Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(252, 243) Me.UsrCntlBenachrichtigungen2.TabIndex = 1 ' 'Panel5 ' Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel5.Location = New System.Drawing.Point(0, 283) + Me.Panel5.Location = New System.Drawing.Point(0, 294) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(379, 317) + Me.Panel5.Size = New System.Drawing.Size(252, 317) Me.Panel5.TabIndex = 3 ' 'Panel7 @@ -3918,14 +3937,14 @@ Partial Class frmHauptfenster Me.Panel7.Dock = System.Windows.Forms.DockStyle.Top Me.Panel7.Location = New System.Drawing.Point(0, 0) Me.Panel7.Name = "Panel7" - Me.Panel7.Size = New System.Drawing.Size(379, 51) + Me.Panel7.Size = New System.Drawing.Size(252, 51) Me.Panel7.TabIndex = 4 ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1372, 677) + Me.ClientSize = New System.Drawing.Size(1302, 694) Me.Controls.Add(Me.pnlOptionen) Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.UsrCntlTestsystem1) @@ -4245,7 +4264,7 @@ Partial Class frmHauptfenster Friend WithEvents ToolStripMenuItem6 As ToolStripMenuItem Friend WithEvents btnMAVerzeichnis As Button Friend WithEvents Label22 As Label - Friend WithEvents Button12 As Button + Friend WithEvents btnE_Aviso As Button Friend WithEvents FRONTOFFICEToolStripMenuItem As ToolStripMenuItem Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem Friend WithEvents StandortWechselnToolStripMenuItem As ToolStripMenuItem @@ -4373,4 +4392,5 @@ Partial Class frmHauptfenster Friend WithEvents tbSndAlle As TabPage Friend WithEvents tbSndOffen As TabPage Friend WithEvents tbSndFreigegeben As TabPage + Friend WithEvents CheckBox1 As CheckBox End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 1bf734c..3a2b34c 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -186,7 +186,10 @@ gg== - + + 1158, 17 + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABdSURBVEhL7c0xDsAgEANB/v+AfNcUyRWWVhEF0JyL @@ -194,10 +197,7 @@ HI0JXRTSkcElwuUAAAAASUVORK5CYII= - - 1158, 17 - - + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABdSURBVEhL7c0xDsAgEANB/v+AfNcUyRWWVhEF0JyL diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 151506d..f2b5f06 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -375,7 +375,7 @@ Public Class frmHauptfenster End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then - Button12.Visible = True + btnE_Aviso.Visible = True Label22.Visible = True initEAviso() End If @@ -659,7 +659,7 @@ Public Class frmHauptfenster Dim bfont = New Font(gridAviso.Font.FontFamily, gridAviso.Font.Size, FontStyle.Bold) With gridAviso - .Columns("AvisoID").Visible = False 'AvisoID nicht anzeigen + ' .Columns("AvisoID").Visible = False 'AvisoID nicht anzeigen If Fullscreen Then .Columns("Datum").Visible = True 'Mitarb. nicht anzeigen @@ -682,6 +682,9 @@ Public Class frmHauptfenster .Columns("Status").Width = 25 .Columns("Status").HeaderText = "St." + .Columns("AvisoID").Width = 60 + .Columns("AvisoID").HeaderText = "LKW-Id" + .Columns("LetzterMitarbeiter").Width = 135 .Columns("LetzterMitarbeiter").HeaderText = "akt. Mitarb" @@ -763,6 +766,17 @@ Public Class frmHauptfenster .Columns("LKW_fertig").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter .Columns("LKW_fertig").DefaultCellStyle.Font = bfont + If cboGrenzstelle._value = "NEU" Then + .Columns("VerwahrungStatus").Width = 55 + .Columns("VerwahrungStatus").HeaderText = "Kontrolle" + .Columns("VerwahrungStatus").DefaultCellStyle.ForeColor = Color.White + .Columns("VerwahrungStatus").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("VerwahrungStatus").DefaultCellStyle.Font = bfont + .Columns("VerwahrungStatus").Visible = True + Else + .Columns("VerwahrungStatus").Visible = False + End If + .Columns("Info").Visible = False .Columns("Info").MinimumWidth = 200 .Columns("Info").HeaderText = "Info (Einträge bis zum Status ERFASST)" @@ -813,6 +827,13 @@ Public Class frmHauptfenster 'Else 'r.Cells("LKW_fertig").Style.BackColor = Color.White End If + If r.Cells("VerwahrungStatus").Value = "OK" Then + r.Cells("VerwahrungStatus").Style.ForeColor = Color.White + r.Cells("VerwahrungStatus").Style.BackColor = Color.Green + 'Else + 'r.Cells("LKW_fertig").Style.BackColor = Color.White + End If + Next End With @@ -889,127 +910,222 @@ Public Class frmHauptfenster Dim datumseinschr = "" Dim top = "TOP 1000 " - 'Bei ANKUNFT nicht nach Datum einschränken - If tbcntrAviso.SelectedTab Is tabAnkunft Or tbcntrAviso.SelectedTab Is tabErfasst Or tbcntrAviso.SelectedTab Is tabVorbereitet Or tbcntrAviso.SelectedTab Is tabVorgeschrieben Then - pnlTime.Visible = False - Else - pnlTime.Visible = True - Select Case MyComboBox1._value - Case UStatus_none - top = " TOP 1000 " - Case UStatus_AVEingang : datumseinschr &= " AND AvisoEingang >= " & SQLDatum(dtpVon.Value) & " AND AvisoEingang < " & SQLDatum(dtpBis.Value.AddDays(1)) - Case Status_Erfasst : datumseinschr &= " AND Datum >= " & SQLDatum(dtpVon.Value) & " AND Datum < " & SQLDatum(dtpBis.Value.AddDays(1)) - Case Status_Vorgeschrieben : datumseinschr &= " AND Vorgeschrieben >= " & SQLDatum(dtpVon.Value) & " AND Vorgeschrieben < " & SQLDatum(dtpBis.Value.AddDays(1)) - Case Status_Vorbereitet : datumseinschr &= " AND Vorbereitet >= " & SQLDatum(dtpVon.Value) & " AND Vorbereitet < " & SQLDatum(dtpBis.Value.AddDays(1)) - Case Status_Ankunft : datumseinschr &= " AND Ankunft >= " & SQLDatum(dtpVon.Value) & " AND Ankunft < " & SQLDatum(dtpBis.Value.AddDays(1)) - Case Status_Freigegeben : datumseinschr &= " AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) - End Select - End If - If pnlSearch.Visible Then - top = " TOP 1000 " - End If + Dim hSQL As String = "" + If CheckBox1.Checked Then + '---------------------------------------------------------------------------------------------------------------------------------- + '--- LKW --- + '---------------------------------------------------------------------------------------------------------------------------------- - Dim hSQL As String = "SELECT " & top & " AvisoID, Status, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' ELSE CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, " - hSQL &= " Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen,isnull(Transportmittelart,'')Transportmittelart" - hSQL &= " FROM Aviso " - hSQL &= " WHERE 1=1 " - - If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" And cbxCluster.Checked Then - hSQL &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) " - Else - hSQL &= " AND FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " - End If - If pnlSearch.Visible Then - Dim srchkrit = False - 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 - If txtAbfertigungsnummer.Text <> "" Then hSQLSnd &= " AND AbfertigungsNr LIKE '" & txtAbfertigungsnummer.Text.Replace("*", "%") & "' " : srchkrit = True - If txtDyRef.Text <> "" Then hSQLSnd &= " AND tblSnd_DakosyRef LIKE '" & txtDyRef.Text.Replace("*", "%") & "' " : srchkrit = True - hSQLSnd &= " ) > 0 " - If srchkrit = True Then hSQL &= hSQLSnd - If txtlkwId.Text <> "" Then hSQL &= " AND AvisoID LIKE '" & txtlkwId.Text.Replace("*", "%") & "' " - - If cbxAlle.Checked = False Then - Dim statWhere = "" - If cbxErfasst.Checked Then statWhere &= Status_Erfasst & "," - If cbxVorb.Checked Then statWhere &= Status_Vorbereitet & "," - If cbxVorg.Checked Then statWhere &= Status_Vorgeschrieben & "," - If cbxAnkunft.Checked Then statWhere &= Status_Ankunft & "," - If cbxFreigabe.Checked Then statWhere &= Status_Freigegeben & "," - If cbxNE.Checked Then statWhere &= Status_NichtEingetroffen & "," - If statWhere.EndsWith(",") Then statWhere = statWhere.Substring(0, statWhere.Length - 1) - If statWhere <> "" Then hSQL &= " AND Status IN ( " & statWhere & " ) " Else hSQL &= " AND 1<>1 " + 'Bei ANKUNFT nicht nach Datum einschränken + If tbcntrAviso.SelectedTab Is tabAnkunft Or tbcntrAviso.SelectedTab Is tabErfasst Or tbcntrAviso.SelectedTab Is tabVorbereitet Or tbcntrAviso.SelectedTab Is tabVorgeschrieben Then + pnlTime.Visible = False + Else + pnlTime.Visible = True + Select Case MyComboBox1._value + Case UStatus_none + top = " TOP 1000 " + Case UStatus_AVEingang : datumseinschr &= " AND AvisoEingang >= " & SQLDatum(dtpVon.Value) & " AND AvisoEingang < " & SQLDatum(dtpBis.Value.AddDays(1)) + Case Status_Erfasst : datumseinschr &= " AND Datum >= " & SQLDatum(dtpVon.Value) & " AND Datum < " & SQLDatum(dtpBis.Value.AddDays(1)) + Case Status_Vorgeschrieben : datumseinschr &= " AND Vorgeschrieben >= " & SQLDatum(dtpVon.Value) & " AND Vorgeschrieben < " & SQLDatum(dtpBis.Value.AddDays(1)) + Case Status_Vorbereitet : datumseinschr &= " AND Vorbereitet >= " & SQLDatum(dtpVon.Value) & " AND Vorbereitet < " & SQLDatum(dtpBis.Value.AddDays(1)) + Case Status_Ankunft : datumseinschr &= " AND Ankunft >= " & SQLDatum(dtpVon.Value) & " AND Ankunft < " & SQLDatum(dtpBis.Value.AddDays(1)) + Case Status_Freigegeben : datumseinschr &= " AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) + End Select End If - End If - hSQL &= datumseinschr + If pnlSearch.Visible Then + top = " TOP 1000 " + End If - If cboGrenzstelle._value = "ALLE_WO" Then - hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) " + hSQL = "SELECT " & top & " Status, AvisoID, LKW_Nr, Auftraggeber, Frächter,VoraussichtlichesEintreffen, AvisoEingang, Ankunft, Dauer, Grenzstelle,letzterMitarbeiter,CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],CASE WHEN [ZOLLDigitalEingereicht] = 1 THEN 'DE' WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], Datum, Vorbereitet, Vorgeschrieben, Freigabe, " + hSQL &= " Telefonisch, Info,Handling,AvisoTVHinweis,DATEDIFF(DAY,getdate(),[VoraussichtlichesEintreffen]) TageBisEintreffen,isnull(Transportmittelart,'')Transportmittelart" + hSQL &= " FROM Aviso " + hSQL &= " WHERE 1=1 " + + If VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER <> "" And cbxCluster.Checked Then + hSQL &= " AND ( FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR CLUSTER='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' ) " + Else + hSQL &= " AND FIRMA='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' " + End If + If pnlSearch.Visible Then + Dim srchkrit = False + 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 + If txtAbfertigungsnummer.Text <> "" Then hSQLSnd &= " AND AbfertigungsNr LIKE '" & txtAbfertigungsnummer.Text.Replace("*", "%") & "' " : srchkrit = True + If txtDyRef.Text <> "" Then hSQLSnd &= " AND tblSnd_DakosyRef LIKE '" & txtDyRef.Text.Replace("*", "%") & "' " : srchkrit = True + hSQLSnd &= " ) > 0 " + If srchkrit = True Then hSQL &= hSQLSnd + If txtlkwId.Text <> "" Then hSQL &= " AND AvisoID LIKE '" & txtlkwId.Text.Replace("*", "%") & "' " + + If cbxAlle.Checked = False Then + Dim statWhere = "" + If cbxErfasst.Checked Then statWhere &= Status_Erfasst & "," + If cbxVorb.Checked Then statWhere &= Status_Vorbereitet & "," + If cbxVorg.Checked Then statWhere &= Status_Vorgeschrieben & "," + If cbxAnkunft.Checked Then statWhere &= Status_Ankunft & "," + If cbxFreigabe.Checked Then statWhere &= Status_Freigegeben & "," + If cbxNE.Checked Then statWhere &= Status_NichtEingetroffen & "," + If statWhere.EndsWith(",") Then statWhere = statWhere.Substring(0, statWhere.Length - 1) + If statWhere <> "" Then hSQL &= " AND Status IN ( " & statWhere & " ) " Else hSQL &= " AND 1<>1 " + End If + End If + + hSQL &= datumseinschr + + + If cboGrenzstelle._value = "ALLE_WO" Then + hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) " + + Else + ' If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'" + If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'" + ' Bestimmungs.ZST + If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then + hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'" + End If + End If + + + If cboImEx._value <> "" Then + Select Case cboImEx._value + Case "IMPORT" : hSQL += " AND (ImEx = '" & cboImEx._value & "' OR ImEx = '' )" + Case "EXPORT" : hSQL += " AND ImEx = '" & cboImEx._value & "'" + End Select + + End If 'Then hSQL += " AND ImEx = '" & cboImEx._value & "'" + If cboTeams.Text <> "" Then hSQL += " AND TeamId = '" & cboTeams._value & "'" + + 'je nach Auswahl SQL anpassen + If tbcntrAviso.SelectedTab Is tabAlle Then + 'alle + 'Falls Freigabe/NE bei "ALLE" eingeschränkt werden sollte::: 'hSQL += " AND (Status NOT IN (1,2) OR (Status=1 AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) & ") OR (Status=2 AND [Datum] >= " & SQLDatum(dtpVon.Value) & " AND [Datum] < " & SQLDatum(dtpBis.Value.AddDays(1)) & "))" + + ElseIf tbcntrAviso.SelectedTab Is tabErfasst Then 'Erfasst + hSQL += " AND Status = 0" + ElseIf tbcntrAviso.SelectedTab Is tabVorbereitet Then 'Vorbereitet + hSQL += " AND Status = 4" + ElseIf tbcntrAviso.SelectedTab Is tabVorgeschrieben Then 'Vorgeschrieben + hSQL += " AND Status = 5" + ElseIf tbcntrAviso.SelectedTab Is tabAnkunft Then 'Ankunft + hSQL += " AND Status = 3" + ElseIf tbcntrAviso.SelectedTab Is tabFreigegeben Then 'Freigegeben + hSQL += " AND Status = 1" + ElseIf tbcntrAviso.SelectedTab Is tabVERIMEX Then 'Nicht Eingetroffen + hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX + ElseIf tbcntrAviso.SelectedTab Is tabINDONESIEN Then 'Nicht Eingetroffen + hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN + ElseIf tbcntrAviso.SelectedTab Is tabNichtEingetroffen Then 'Nicht Eingetroffen + hSQL += " AND Status = 2" + End If + + Dim search = txtSuche.Text.Trim + If search <> "" Then + hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )" + + 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And search.Length = 8 Then 'AbfertigungsNr Suche für ATILLA, length, damit nicht unnötig der Verweis zu tblSendungen hergestellt wird --> performance + ' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' OR (SELECT count(*) FROM tblSendungen WHERE AbfertigungsNr LIKE '%" & search & "%' AND FilialenNr=4801 AND tblSnd_AvisoID=AvisoId)>0 ) " + 'Else + ' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )" + 'End If + End If + + + hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC" + Else - ' If SucheStandort <> "" Then hSQL += " AND Grenzstelle = '" & SucheStandort & "'" - If cboGrenzstelle._value <> "" Then hSQL += " AND Grenzstelle = '" & cboGrenzstelle._value & "'" - ' Bestimmungs.ZST - If cboGrenzstelle._value = "???" And txtBestimmungszollstelle._value <> "" Then - hSQL += " AND Zollstelle = '" & txtBestimmungszollstelle._value & "'" + + + '---------------------------------------------------------------------------------------------------------------------------------- + '--- Sendung --- + '---------------------------------------------------------------------------------------------------------------------------------- + Dim inBearbeitungSQL = " tblSendungen.LetzterMitarbeiterId=@maId " ' 1<>1 " 'DEFAULT = "Benutzer" + If cboMyAvisoAnzeige._value <> "" 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 & "' AND tblSendungen.[tblSnd_TeamId] is null)) OR [tblSendungen].tblSnd_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')) " + ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then + If cboMyAvisoAnzeige._value = "27" Then ' TEAM SALZBURG + inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId + OR Grenzstelle IN('SBG') OR (tblSendungen.FilialenNr IN('5701') AND tblSnd_Abfertigungsart_ID IN(1,38,39,46,66)) ) " + Else + inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) " + + End If + End If End If - End If + hSQL = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " & + " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " & + " FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " & + " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & + hSQLFirma & " AND ( " & inBearbeitungSQL & ") " - If cboImEx._value <> "" Then - Select Case cboImEx._value - Case "IMPORT" : hSQL += " AND (ImEx = '" & cboImEx._value & "' OR ImEx = '' )" - Case "EXPORT" : hSQL += " AND ImEx = '" & cboImEx._value & "'" + Select Case cboMy_VB.CheckState + Case CheckState.Checked : hSQL &= " AND tblSnd_Vorgeschrieben is not null " + Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorgeschrieben is null " + ' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null " End Select + Select Case cboMy_QS.CheckState + Case CheckState.Checked : hSQL &= " AND tblSnd_Vorbereitet is not null " + Case CheckState.Unchecked : hSQL &= " AND tblSnd_Vorbereitet is null " + ' Case CheckState.Indeterminate : hSQL &= " AND tblSnd_Vorbereitet is not null " + End Select + If cboMy_Grenzstelle._value = "ALLE_WO" Then + hSQL += " AND Grenzstelle IN (SELECT [grz_Grenzstelle] FROM [tblGrenzstelle] where (grz_Warenort=1 AND (grz_Firma ='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' )) ) " - End If 'Then hSQL += " AND ImEx = '" & cboImEx._value & "'" - If cboTeams.Text <> "" Then hSQL += " AND TeamId = '" & cboTeams._value & "'" + Else - 'je nach Auswahl SQL anpassen - If tbcntrAviso.SelectedTab Is tabAlle Then - 'alle - 'Falls Freigabe/NE bei "ALLE" eingeschränkt werden sollte::: 'hSQL += " AND (Status NOT IN (1,2) OR (Status=1 AND Freigabe >= " & SQLDatum(dtpVon.Value) & " AND Freigabe < " & SQLDatum(dtpBis.Value.AddDays(1)) & ") OR (Status=2 AND [Datum] >= " & SQLDatum(dtpVon.Value) & " AND [Datum] < " & SQLDatum(dtpBis.Value.AddDays(1)) & "))" + If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then hSQL &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" + If cboMy_Grenzstelle._value = "ALLE_BACK" Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') " - ElseIf tbcntrAviso.SelectedTab Is tabErfasst Then 'Erfasst - hSQL += " AND Status = 0" - ElseIf tbcntrAviso.SelectedTab Is tabVorbereitet Then 'Vorbereitet - hSQL += " AND Status = 4" - ElseIf tbcntrAviso.SelectedTab Is tabVorgeschrieben Then 'Vorgeschrieben - hSQL += " AND Status = 5" - ElseIf tbcntrAviso.SelectedTab Is tabAnkunft Then 'Ankunft - hSQL += " AND Status = 3" - ElseIf tbcntrAviso.SelectedTab Is tabFreigegeben Then 'Freigegeben - hSQL += " AND Status = 1" - ElseIf tbcntrAviso.SelectedTab Is tabVERIMEX Then 'Nicht Eingetroffen - hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_VERIMEX - ElseIf tbcntrAviso.SelectedTab Is tabINDONESIEN Then 'Nicht Eingetroffen - hSQL += " AND Status = " & VERAG_PROG_ALLGEMEIN.cGlobal.Status_ATILLA_INDONESIEN - ElseIf tbcntrAviso.SelectedTab Is tabNichtEingetroffen Then 'Nicht Eingetroffen - hSQL += " AND Status = 2" - End If + End If - Dim search = txtSuche.Text.Trim - If search <> "" Then - hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )" + If cbx_My_Brexit.Visible AndAlso Not cbx_My_Brexit.Checked Then hSQL &= " AND FilialenNr NOT IN ('7001','7002','7003') " - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And search.Length = 8 Then 'AbfertigungsNr Suche für ATILLA, length, damit nicht unnötig der Verweis zu tblSendungen hergestellt wird --> performance - ' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' OR (SELECT count(*) FROM tblSendungen WHERE AbfertigungsNr LIKE '%" & search & "%' AND FilialenNr=4801 AND tblSnd_AvisoID=AvisoId)>0 ) " - 'Else - ' hSQL += " AND (LKW_Nr LIKE '%" & search & "%' OR letzterMitarbeiter LIKE '%" & search & "%' OR Auftraggeber LIKE '%" & search & "%' OR Frächter LIKE '%" & search & "%' OR DakosyRef LIKE '%" & search & "%' )" + 'Farbe + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then + Select Case btnColor.BackColor + Case Color.Red + hSQL &= " AND (Status = 3 ) " + Case Color.Orange + ' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(GETDATE() AS DATE) ) ) " + hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) <= cast(DATEADD(DAY, " & getDaysVorschreiben(1) & ",GETDATE()) AS DATE) ) ) " + Case Color.Yellow + hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) BETWEEN cast(DATEADD(DAY," & getDaysVorschreiben(2) & ",GETDATE()) AS DATE) AND cast(DATEADD(DAY," & getDaysVorschreiben(3) & ",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 + ' hSQL &= " 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 + ' hSQL &= " AND ( (Status IN (0, 4, 5) AND cast(VoraussichtlichesEintreffen as DATE) = cast(DATEADD(DAY, 1,GETDATE()) AS DATE) ) ) " + ' Case Color.Yellow + ' hSQL &= " 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 + + 'hSQL &= " AND (Grenzstelle ='???' OR Status NOT IN (1)) " ' "Freigabe" nur bei Fremde Grenze anzeigen! + ' Funktioniert nciht, wg. WO + + hSQL &= " 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") + End If - - hSQL += " ORDER BY Ankunft ASC, AvisoEingang ASC, Datum ASC" ' MsgBox(hSQL) 'If hSort = "" Then 'hSQL += " ORDER BY Ankunft DESC, AvisoEingang DESC, Datum DESC" @@ -1029,10 +1145,14 @@ Public Class frmHauptfenster 'AVISOBinding.initBinding(hSQL, "Aviso") 'gridAviso.DataSource = AVISOBinding.bindingSource - ' MsgBox(hSQL) + 'MsgBox(DirectCast(gridAviso.DataSource, DataTable).Rows.Count) 'Grid neu designen - gridAviso_SpaltenFestlegen() + + If CheckBox1.Checked Then + gridAviso_SpaltenFestlegen() + End If + 'Tabelle Kommt/Geht bereinigen If gridAviso.RowCount = 0 Then gridAviso.DataSource = Nothing @@ -1261,7 +1381,7 @@ Public Class frmHauptfenster '---------------------------------------------------------------------------------------------------------------------------------- '--- LKW --- '---------------------------------------------------------------------------------------------------------------------------------- - sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " & + sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus],[Status],CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as [statVorb], LKW_Nr, Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe,LetzterMitarbeiterId AS maId, LetzterMitarbeiterId ,/* CASE WHEN LetzterMitarbeiterId=@maId then '0' ELSE '1' END as Vorbereitung,*/LetzterMitarbeiter,AvisoTVHinweis " & " FROM Aviso " & " WHERE ( Status IN (0, 3, 4, 5,6,7) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) " @@ -1313,7 +1433,7 @@ Public Class frmHauptfenster End If End If - sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " & + sqlStr = " SELECT AvisoID, CASE WHEN [LKW_fertig] = 1 THEN 'OK' ELSE '' END AS [LKW_fertig],CASE WHEN [VerwahrungStatus] = 1 THEN 'OK' ELSE '' END AS [VerwahrungStatus], [Status],tblSendungen.LetzterMitarbeiterId,tblSendungen.LetzterMitarbeiter, LKW_Nr, VoraussichtlichesEintreffen,Dauer, Datum, AvisoEingang, Ankunft, Grenzstelle, Freigabe, Aviso.LetzterMitarbeiterId AS maId,AvisoTVHinweis " & " ,tblSnd_Empfaenger,AbfertigungsNr,tblSnd_Abfertigungsart_ID,tblSnd_Vorgeschrieben,tblSnd_Vorbereitet,tblSnd_Status,tblSnd_SendungID,tblSnd_Fremdspedition,tblSnd_FremdspeditionText " & " FROM Aviso INNER JOIN tblSendungen ON AvisoID=tblSnd_AvisoID " & " WHERE ( Status IN (0, 3, 4, 5) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & @@ -1484,7 +1604,16 @@ Public Class frmHauptfenster .Columns("LKW_fertig").HeaderText = "OK" .Columns("LKW_fertig").DefaultCellStyle.ForeColor = Color.White .Columns("LKW_fertig").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter - '.Columns("LKW_fertig").DefaultCellStyle.Font = bfont + + If cboGrenzstelle._value = "NEU" Then + .Columns("VerwahrungStatus").Width = 55 + .Columns("VerwahrungStatus").HeaderText = "Kontrolle" + .Columns("VerwahrungStatus").DefaultCellStyle.ForeColor = Color.White + .Columns("VerwahrungStatus").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + .Columns("VerwahrungStatus").Visible = True + Else + .Columns("VerwahrungStatus").Visible = False + End If If gridMyAviso.RowCount = 0 Then gridMyAviso.Columns.Clear() : Exit Sub @@ -1614,6 +1743,7 @@ Public Class frmHauptfenster End If + If r.Cells("VerwahrungStatus").Value = "OK" Then r.Cells("LKW_fertig").Style.BackColor = Color.Green If r.Cells("LKW_fertig").Value = "OK" Then r.Cells("LKW_fertig").Style.BackColor = Color.FromArgb(0, 54, 128) If r.Cells("LKW_fertig").Value = "DE" Then r.Cells("LKW_fertig").Style.BackColor = Color.Green If r.Cells("Dauer").Value > 120 Then r.Cells("DauerText").Style.ForeColor = Color.Red @@ -2939,8 +3069,8 @@ Public Class frmHauptfenster ' If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 760) > 0 Then ' SplitContainer1.SplitterDistance = SplitContainer1.Width - 760 ' End If - If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 630) > 0 Then - SplitContainer1.SplitterDistance = SplitContainer1.Width - 630 + If SplitContainer1.Panel2.Width > 700 And (SplitContainer1.Width - 660) > 0 Then + SplitContainer1.SplitterDistance = SplitContainer1.Width - 660 End If End Sub @@ -3455,7 +3585,7 @@ Public Class frmHauptfenster Public Sub showHideDetails() If sd <> SplitContainer1.SplitterDistance Or SplitContainer1.Panel2.Size.Width = 15 Then SplitContainer1.SplitterDistance = sd - SplitContainer1.Panel2MinSize = 300 + SplitContainer1.Panel2MinSize = 600 '300 Fullscreen = False Else SplitContainer1.Panel2MinSize = 15 @@ -3649,7 +3779,7 @@ Public Class frmHauptfenster Grid_aktiv = True End Sub - Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click + Private Sub Button4_Click_1(sender As Object, e As EventArgs) Handles Button4.Click, CheckBox1.CheckedChanged Aviso_anzeigen("") End Sub @@ -4263,7 +4393,7 @@ Public Class frmHauptfenster Me.Cursor = Cursors.Default End Sub - Private Sub Button12_Click(sender As Object, e As EventArgs) Handles Button12.Click, Label22.Click + Private Sub Button12_Click(sender As Object, e As EventArgs) Handles btnE_Aviso.Click, Label22.Click Me.Cursor = Cursors.WaitCursor Dim f As New frm_eAVISO f.Show() @@ -4829,32 +4959,80 @@ Public Class frmHauptfenster Public Function GetDataFromSharePoint(siteUrl As String, listName As String, username As String, password As String) As String - ' SharePoint-URL und Liste konfigurieren - Dim requestUrl As String = siteUrl & "/_api/web/lists/getbytitle('" & listName & "')/items" + '' SharePoint-URL und Liste konfigurieren + 'Dim requestUrl As String = siteUrl & "/_api/web/lists/getbytitle('" & listName & "')/items" - ' Authentifizierung: Benutzername und Passwort als Basis64 - Dim credentials As String = Convert.ToBase64String(Encoding.ASCII.GetBytes(username & ":" & password)) + '' Authentifizierung: Benutzername und Passwort als Basis64 + 'Dim credentials As String = Convert.ToBase64String(Encoding.ASCII.GetBytes(username & ":" & password)) - ' HTTP-Anfrage vorbereiten - Dim request As HttpWebRequest = CType(WebRequest.Create(requestUrl), HttpWebRequest) - request.Method = "GET" - request.Accept = "application/json;odata=verbose" - request.Headers("Authorization") = "Basic " & credentials + '' HTTP-Anfrage vorbereiten + 'Dim request As HttpWebRequest = CType(WebRequest.Create(requestUrl), HttpWebRequest) + 'request.Method = "GET" + 'request.Accept = "application/json;odata=verbose" + 'request.Headers("Authorization") = "Basic " & credentials - Try - ' Antwort von SharePoint erhalten - Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse) - Using reader As New StreamReader(response.GetResponseStream()) - Dim jsonResponse As String = reader.ReadToEnd() - Return jsonResponse - End Using - End Using - Catch ex As WebException - ' Fehlerbehandlung - Return "Fehler: " & ex.Message - End Try + 'Try + ' ' Antwort von SharePoint erhalten + ' Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse) + ' Using reader As New StreamReader(response.GetResponseStream()) + ' Dim jsonResponse As String = reader.ReadToEnd() + ' Return jsonResponse + ' End Using + ' End Using + 'Catch ex As WebException + ' ' Fehlerbehandlung + ' Return "Fehler: " & ex.Message + 'End Try + ' 1. Zugriffstoken abrufen + + + '------------------------------------- + + + + ' Dim authority As String = $"https://login.microsoftonline.com/{tenantId}" + ' Dim scopes As String() = {"https://graph.microsoft.com/.default"} + + ' ' Authentifizierung mit dem vertraulichen Client + ' Dim app As IConfidentialClientApplication = ConfidentialClientApplicationBuilder.Create(clientId). + ' WithClientSecret(clientSecret). + ' WithAuthority(New Uri(authority)). + ' Build() + + ' ' Token abrufen + ' Dim authResult = Await app.AcquireTokenForClient(scopes).ExecuteAsync() + + '' 2. Zugriff auf SharePoint + 'Dim requestUrl As String = $"{siteUrl}/_api/web/lists/getbytitle('{listName}')/items" + ' Using client As New HttpClient() + ' client.DefaultRequestHeaders.Authorization = New AuthenticationHeaderValue("Bearer", authResult.AccessToken) + ' client.DefaultRequestHeaders.Accept.Add(New MediaTypeWithQualityHeaderValue("application/json")) + + ' ' GET-Anfrage an SharePoint senden + ' Dim response As HttpResponseMessage = Await client.GetAsync(requestUrl) + + ' ' Antwort prüfen und zurückgeben + ' If response.IsSuccessStatusCode Then + ' Dim jsonResponse As String = Await response.Content.ReadAsStringAsync() + ' Return jsonResponse + ' Else + ' Return $"Fehler: {response.StatusCode} - {response.ReasonPhrase}" + ' End If + ' End Using End Function + Private Sub Button7_Click_1(sender As Object, e As EventArgs) Handles Button7.Click + + + Dim f As New frmSendungsdetailsNEU + + Dim NEW_SND As New VERAG_PROG_ALLGEMEIN.cSendungen(AvisoId, f.SENDUNG_LIST.Count + 1, filiale_tmp, Nothing, 0, 0) 'Neue Sendung erstellen + NEW_SND.SAVE(False) 'Insert neue Sendung + f.SENDUNG_LIST.Add(NEW_SND) + + f.UNBOUND = True + f.Show() + End Sub End Class Public Class AvisoStatusFunctions diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index dc9900d..725b4fa 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -118,103 +118,6 @@ 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 @@ -1628,9 +1531,6 @@ mVCCPwiVeQBaqAV4Jfq5XQAAAABJRU5ErkJggg== - - 296, 17 - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAIdJREFUOE/V @@ -1657,6 +1557,103 @@ True + + + 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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= + + True @@ -2077,9 +2074,6 @@ 174, 17 - - 404, 17 - 596, 17 diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index c329068..ec87e77 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -30,6 +30,7 @@ Public Class frmSendungsdetailsNEU Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim FormularArt = "" Dim loaded = False + Public UNBOUND = False Dim kdnrEORI As Integer = -1 Dim usrcntl_NCTS As usrCntlSND_NCTSGestellungsadresse @@ -129,9 +130,12 @@ Public Class frmSendungsdetailsNEU txtColli.Focus() 'DAMIT evtl. LEAVE Events ausgelöst werden txtGewicht.Focus() 'DAMIT evtl. LEAVE Events ausgelöst werden - If AVISO.Abgeschlossen Then - 'MsgBox("Keine Änderung möglich - Akt bereits abgeschlossen.") - Return True + + If AVISO IsNot Nothing Then + If AVISO.Abgeschlossen Then + 'MsgBox("Keine Änderung möglich - Akt bereits abgeschlossen.") + Return True + End If End If loadDataInLIST() @@ -384,15 +388,17 @@ Public Class frmSendungsdetailsNEU End Sub Sub initGrenzstelle() + If AVISO IsNot Nothing Then - lblGrenze.Text = "" - If AVISO.Grenzstelle.Replace("???", "").Replace("WO_FREMD", "") = "" Then - 'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") - lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL") - Else - Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle) - If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then - lblGrenze.Text = AVISO.Grenzstelle & vbNewLine & If(GRZ.grz_ZollamtDST, "") & " " & If(GRZ.grz_ZollamtBezeichnung, "") + lblGrenze.Text = "" + If AVISO.Grenzstelle.Replace("???", "").Replace("WO_FREMD", "") = "" Then + 'lblGrenze.Text = SQL.getValueTxtBySql("Select basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") + lblGrenze.Text = SQL.getValueTxtBySql("SELECT Code +' - ' + [Description] FROM tbl_DY_ZollDE_C0141_Zollstellen WHERE Code='" & If(AVISO.Zollstelle, "") & "' AND ((StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()))", "FMZOLL") + Else + Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle) + If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then + lblGrenze.Text = AVISO.Grenzstelle & vbNewLine & If(GRZ.grz_ZollamtDST, "") & " " & If(GRZ.grz_ZollamtBezeichnung, "") + End If End If End If End Sub @@ -400,6 +406,11 @@ Public Class frmSendungsdetailsNEU Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) Button23.Visible = True + + If UNBOUND Then + FlowLayoutPanel.Visible = False + End If + Try Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor @@ -415,8 +426,10 @@ Public Class frmSendungsdetailsNEU initVorpapiere() - If AVISO.Abgeschlossen Then - Label8.Visible = True + If AVISO IsNot Nothing Then + If AVISO.Abgeschlossen Then + Label8.Visible = True + End If End If lblZollsysErr.Text = "" LinkLabel1.TabStop = False @@ -526,7 +539,9 @@ Public Class frmSendungsdetailsNEU it.Tag = r("grz_Grenzstelle").ToString ContextMenuStrip3.Items.Add(it) AddHandler it.Click, Sub() - If it.Tag.ToString = "???" Then + If AVISO IsNot Nothing Then + + If it.Tag.ToString = "???" Then SAVE_ME() AVISO.Grenzstelle = "???" AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString) @@ -540,7 +555,9 @@ Public Class frmSendungsdetailsNEU SAVE_ME() AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString) End If - Me.initDataBinding() + Me.initDataBinding() + + End If End Sub Next End If @@ -979,7 +996,7 @@ Public Class frmSendungsdetailsNEU End Sub Sub initButtons() - + If UNBOUND Then Exit Sub ' FlowLayoutPanel.Visible = False ' Me.SuspendLayout() FlowLayoutPanel.SuspendLayout() @@ -1617,20 +1634,26 @@ Public Class frmSendungsdetailsNEU End Sub Sub initVorpapiere() + cboVorpapier.Items.Clear() cboVorpapier2.Items.Clear() cboVorpapier3.Items.Clear() + If AVISO IsNot Nothing Then - AVISO.LOAD_Vorpapiere() - cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - For Each VP In AVISO.VORPAPIERE - cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) - cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) - cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) - Next + AVISO.LOAD_Vorpapiere() + + cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + For Each VP In AVISO.VORPAPIERE + cboVorpapier.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) + cboVorpapier2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) + cboVorpapier3.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(VP.vp_Nr, VP.vp_Nr)) + Next + Else + + End If End Sub Sub setVorpapiere() @@ -1644,9 +1667,10 @@ Public Class frmSendungsdetailsNEU End Sub Sub initFraechterAvisererFromAkt() + If AVISO IsNot Nothing Then - 'Übergangsphase Aviso/Sendung - If txtAvisierer.Text = "" And txtAvisierer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then + 'Übergangsphase Aviso/Sendung + If txtAvisierer.Text = "" And txtAvisierer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then If AVISO.Auftraggeber_KdNr > -1 Then If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr @@ -1659,18 +1683,20 @@ Public Class frmSendungsdetailsNEU End If - 'Übergangsphase Aviso/Sendung - If txtFrachtfuehrer.Text = "" And txtFrachtfuehrer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then - If AVISO.Frächter_KdNr > -1 Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Frächter_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then - txtFrachtfuehrer.KdNr = AVISO.Frächter_KdNr - End If - Else + 'Übergangsphase Aviso/Sendung + If txtFrachtfuehrer.Text = "" And txtFrachtfuehrer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then + If AVISO.Frächter_KdNr > -1 Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Frächter_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then + txtFrachtfuehrer.KdNr = AVISO.Frächter_KdNr + End If + Else - txtFrachtfuehrer.KdNr_value = -1 - txtFrachtfuehrerKdNr.Text = "" - txtFrachtfuehrer.Text = AVISO.Frächter + txtFrachtfuehrer.KdNr_value = -1 + txtFrachtfuehrerKdNr.Text = "" + txtFrachtfuehrer.Text = AVISO.Frächter + End If End If + End If End Sub @@ -2473,13 +2499,18 @@ Public Class frmSendungsdetailsNEU With dgvBelege .Columns.Clear() If .RowCount > 0 Then .Rows.Clear() + Dim AvisoID = -1 + If AVISO IsNot Nothing Then + AvisoID = AVISO.AvisoID + End If + If (txtAbfertigungsnummer.Text.Trim <> "" AndAlso IsNumeric(txtAbfertigungsnummer.Text) AndAlso txtAbfertigungsnummer.Text > 0) And (cboFiliale._value.Trim <> "" AndAlso IsNumeric(cboFiliale._value) AndAlso cboFiliale._value > 0) Then ' .DataSource = SQL.loadDgvBySql("SELECT rksv_BelegId, rksv_umsatz ,BelegNr,BelegDat,Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] INNER JOIN Personal ON ID=Benutzer where ((FilialenNr='" & cboFiliale._value & "' and AbfertigungsNr='" & txtAbfertigungsnummer.Text & "') OR (LKW_id='" & AVISO.AvisoID & "' AND LKW_Beleg=1) OR (SELECT Count(*) FROM [tblEABelegnummer] where AbfertigungsNr='" & txtAbfertigungsnummer.Text & "' and FilialenNr='" & cboFiliale._value & "' )>0) and storniert=0 and gebuchtstorno=0 order by rksv_BelegId", "FMZOLL") .DataSource = SQL.loadDgvBySql(" SELECT rksv_BelegId, rksv_umsatz ,b.BelegNr,b.BelegDat,b.Benutzer,[Name],LKW_Beleg FROM [tblEABelegnummer] as b " & " INNER JOIN Personal ON ID=Benutzer " & " INNER JOIN [tblEABelegposition] as pos ON pos.[Mandant]=b.[Mandant] AND pos.[Niederlassung]=b.[Niederlassung] AND pos.[Benutzer]=b.[Benutzer] AND pos.[BelegDat]=b.[BelegDat] AND pos.[BelegNr]=b.[BelegNr] " & " where " & - " ((b.FilialenNr='" & cboFiliale._value & "' and b.AbfertigungsNr='" & txtAbfertigungsnummer.Text & "') OR (LKW_id='" & AVISO.AvisoID & "' AND LKW_Beleg=1) OR " & + " ((b.FilialenNr='" & cboFiliale._value & "' and b.AbfertigungsNr='" & txtAbfertigungsnummer.Text & "') OR (LKW_id='" & AvisoID & "' AND LKW_Beleg=1) OR " & " ( pos.AbfertigungsNr='" & txtAbfertigungsnummer.Text & "' and pos.FilialenNr='" & cboFiliale._value & "' ) ) and storniert=0 and gebuchtstorno=0 " & " group by rksv_BelegId, rksv_umsatz ,b.BelegNr,b.BelegDat,b.Benutzer,[Name],LKW_Beleg " & " order by rksv_BelegId", "FMZOLL")