diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 8b5ecf0..0f4a991 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1316,6 +1316,9 @@ + + Always + Always diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index 4f902fd..f007bf7 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -411,6 +411,8 @@ Public Class SendungOptions imgpath = resPath & "UNISPED.png" ElseIf SENDUNG.FilialenNr = "5701" Then imgpath = resPath & "AMB.png" + ElseIf SENDUNG.FilialenNr = "5801" Then + imgpath = resPath & "FO.png" Else Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung Case "SUB" diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 76ebd9a..a374839 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 01b3687..4912a4b 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -599,6 +599,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property FO() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("FO", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1169,15 +1179,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property sdf2sdf1sdf5sd4fsd4f8sdf48sdfsdfsdf() As String - Get - Return ResourceManager.GetString("sdf2sdf1sdf5sd4fsd4f8sdf48sdfsdfsdf", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1538,7 +1539,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.7.0.1 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.7.1.4 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index b9320e9..b0104ef 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -536,7 +536,7 @@ ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.7.0.1 + 3.7.1.4 ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -616,7 +616,7 @@ ..\..\Diverses\miniButtons\abfetigungTR_inaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - + + F:\Grafik\VERAG\VERAG_Akten\eigAkt\FO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Aviso/Resources/FO.png b/Aviso/Resources/FO.png new file mode 100644 index 0000000..32f0180 Binary files /dev/null and b/Aviso/Resources/FO.png differ diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index 58f903b..4da1e72 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -31,13 +31,16 @@ Public Class frmEintragAviso Dim PROG As New cProgramFunctions Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Public Sub New() InitializeComponent() Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon End Sub Private Sub frmEintragAviso_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" And myAviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then + If FIRMA_TMP = "ATILLA" And myAviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then If myAviso.Frächter = "" Then MsgBox("Bei 'Ankunft' muss der Frächter angegeben werden!") e.Cancel = True @@ -62,7 +65,7 @@ Public Class frmEintragAviso ' btnSaveAttachments.Enabled = False Else dgvAnhaenge.Visible = True - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If FIRMA_TMP = "ATILLA" Then dgvAnhaenge.Visible = False 'dgvAnhaenge.Size = New Size(dgvAnhaenge.Size.Width, 70) 'dgvAnhaenge.Top += (dgvAnhaenge.Size.Height - 70) @@ -94,7 +97,7 @@ Public Class frmEintragAviso kdAuftraggeber.initKdBox(Me) cboGrenzstelle.Items.Clear() - cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE") + cboGrenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where [grz_Firma]='" & FIRMA_TMP & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE") cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???")) cboGrenzstelle.changeItem("") @@ -124,10 +127,10 @@ Public Class frmEintragAviso cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMBAR", "AMBAR")) cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATILLA", "ATILLA")) cboFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FRONTOFFICE", "FRONTOFFICE")) - cboFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + cboFirma.changeItem(FIRMA_TMP) cboFirma.Enabled = False - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Select Case FIRMA_TMP Case "IMEX" txtSndFiskalAT.Visible = False @@ -194,7 +197,7 @@ Public Class frmEintragAviso cboImEx.Visible = True Label1.Visible = True End Select - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Select Case FIRMA_TMP Case "FRONTOFFICE" cbxSendungsvorlagen.Checked = False cbxPosNr.Checked = False @@ -253,7 +256,7 @@ Public Class frmEintragAviso btnOK.Enabled = True - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If FIRMA_TMP = "ATILLA" Then cbxFrächterUnbekannt.Visible = True cboGrenzstelle.Visible = False lblGrenze.Visible = False @@ -287,222 +290,222 @@ Public Class frmEintragAviso If cboFirma._value = "ATILLA" Then datVoraussichtlichesEintreffen.Value = Now 'Bei ATILLA gibt es meist kein voraussichtliches Eintreffdatum. dtpAvisoEingangDatum.Value = Now.Date - dtpAvisoEingangZeit.Value = LeerDatum - txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter - lblStatus.Text = "Neuanlage" - optAvisoEingang.Checked = True - kdAvisierer.Text = "" - kdAuftraggeber.Text = "" - kdFrächter.Text = "" - If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung <> "QS" Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then - cboGrenzstelle.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG) - End If + dtpAvisoEingangZeit.Value = LeerDatum + txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter + lblStatus.Text = "Neuanlage" + optAvisoEingang.Checked = True + kdAvisierer.Text = "" + kdAuftraggeber.Text = "" + kdFrächter.Text = "" + If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung <> "QS" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG <> "" Then + cboGrenzstelle.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG) End If - Else - Me.Text = "Änderung LKW-Aviso" + End If + Else + Me.Text = "Änderung LKW-Aviso" 'If myAviso.Status = cGlobal.Status_Ankunft Or myAviso.Status = cGlobal.Status_Freigegeben Then datVoraussichtlichesEintreffen.Visible = False txtInfo.Visible = False - Label3.Visible = False - 'ausgewählter Datensatz wird geladen - grpAktVerzollung.Visible = False - cbxSendungsvorlagen.Visible = False - Button3.Visible = False + Label3.Visible = False + 'ausgewählter Datensatz wird geladen + grpAktVerzollung.Visible = False + cbxSendungsvorlagen.Visible = False + Button3.Visible = False - myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "") + myAviso = AvisoDAL.LesenAviso(cGlobal.Aktive_ID, "") - 'Werte(zuweisen) - dtpDatum.Value = myAviso.Datum - If myAviso.Frächter_KdNr > 0 Then - kdFrächter.KdNr = myAviso.Frächter_KdNr - Else - kdFrächter.Text = myAviso.Frächter - End If + 'Werte(zuweisen) + dtpDatum.Value = myAviso.Datum + If myAviso.Frächter_KdNr > 0 Then + kdFrächter.KdNr = myAviso.Frächter_KdNr + Else + kdFrächter.Text = myAviso.Frächter + End If - If myAviso.Auftraggeber_KdNr > 0 Then - kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr - Else - kdAvisierer.Text = myAviso.Auftraggeber - End If + If myAviso.Auftraggeber_KdNr > 0 Then + kdAvisierer.KdNr = myAviso.Auftraggeber_KdNr + Else + kdAvisierer.Text = myAviso.Auftraggeber + End If - txtInfo.Text = myAviso.Info.Trim - txtLKW_Nr.Text = myAviso.LKW_Nr - sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet) - txtFahrerHandy.Text = If(myAviso.FahrerHandy, "") - txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "") - If myAviso.VoraussichtlichesEintreffen IsNot Nothing Then - datVoraussichtlichesEintreffen.Value = myAviso.VoraussichtlichesEintreffen - Else - datVoraussichtlichesEintreffen.Value = myAviso.Datum.AddDays(-1) - End If + txtInfo.Text = myAviso.Info.Trim + txtLKW_Nr.Text = myAviso.LKW_Nr + sbLkwNationalitaet.SET_VALUE(myAviso.LKW_Nationalitaet) + txtFahrerHandy.Text = If(myAviso.FahrerHandy, "") + txtAvisiererAuftragsNr.Text = If(myAviso.KdAuftragsNr_Avisierer, "") + If myAviso.VoraussichtlichesEintreffen IsNot Nothing Then + datVoraussichtlichesEintreffen.Value = myAviso.VoraussichtlichesEintreffen + Else + datVoraussichtlichesEintreffen.Value = myAviso.Datum.AddDays(-1) + End If - txtÄnderungen.Text = myAviso.Änderungen.Trim - optOhneAviso.Visible = False 'bei Änderung kann kein Eingang ohne Aviso erfolgen, da Datum bereits bei Anlage gesetzt - optAvisoEingang.Checked = True 'bei Änderung kann kein Eingang ohne Aviso erfolgen... - dtpAvisoEingangDatum.Visible = True - dtpAvisoEingangZeit.Visible = True - If myAviso.Telefonisch = "Telefon" Then - optTelefonisch.Checked = True - ElseIf myAviso.Telefonisch = "Schriftl." Then - optSchriftlich.Checked = True - Else - optUnbekannt.Checked = True - End If + txtÄnderungen.Text = myAviso.Änderungen.Trim + optOhneAviso.Visible = False 'bei Änderung kann kein Eingang ohne Aviso erfolgen, da Datum bereits bei Anlage gesetzt + optAvisoEingang.Checked = True 'bei Änderung kann kein Eingang ohne Aviso erfolgen... + dtpAvisoEingangDatum.Visible = True + dtpAvisoEingangZeit.Visible = True + If myAviso.Telefonisch = "Telefon" Then + optTelefonisch.Checked = True + ElseIf myAviso.Telefonisch = "Schriftl." Then + optSchriftlich.Checked = True + Else + optUnbekannt.Checked = True + End If cboGrenzstelle.changeItem(myAviso.Grenzstelle) cboTransportmittelart.changeItem(myAviso.Transportmittelart) cboImEx.Text = If(myAviso.ImEx, "") - hStatus = myAviso.Status - If myAviso.Ankunft = LeerDatum Then - dtpAnkunft.Value = Now.Date - dtpAnkunftZeit.Value = Now - Else - dtpAnkunft.Value = myAviso.Ankunft - dtpAnkunftZeit.Value = myAviso.Ankunft - End If - If myAviso.AvisoEingang = LeerDatum Then - dtpAvisoEingangDatum.Value = dtpDatum.Value.Date - dtpAvisoEingangZeit.Value = dtpDatum.Value - Else - dtpAvisoEingangDatum.Value = myAviso.AvisoEingang - dtpAvisoEingangZeit.Value = myAviso.AvisoEingang - End If - If myAviso.Freigabe = LeerDatum Then - dtpFreigabe.Value = Now.Date - dtpFreigabeZeit.Value = Now - Else - dtpFreigabe.Value = myAviso.Freigabe - dtpFreigabeZeit.Value = myAviso.Freigabe - End If - If myAviso.Vorbereitet = LeerDatum Then - dtpVorbereitet.Value = Now.Date - dtpVorbereitetZeit.Value = Now - Else - dtpVorbereitet.Value = myAviso.Vorbereitet - dtpVorbereitetZeit.Value = myAviso.Vorbereitet - End If - If myAviso.Vorgeschrieben = LeerDatum Then - dtpVorgeschrieben.Value = Now.Date - dtpVorgeschriebenZeit.Value = Now - Else - dtpVorgeschrieben.Value = myAviso.Vorgeschrieben - dtpVorgeschriebenZeit.Value = myAviso.Vorgeschrieben - End If + hStatus = myAviso.Status + If myAviso.Ankunft = LeerDatum Then + dtpAnkunft.Value = Now.Date + dtpAnkunftZeit.Value = Now + Else + dtpAnkunft.Value = myAviso.Ankunft + dtpAnkunftZeit.Value = myAviso.Ankunft + End If + If myAviso.AvisoEingang = LeerDatum Then + dtpAvisoEingangDatum.Value = dtpDatum.Value.Date + dtpAvisoEingangZeit.Value = dtpDatum.Value + Else + dtpAvisoEingangDatum.Value = myAviso.AvisoEingang + dtpAvisoEingangZeit.Value = myAviso.AvisoEingang + End If + If myAviso.Freigabe = LeerDatum Then + dtpFreigabe.Value = Now.Date + dtpFreigabeZeit.Value = Now + Else + dtpFreigabe.Value = myAviso.Freigabe + dtpFreigabeZeit.Value = myAviso.Freigabe + End If + If myAviso.Vorbereitet = LeerDatum Then + dtpVorbereitet.Value = Now.Date + dtpVorbereitetZeit.Value = Now + Else + dtpVorbereitet.Value = myAviso.Vorbereitet + dtpVorbereitetZeit.Value = myAviso.Vorbereitet + End If + If myAviso.Vorgeschrieben = LeerDatum Then + dtpVorgeschrieben.Value = Now.Date + dtpVorgeschriebenZeit.Value = Now + Else + dtpVorgeschrieben.Value = myAviso.Vorgeschrieben + dtpVorgeschriebenZeit.Value = myAviso.Vorgeschrieben + End If - txtDauer.Text = Minuten_auf_Text(myAviso.Dauer) - cbxHandling.Checked = myAviso.Handling - cbxSammelakt.Checked = myAviso.Sammelakt - txtSendungen.Text = myAviso.Sendungen_Gesamtanzahl - If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False + txtDauer.Text = Minuten_auf_Text(myAviso.Dauer) + cbxHandling.Checked = myAviso.Handling + cbxSammelakt.Checked = myAviso.Sammelakt + txtSendungen.Text = myAviso.Sendungen_Gesamtanzahl + If myAviso.Status <> cGlobal.Status_Erfasst Then txtInfo.Enabled = False - 'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso") + 'optOhneAviso.Checked = txtÄnderungen.Text.Contains("Neuanlage Ankunft ohne Aviso") - 'Status anzeigen + 'Status anzeigen - Select Case hStatus - Case cGlobal.Status_Ankunft - lblStatus.Text = "Ankunft" - If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm") - lblStatus.ForeColor = Color.Blue - optAnkunft.Checked = True - Case cGlobal.Status_Erfasst - lblStatus.Text = "erfasst" - lblStatus.ForeColor = Color.Red - optErfasst.Checked = True - Case cGlobal.Status_Freigegeben - lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm") - lblStatus.ForeColor = Color.Green - btnOK.Enabled = bearb - optFreigegeben.Checked = True - Case cGlobal.Status_NichtEingetroffen - lblStatus.Text = "LKW nicht eingetroffen" - lblStatus.ForeColor = Color.DarkGray - btnOK.Enabled = bearb - optNichtEingetroffen.Checked = True - Case cGlobal.Status_Vorbereitet - lblStatus.Text = "Vorbereitet" - lblStatus.ForeColor = Color.Brown - btnOK.Enabled = bearb - optVorbereitet.Checked = True - Case cGlobal.Status_Vorgeschrieben - lblStatus.Text = "Vorgeschrieben" - lblStatus.ForeColor = Color.Purple - btnOK.Enabled = bearb - optVorgeschrieben.Checked = True - Case Else - lblStatus.Text = "" - End Select - lblStatus.Text = " " & lblStatus.Text & " " 'für bessere farbliche Hervorhebung + Select Case hStatus + Case cGlobal.Status_Ankunft + lblStatus.Text = "Ankunft" + If myAviso.Ankunft <> LeerDatum Then lblStatus.Text += " " & Format(myAviso.Ankunft, "dd.MM. HH:mm") + lblStatus.ForeColor = Color.Blue + optAnkunft.Checked = True + Case cGlobal.Status_Erfasst + lblStatus.Text = "erfasst" + lblStatus.ForeColor = Color.Red + optErfasst.Checked = True + Case cGlobal.Status_Freigegeben + lblStatus.Text = "Freigabe " & Format(myAviso.Freigabe, "dd.MM. HH:mm") + lblStatus.ForeColor = Color.Green + btnOK.Enabled = bearb + optFreigegeben.Checked = True + Case cGlobal.Status_NichtEingetroffen + lblStatus.Text = "LKW nicht eingetroffen" + lblStatus.ForeColor = Color.DarkGray + btnOK.Enabled = bearb + optNichtEingetroffen.Checked = True + Case cGlobal.Status_Vorbereitet + lblStatus.Text = "Vorbereitet" + lblStatus.ForeColor = Color.Brown + btnOK.Enabled = bearb + optVorbereitet.Checked = True + Case cGlobal.Status_Vorgeschrieben + lblStatus.Text = "Vorgeschrieben" + lblStatus.ForeColor = Color.Purple + btnOK.Enabled = bearb + optVorgeschrieben.Checked = True + Case Else + lblStatus.Text = "" + End Select + lblStatus.Text = " " & lblStatus.Text & " " 'für bessere farbliche Hervorhebung cboFirma.changeItem("") cboFirma.changeItem(myAviso.FIRMA) If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_ZeitenBearbeiten", "SDL") Then - panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten - End If + panAdmin.Visible = bearb 'Administrator bekommt mehr Edit-Möglichkeiten + End If 'Vorpapier laden UsrCntlAviso_Vorpapiere1.setVorpapiere(myAviso) - ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then + ' If FIRMA_TMP = "IMEX" Then txtBestimmungszollstelle.SET_VALUE(If(myAviso.Zollstelle, "")) cbxWarenort.Checked = myAviso.Warenort ' End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then - cbxAktenzettelDrucken.Checked = AktenzetteldruckenVisible - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.SET_VALUE(If(myAviso.Durchgangszollstelle1, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.SET_VALUE(If(myAviso.Durchgangszollstelle2, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.SET_VALUE(If(myAviso.Durchgangszollstelle3, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.SET_VALUE(If(myAviso.Durchgangszollstelle4, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.SET_VALUE(If(myAviso.Durchgangszollstelle5, "")) - UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.SET_VALUE(If(myAviso.Durchgangszollstelle6, "")) - UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = "" + If FIRMA_TMP = "ATILLA" Then + cbxAktenzettelDrucken.Checked = AktenzetteldruckenVisible + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.SET_VALUE(If(myAviso.Durchgangszollstelle1, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.SET_VALUE(If(myAviso.Durchgangszollstelle2, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle3.SET_VALUE(If(myAviso.Durchgangszollstelle3, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle4.SET_VALUE(If(myAviso.Durchgangszollstelle4, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle5.SET_VALUE(If(myAviso.Durchgangszollstelle5, "")) + UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle6.SET_VALUE(If(myAviso.Durchgangszollstelle6, "")) + UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = "" - If myAviso.Ausgangszollstelle IsNot Nothing Then - For Each s In myAviso.Ausgangszollstelle.split(";") - Select Case s - Case "KA" : UsrCntlEintragAvisoAtilla.rbtnKaptainAndreevo.Checked = True - Case "L" : UsrCntlEintragAvisoAtilla.rbtnLesovo.Checked = True - Case "BB" : UsrCntlEintragAvisoAtilla.rbtnBatrovici.Checked = True - Case "HR" : UsrCntlEintragAvisoAtilla.rbtnHorgos.Checked = True - Case "TK" : UsrCntlEintragAvisoAtilla.rbtnTompa.Checked = True - Case "T" : UsrCntlEintragAvisoAtilla.rbtnTrieste.Checked = True - Case "KI" : UsrCntlEintragAvisoAtilla.rbtnKipi.Checked = True - Case "TS" : UsrCntlEintragAvisoAtilla.rbtnTovarnik.Checked = True - Case Else : If s <> "" Then UsrCntlEintragAvisoAtilla.rbtnAndere.Checked = True : UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = s - End Select - Next + If myAviso.Ausgangszollstelle IsNot Nothing Then + For Each s In myAviso.Ausgangszollstelle.split(";") + Select Case s + Case "KA" : UsrCntlEintragAvisoAtilla.rbtnKaptainAndreevo.Checked = True + Case "L" : UsrCntlEintragAvisoAtilla.rbtnLesovo.Checked = True + Case "BB" : UsrCntlEintragAvisoAtilla.rbtnBatrovici.Checked = True + Case "HR" : UsrCntlEintragAvisoAtilla.rbtnHorgos.Checked = True + Case "TK" : UsrCntlEintragAvisoAtilla.rbtnTompa.Checked = True + Case "T" : UsrCntlEintragAvisoAtilla.rbtnTrieste.Checked = True + Case "KI" : UsrCntlEintragAvisoAtilla.rbtnKipi.Checked = True + Case "TS" : UsrCntlEintragAvisoAtilla.rbtnTovarnik.Checked = True + Case Else : If s <> "" Then UsrCntlEintragAvisoAtilla.rbtnAndere.Checked = True : UsrCntlEintragAvisoAtilla.txtAusgangszstAndere.Text = s + End Select + Next + End If + + + UsrCntlEintragAvisoAtilla.txtTransporttemp.Text = If(myAviso.TransportTemperatur, "") + UsrCntlEintragAvisoAtilla.txtZugmaschine.Text = If(myAviso.Zugmaschine, "") + Dim sndId = ADMIN.getValueTxtBySql("SELECT TOP 1 isnull(tblSnd_SendungID,-1) FROM [tblSendungen] WHERE [tblSnd_AvisoID]=" & myAviso.AvisoID, "AVISO") + If IsNumeric(sndId) AndAlso sndId > 0 Then + TMP_SND_Atilla = New VERAG_PROG_ALLGEMEIN.cSendungen(sndId) + End If + If TMP_SND_Atilla IsNot Nothing Then + UsrCntlEintragAvisoAtilla.txtWarenbezeichnung.Text = If(TMP_SND_Atilla.tblSnd_Warenbezeichnung, "") + UsrCntlEintragAvisoAtilla.txtColli.Text = If(TMP_SND_Atilla.tblSnd_Colli, "") + UsrCntlEintragAvisoAtilla.txtGewicht.Text = If(TMP_SND_Atilla.tblSnd_Gewicht, "") + UsrCntlEintragAvisoAtilla.txtAnmerkung.Text = If(TMP_SND_Atilla.tblSnd_Anmerkung, "") + + + If TMP_SND_Atilla.tblSnd_AuftraggeberKdNr > 0 Then + kdAuftraggeber.KdNr = TMP_SND_Atilla.tblSnd_AuftraggeberKdNr + Else + kdAuftraggeber.Text = TMP_SND_Atilla.tblSnd_Auftraggeber End If - - UsrCntlEintragAvisoAtilla.txtTransporttemp.Text = If(myAviso.TransportTemperatur, "") - UsrCntlEintragAvisoAtilla.txtZugmaschine.Text = If(myAviso.Zugmaschine, "") - Dim sndId = ADMIN.getValueTxtBySql("SELECT TOP 1 isnull(tblSnd_SendungID,-1) FROM [tblSendungen] WHERE [tblSnd_AvisoID]=" & myAviso.AvisoID, "AVISO") - If IsNumeric(sndId) AndAlso sndId > 0 Then - TMP_SND_Atilla = New VERAG_PROG_ALLGEMEIN.cSendungen(sndId) - End If - If TMP_SND_Atilla IsNot Nothing Then - UsrCntlEintragAvisoAtilla.txtWarenbezeichnung.Text = If(TMP_SND_Atilla.tblSnd_Warenbezeichnung, "") - UsrCntlEintragAvisoAtilla.txtColli.Text = If(TMP_SND_Atilla.tblSnd_Colli, "") - UsrCntlEintragAvisoAtilla.txtGewicht.Text = If(TMP_SND_Atilla.tblSnd_Gewicht, "") - UsrCntlEintragAvisoAtilla.txtAnmerkung.Text = If(TMP_SND_Atilla.tblSnd_Anmerkung, "") - - - If TMP_SND_Atilla.tblSnd_AuftraggeberKdNr > 0 Then - kdAuftraggeber.KdNr = TMP_SND_Atilla.tblSnd_AuftraggeberKdNr - Else - kdAuftraggeber.Text = TMP_SND_Atilla.tblSnd_Auftraggeber - End If - - End If End If End If + End If - If bearb Then Me.Text += " (Verwaltung)" + If bearb Then Me.Text += " (Verwaltung)" hÄnderung = False @@ -585,7 +588,7 @@ Public Class frmEintragAviso lblSendungsanzahl.Visible = False lblErrVorraussuchtlEintreffen.Visible = False - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + If FIRMA_TMP = "VERIMEX" Then If cboFirma._value = "" Then MsgBox("Firma auswählen!", vbInformation) cboFirma.Focus() @@ -650,7 +653,7 @@ Public Class frmEintragAviso End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then + If FIRMA_TMP <> "ATILLA" Then If cboGrenzstelle._value.Trim = "" Then ' MsgBox("Bitte die Grenzstelle eingegeben.", vbInformation) lblErr_Grenzstelle.Visible = True @@ -845,7 +848,7 @@ Public Class frmEintragAviso myAviso.letzterMitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter myAviso.TeamId = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If FIRMA_TMP = "ATILLA" Then myAviso.Grenzstelle = "SUB" Else myAviso.Grenzstelle = cboGrenzstelle._value @@ -855,7 +858,7 @@ Public Class frmEintragAviso myAviso.Transportmittelart = cboTransportmittelart._value - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + If FIRMA_TMP = "AMBAR" Then myAviso.Grenzstelle = "AMB" End If @@ -954,7 +957,7 @@ Public Class frmEintragAviso myAviso.Sammelakt = (myAviso.Sendungen_Gesamtanzahl > 1) 'cbxSammelakt.Checked End If - myAviso.FIRMA = If(cboFirma._value <> "", cboFirma._value, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) + myAviso.FIRMA = If(cboFirma._value <> "", cboFirma._value, FIRMA_TMP) myAviso.Cluster = If(VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER, "") @@ -1027,7 +1030,7 @@ Public Class frmEintragAviso AvisoStatusFunctions.insertVermerkAllg(tmpId, "ATB-Nr. folgt", 80) End If - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Select Case FIRMA_TMP Case "ATILLA" Try 'ATILLA AKTENZETTEL DRUCKEN @@ -1068,7 +1071,7 @@ Public Class frmEintragAviso Dim abfArt As Object = DBNull.Value getFilialeAndAbfertNrIMEX(cnt, filiale_tmp, abfnr_tmp, fremd, abfArt) - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then filiale_tmp = 0 + If FIRMA_TMP = "VERIMEX" Then filiale_tmp = 0 'IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0) 'AvisoDAL.insertSendungEmpty(tmpId, scnt, filiale_tmp, abfnr_tmp, 0) ' INSERT Dim tblSnd_AuftraggeberKdNr As Object = Nothing @@ -1174,7 +1177,7 @@ Public Class frmEintragAviso Try System.Diagnostics.Process.Start(hMail) Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,,"Beim Mail-Versenden ist ein Fehler aufgetreten") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Beim Mail-Versenden ist ein Fehler aufgetreten") End Try End If End If @@ -1672,10 +1675,10 @@ Public Class frmEintragAviso Private Sub cboGrenzstelle_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboGrenzstelle.SelectedIndexChanged pnl.Visible = False - ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED") - Label1.Visible = (cboGrenzstelle._value = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED") + ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") + Label1.Visible = (cboGrenzstelle._value = "WAI" Or FIRMA_TMP = "IMEX" Or FIRMA_TMP = "UNISPED") - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Select Case FIRMA_TMP Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX", "AMBAR" If cboGrenzstelle._value = "???" Then diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index a596e32..0157726 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,12 +24,12 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -232,6 +232,7 @@ Partial Class frmHauptfenster Me.lblSuche = New System.Windows.Forms.Label() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.pnlLinks = New System.Windows.Forms.Panel() + Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label7 = New System.Windows.Forms.Label() Me.lblErrVermerk = New System.Windows.Forms.Label() @@ -244,8 +245,9 @@ Partial Class frmHauptfenster Me.Label22 = New System.Windows.Forms.Label() Me.Button12 = 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.SplitContainer3 = New System.Windows.Forms.SplitContainer() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) @@ -329,6 +331,7 @@ Partial Class frmHauptfenster Me.EUTaricToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components) Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.Top.SuspendLayout() @@ -341,6 +344,7 @@ Partial Class frmHauptfenster CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlLinksOben.SuspendLayout() + Me.cntxtAtilla.SuspendLayout() CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer3.Panel1.SuspendLayout() Me.SplitContainer3.Panel2.SuspendLayout() @@ -591,7 +595,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(119, 6) ' 'FirmaWechselnToolStripMenuItem ' @@ -798,7 +802,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(252, 6) ' 'ToolStripMenuItem3 ' @@ -849,7 +853,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(252, 6) ' 'DAKOSYToolStripMenuItem ' @@ -867,7 +871,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(252, 6) ' 'SDLAbholaufträgeToolStripMenuItem ' @@ -938,7 +942,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(231, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(153, 6) ' 'BürgschafrtsbuchungenFremdToolStripMenuItem ' @@ -955,7 +959,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(231, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(153, 6) ' 'SDLAuswertungenToolStripMenuItem ' @@ -991,7 +995,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(181, 6) ' 'ToolStripMenuItem2 ' @@ -1089,7 +1093,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(181, 6) ' 'VerzollungsunterlagenToolStripMenuItem ' @@ -1106,7 +1110,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(181, 6) ' 'WAIDHAUSToolStripMenuItem ' @@ -1148,7 +1152,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(274, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(181, 6) ' 'EinheitspapierToolStripMenuItem ' @@ -1193,7 +1197,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(246, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(163, 6) ' 'TicketIBFInlandBorderFacilitiesToolStripMenuItem ' @@ -1217,7 +1221,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(246, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(163, 6) ' 'FREnveloppeSmartBorderToolStripMenuItem ' @@ -1229,7 +1233,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(246, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(163, 6) ' 'PBNIrelandFähreToolStripMenuItem ' @@ -1241,7 +1245,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(246, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(163, 6) ' 'WARENORTToolStripMenuItem ' @@ -1265,7 +1269,7 @@ Partial Class frmHauptfenster 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(170, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(112, 6) ' 'DEFormular0442ToolStripMenuItem ' @@ -1295,12 +1299,12 @@ Partial Class frmHauptfenster 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(170, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(112, 6) ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(246, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(163, 6) ' 'EORIUKGeneriertenToolStripMenuItem ' @@ -1746,12 +1750,12 @@ Partial Class frmHauptfenster 'lblMitarbeiter ' Me.lblMitarbeiter.AutoSize = True - Me.lblMitarbeiter.BackColor = System.Drawing.Color.White - Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + 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(393, 4) + Me.lblMitarbeiter.Location = New System.Drawing.Point(2, 184) Me.lblMitarbeiter.Name = "lblMitarbeiter" - Me.lblMitarbeiter.Size = New System.Drawing.Size(168, 17) + Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) Me.lblMitarbeiter.TabIndex = 1 Me.lblMitarbeiter.Text = "Max Mustermann (Admin)" Me.lblMitarbeiter.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1759,12 +1763,12 @@ Partial Class frmHauptfenster 'lblGrenzstelle ' Me.lblGrenzstelle.AutoSize = True - Me.lblGrenzstelle.BackColor = System.Drawing.Color.White - Me.lblGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblGrenzstelle.BackColor = System.Drawing.SystemColors.Control + 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(569, 4) + Me.lblGrenzstelle.Location = New System.Drawing.Point(143, 199) Me.lblGrenzstelle.Name = "lblGrenzstelle" - Me.lblGrenzstelle.Size = New System.Drawing.Size(36, 17) + Me.lblGrenzstelle.Size = New System.Drawing.Size(29, 13) Me.lblGrenzstelle.TabIndex = 0 Me.lblGrenzstelle.Text = "SUB" Me.lblGrenzstelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1911,23 +1915,38 @@ Partial Class frmHauptfenster Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) Me.SplitContainer2.Panel2MinSize = 650 Me.SplitContainer2.Size = New System.Drawing.Size(884, 300) - Me.SplitContainer2.SplitterDistance = 216 + Me.SplitContainer2.SplitterDistance = 231 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 ' 'pnlLinks ' + Me.pnlLinks.Controls.Add(Me.lblFimaAviso) Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Controls.Add(Me.Label20) Me.pnlLinks.Controls.Add(Me.picAVISOMessenger) Me.pnlLinks.Controls.Add(Me.lblVersion) Me.pnlLinks.Controls.Add(Me.pic) + Me.pnlLinks.Controls.Add(Me.lblMitarbeiter) + Me.pnlLinks.Controls.Add(Me.lblGrenzstelle) Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlLinks.Location = New System.Drawing.Point(0, 86) Me.pnlLinks.Name = "pnlLinks" - Me.pnlLinks.Size = New System.Drawing.Size(216, 214) + Me.pnlLinks.Size = New System.Drawing.Size(231, 214) Me.pnlLinks.TabIndex = 0 ' + 'lblFimaAviso + ' + Me.lblFimaAviso.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblFimaAviso.AutoSize = True + 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(67, 199) + Me.lblFimaAviso.Name = "lblFimaAviso" + Me.lblFimaAviso.Size = New System.Drawing.Size(63, 13) + Me.lblFimaAviso.TabIndex = 11 + Me.lblFimaAviso.Text = "XXXXXXXX" + ' 'Panel2 ' Me.Panel2.Controls.Add(Me.Label7) @@ -1938,7 +1957,7 @@ Partial Class frmHauptfenster Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(216, 111) + Me.Panel2.Size = New System.Drawing.Size(231, 111) Me.Panel2.TabIndex = 10 ' 'Label7 @@ -1960,7 +1979,7 @@ Partial Class frmHauptfenster Me.lblErrVermerk.ForeColor = System.Drawing.Color.Red Me.lblErrVermerk.Location = New System.Drawing.Point(12, 158) Me.lblErrVermerk.Name = "lblErrVermerk" - Me.lblErrVermerk.Size = New System.Drawing.Size(190, 27) + Me.lblErrVermerk.Size = New System.Drawing.Size(205, 27) Me.lblErrVermerk.TabIndex = 1 Me.lblErrVermerk.Text = "Bei diesem Status kann kein Vermerk erfasst werden!" Me.lblErrVermerk.TextAlign = System.Drawing.ContentAlignment.BottomLeft @@ -1983,7 +2002,7 @@ Partial Class frmHauptfenster Me.Label20.BackColor = System.Drawing.Color.Red Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label20.ForeColor = System.Drawing.Color.White - Me.Label20.Location = New System.Drawing.Point(49, 182) + Me.Label20.Location = New System.Drawing.Point(49, 160) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(28, 19) Me.Label20.TabIndex = 9 @@ -1997,7 +2016,7 @@ Partial Class frmHauptfenster Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand - Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 134) + Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 112) Me.picAVISOMessenger.Name = "picAVISOMessenger" Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) Me.picAVISOMessenger.TabIndex = 7 @@ -2010,7 +2029,7 @@ Partial Class frmHauptfenster Me.lblVersion.AutoSize = True 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(3, 201) + Me.lblVersion.Location = New System.Drawing.Point(3, 199) Me.lblVersion.Name = "lblVersion" Me.lblVersion.Size = New System.Drawing.Size(47, 13) Me.lblVersion.TabIndex = 6 @@ -2035,7 +2054,7 @@ Partial Class frmHauptfenster Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0) Me.pnlLinksOben.Name = "pnlLinksOben" - Me.pnlLinksOben.Size = New System.Drawing.Size(216, 86) + Me.pnlLinksOben.Size = New System.Drawing.Size(231, 86) Me.pnlLinksOben.TabIndex = 1 ' 'Label22 @@ -2069,6 +2088,7 @@ Partial Class frmHauptfenster ' 'btnNeu ' + Me.btnNeu.ContextMenuStrip = Me.cntxtAtilla Me.btnNeu.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnNeu.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnNeu.ForeColor = System.Drawing.Color.Black @@ -2083,6 +2103,19 @@ Partial Class frmHauptfenster Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnNeu.UseVisualStyleBackColor = True ' + 'cntxtAtilla + ' + Me.cntxtAtilla.ImageScalingSize = New System.Drawing.Size(24, 24) + Me.cntxtAtilla.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem17}) + Me.cntxtAtilla.Name = "cntxt" + Me.cntxtAtilla.Size = New System.Drawing.Size(112, 26) + ' + 'ToolStripMenuItem17 + ' + Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" + Me.ToolStripMenuItem17.Size = New System.Drawing.Size(111, 22) + Me.ToolStripMenuItem17.Text = "ATILLA" + ' 'SplitContainer3 ' Me.SplitContainer3.Dock = System.Windows.Forms.DockStyle.Fill @@ -2096,19 +2129,10 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(667, 300) - Me.SplitContainer3.SplitterDistance = 167 + Me.SplitContainer3.Size = New System.Drawing.Size(652, 300) + Me.SplitContainer3.SplitterDistance = 162 Me.SplitContainer3.TabIndex = 3 ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - 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(167, 300) - Me.UsrCntlBenachrichtigungen1.TabIndex = 0 - ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -2117,7 +2141,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(496, 300) + Me.pnl.Size = New System.Drawing.Size(486, 300) Me.pnl.TabIndex = 0 ' 'Button10 @@ -2141,8 +2165,8 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle7.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Top @@ -2151,7 +2175,7 @@ Partial Class frmHauptfenster Me.gridMyAviso.ReadOnly = True Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(496, 277) + Me.gridMyAviso.Size = New System.Drawing.Size(486, 277) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 @@ -2169,7 +2193,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(496, 21) + Me.Panel6.Size = New System.Drawing.Size(486, 21) Me.Panel6.TabIndex = 1 ' 'lblMeineAviso @@ -2195,7 +2219,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(177, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(167, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 @@ -2205,7 +2229,7 @@ Partial Class frmHauptfenster Me.Label18.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label18.AutoSize = True Me.Label18.ForeColor = System.Drawing.Color.White - Me.Label18.Location = New System.Drawing.Point(109, 4) + Me.Label18.Location = New System.Drawing.Point(99, 4) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(62, 13) Me.Label18.TabIndex = 25 @@ -2216,7 +2240,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(53, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(43, 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 @@ -2230,7 +2254,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(439, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(429, 3) Me.cboMy_QS.Name = "cboMy_QS" Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 @@ -2244,7 +2268,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(460, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(450, 3) Me.cboMy_VB.Name = "cboMy_VB" Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 @@ -2262,7 +2286,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(296, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(286, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 @@ -2272,7 +2296,7 @@ Partial Class frmHauptfenster Me.Label17.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label17.AutoSize = True Me.Label17.ForeColor = System.Drawing.Color.White - Me.Label17.Location = New System.Drawing.Point(247, 3) + Me.Label17.Location = New System.Drawing.Point(237, 3) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(48, 13) Me.Label17.TabIndex = 20 @@ -2282,7 +2306,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(825, 6) + Me.lblAkte.Location = New System.Drawing.Point(815, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -2317,7 +2341,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(753, 0) + Me.tabVorgeschrieben.Size = New System.Drawing.Size(145, 0) Me.tabVorgeschrieben.TabIndex = 3 Me.tabVorgeschrieben.Text = "3.Vorgeschrieben" ' @@ -2328,7 +2352,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(753, 0) + Me.tabFreigegeben.Size = New System.Drawing.Size(145, 0) Me.tabFreigegeben.TabIndex = 5 Me.tabFreigegeben.Text = "5. Freigegeben" ' @@ -2339,7 +2363,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(753, 0) + Me.tabNichtEingetroffen.Size = New System.Drawing.Size(145, 0) Me.tabNichtEingetroffen.TabIndex = 6 Me.tabNichtEingetroffen.Text = "Nicht eingetroffen" ' @@ -2350,7 +2374,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(753, 0) + Me.tabAnkunft.Size = New System.Drawing.Size(145, 0) Me.tabAnkunft.TabIndex = 4 Me.tabAnkunft.Text = "4. Ankunft" ' @@ -2361,7 +2385,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(753, 0) + Me.tabVorbereitet.Size = New System.Drawing.Size(145, 0) Me.tabVorbereitet.TabIndex = 2 Me.tabVorbereitet.Text = "2.Vorbereitet QS" ' @@ -2414,7 +2438,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(753, 0) + Me.tabAlle.Size = New System.Drawing.Size(217, 0) Me.tabAlle.TabIndex = 0 Me.tabAlle.Text = "Alle" ' @@ -2425,7 +2449,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(753, 0) + Me.tabErfasst.Size = New System.Drawing.Size(876, 0) Me.tabErfasst.TabIndex = 1 Me.tabErfasst.Text = "1. Erfasst" ' @@ -2446,7 +2470,7 @@ 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(761, 33) + Me.tbcntrAviso.Size = New System.Drawing.Size(884, 32) Me.tbcntrAviso.TabIndex = 10 ' 'SplitContainer1 @@ -2514,47 +2538,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle8.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle2.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle9.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle9.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle3.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle4 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 208) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle11 + DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle5 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle12 + DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle6 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3167,6 +3191,15 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' + 'UsrCntlBenachrichtigungen1 + ' + Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill + 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(162, 300) + Me.UsrCntlBenachrichtigungen1.TabIndex = 0 + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3176,8 +3209,6 @@ Partial Class frmHauptfenster Me.Controls.Add(Me.pnlOptionen) Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.UsrCntlTestsystem1) - Me.Controls.Add(Me.lblGrenzstelle) - Me.Controls.Add(Me.lblMitarbeiter) Me.Controls.Add(Me.lblDauer) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.Top) @@ -3206,6 +3237,7 @@ Partial Class frmHauptfenster CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlLinksOben.ResumeLayout(False) + Me.cntxtAtilla.ResumeLayout(False) Me.SplitContainer3.Panel1.ResumeLayout(False) Me.SplitContainer3.Panel2.ResumeLayout(False) CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit() @@ -3538,4 +3570,7 @@ Partial Class frmHauptfenster Friend WithEvents ChecklisteWOCHECKLISTEZEallgemein As ToolStripMenuItem Friend WithEvents WOCECKLISTEZEWDHToolStripMenuItem As ToolStripMenuItem Friend WithEvents WOCECKLISTEAbgangVerwahrungsortZVToolStripMenuItem As ToolStripMenuItem + Friend WithEvents cntxtAtilla As ContextMenuStrip + Friend WithEvents ToolStripMenuItem17 As ToolStripMenuItem + Friend WithEvents lblFimaAviso As Label End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index c49ef8f..9bc720a 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -171,6 +171,9 @@ 598, 17 + + 1217, 11 + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -225,9 +228,6 @@ pOTzPwAAAABJRU5ErkJggg== - - 598, 17 - 697, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 9a112e5..abcc82f 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -170,6 +170,8 @@ Public Class frmHauptfenster ' FIMRA_COLOR = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor 'End Select + lblFimaAviso.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Panel1.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor Panel6.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor pnlSearch.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor @@ -410,8 +412,11 @@ Public Class frmHauptfenster 'Mitarbeiterinfos anzeigen VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter += "/" & SystemInformation.UserName.ToString lblMitarbeiter.Text = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then + ' lblMitarbeiter.Text += " (Verwaltung)Then" + 'End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then - lblMitarbeiter.Text += " (Verwaltung)Then" + lblMitarbeiter.Text += " (" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & ")" End If lblGrenzstelle.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim @@ -1885,13 +1890,19 @@ Public Class frmHauptfenster End Sub - Private Sub btnNeu_Click(sender As System.Object, e As System.EventArgs) Handles btnNeu.Click + Private Sub btnNeu_Click(sender As System.Object, e As System.EventArgs) Handles btnNeu.Click, ToolStripMenuItem17.Click Try + Me.Cursor = Cursors.WaitCursor gridAviso.ClearSelection() gridMyAviso.ClearSelection() Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim f As New frmEintragAviso + + If sender Is ToolStripMenuItem17 Then + f.FIRMA_TMP = "ATILLA" + End If + VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0 ' f.frmHilf = Me If Not f.IsDisposed And f IsNot Nothing And Not frmGrayOut.IsDisposed And frmGrayOut IsNot Nothing Then @@ -2553,6 +2564,16 @@ Public Class frmHauptfenster End Function Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + + + Dim list = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(717858, CDate("01.10.2021"), CDate("31.10.2021")) '{5}) + + For Each d In list + MsgBox(d.RechnungsDatum & " - " & d.RechnungsName_1) + Next + + + 'VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolderCat("C:\Users\test01\Desktop\TEST.pdf", "12345", "", "Import ab Jänner 2021", "Import ab Jänner 2021") Dim mailTo = "al@verag.ag" Dim betreff = "Betreff - TESTMAIL" @@ -2560,13 +2581,6 @@ Public Class frmHauptfenster VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailTo, betreff, htmlBody, , False, False) Exit Sub - Dim dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", 717858, ) '{5}) - - For Each d In dt.Rows - MsgBox(d("LKW_Nr") & " - " & d("Status")) - Next - - Exit Sub CHMRC.hmrcTEST() @@ -3004,12 +3018,14 @@ Public Class frmHauptfenster Panel1.Height -= pnlSearch.Height Panel1.Height += tbcntrAviso.Height tbcntrAviso.Visible = True + Me.Refresh() Aviso_anzeigen("") Else pnlSearch.Visible = True Panel1.Height += pnlSearch.Height Panel1.Height -= tbcntrAviso.Height tbcntrAviso.Visible = False + Me.Refresh() initDat() gridAviso.Columns.Clear() cboFiliale.fillWithSQL("SELECT FilialenNr, cast(FilialenNr as varchar(4)) + ' ' + Grenzstelle FROM Filialen WHERE Fil_Status='A' ORDER BY FilialenNr ", True, "FMZOLL", True) @@ -3789,6 +3805,14 @@ Public Class frmHauptfenster Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VORLAGEN", "SONSTIGE", "", "", "WOCECKLISTEAbgangVerwahrungsortZV") DS.OPEN_SINGLE() End Sub + + + + Private Sub cntxtAtilla_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cntxtAtilla.Opening + ToolStripMenuItem17.Visible = (VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") + End Sub + + End Class Public Class AvisoStatusFunctions diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index f8ebbe1..b465b39 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -85,14 +85,17 @@ Public Class frmLogin Dim WI = System.Security.Principal.WindowsIdentity.GetCurrent().Name If WI.Contains("\") Then Dim Split() = WI.Split("\") - Dim UsernameTMP = ADMIN.getUstName_ByAD(Split(0), Split(1)) - If UsernameTMP <> "" Then - Dim firmaTmp = ADMIN.getValueTxtBySql("SELECT mit_firma FROM [tblMitarbeiter] where [mit_username] = '" & UsernameTMP & "' AND mit_firma NOT IN ('BEIDE','ALLE','ALL') ", "ADMIN") - If firmaTmp <> "" Then - firma = firmaTmp + 'Dim UsernameTMP = ADMIN.getUstName_ByAD(Split(0), Split(1)) + Dim firmaTmp = ADMIN.getUstFirma_ByAD(Split(0), Split(1)) + If firmaTmp = "" Then + Dim UsernameTMP = ADMIN.getUstName_ByAD(Split(0), Split(1)) ' Eig nicht mehr nötig... + If UsernameTMP <> "" Then + firmaTmp = ADMIN.getValueTxtBySql("SELECT isnull(mit_firma,'') FROM [tblMitarbeiter] where [mit_username] = '" & UsernameTMP & "' AND mit_firma NOT IN ('BEIDE','ALLE','ALL') ", "ADMIN") End If End If - + If firmaTmp <> "" Then + firma = firmaTmp + End If End If Catch ex As Exception diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index a9911f3..a1a329d 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -1970,7 +1970,6 @@ Public Class usrcntlAktDetails DirectCast(r.Cells("SendungFakturiert"), DataGridViewImageCell).ToolTipText = "Sendung fakturiert" End If - 'If VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG = "QS" Then ' If r.Cells("tblSnd_QS_MA").Value = VERAG_PROG_ALLGEMEIN.cAllgemein.USRID Then ' DirectCast(r.Cells("Abgeklaert"), DataGridViewImageCell).Value = My.Resources.abgeklaertAktiv diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 5ccee5d..20227a5 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -448,7 +448,7 @@ Public Class usrcntlAktDetailsATILLANeu End Sub Sub initAnhaenge() - Dim hSQL As String = " SELECT [anh_id],[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] + Dim hSQL As String = " SELECT [anh_id],anh_Datum,[anh_Name],[anh_docId],[anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] WHERE [anh_AvisoId]='" & AvisoID & "' AND isnull(anh_SendungsId,0) <=0 ORDER BY case @@ -469,7 +469,7 @@ Public Class usrcntlAktDetailsATILLANeu when [anh_Art] = 'Sonstiges' then 99 when [anh_Art] ='' then 15 - END, [anh_Reihenfolge],[anh_id]" + END, [anh_Reihenfolge], anh_Datum desc, [anh_id]" ' order by [anh_Reihenfolge],[anh_id] dgvanhaenge.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL) @@ -484,17 +484,22 @@ Public Class usrcntlAktDetailsATILLANeu .Columns("anh_id").Visible = False 'VermerkID nicht anzeigenconMenuVermerke .Columns("anh_docId").Visible = False 'AvisoID nicht anzeigen + .Columns("anh_Datum").MinimumWidth = 50 + .Columns("anh_Datum").HeaderText = "Datum" + .Columns("anh_Datum").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + + .Columns("anh_Name").MinimumWidth = 150 .Columns("anh_Name").HeaderText = "Name" .Columns("anh_Name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("anh_Art").MinimumWidth = 50 .Columns("anh_Art").HeaderText = "Art" - .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter .Columns("anh_Typ").Width = 60 .Columns("anh_Typ").HeaderText = "Typ" - .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopCenter + .Columns("anh_Art").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter End With diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index a29fd7f..d79a4e3 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -290,6 +290,9 @@ Always + + +