From 2cc645cc2ffa5ef3364848edab1ed5397ee6e663 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 11 Feb 2026 13:30:41 +0100 Subject: [PATCH] AddIn --- VERAGAddIn/VERAGAddIn.vbproj | 2 +- VERAGAddIn/frmAvisoAnfügen.Designer.vb | 5 +- VERAGAddIn/frmAvisoAnfügen.vb | 8 +- VERAGAddIn/rbnMailItem.Designer.vb | 3 +- VERAGAddIn/rbnVERAG.vb | 103 +++++++++++++++++++------ 5 files changed, 90 insertions(+), 31 deletions(-) diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 50d4e4c..a880cf8 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -36,7 +36,7 @@ \\ftps.verag.ag\g\FTP\Programme\VeragAddin\ http://ftps.verag.ag/VERAGAddin/ de - 1.0.1.134 + 1.0.1.135 true true 0 diff --git a/VERAGAddIn/frmAvisoAnfügen.Designer.vb b/VERAGAddIn/frmAvisoAnfügen.Designer.vb index 78b8a7c..6a677b7 100644 --- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb +++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb @@ -259,7 +259,8 @@ Partial Class frmAvisoAnfuegen Me.dgvAnhaenge.AllowUserToDeleteRows = False Me.dgvAnhaenge.AllowUserToResizeColumns = False Me.dgvAnhaenge.AllowUserToResizeRows = False - Me.dgvAnhaenge.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Me.dgvAnhaenge.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dgvAnhaenge.BackgroundColor = System.Drawing.Color.White Me.dgvAnhaenge.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize @@ -571,8 +572,8 @@ Partial Class frmAvisoAnfuegen Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents Label5 As Windows.Forms.Label Friend WithEvents btnVermerke As Windows.Forms.Button - Friend WithEvents usrcntrVermerke As AVISO.rCntrlVermerke Friend WithEvents CheckBox2 As Windows.Forms.CheckBox Friend WithEvents CheckBox3 As Windows.Forms.CheckBox Friend WithEvents lblInfo As Windows.Forms.Label + Public WithEvents usrcntrVermerke As AVISO.rCntrlVermerke End Class diff --git a/VERAGAddIn/frmAvisoAnfügen.vb b/VERAGAddIn/frmAvisoAnfügen.vb index 7177e08..f70feb0 100644 --- a/VERAGAddIn/frmAvisoAnfügen.vb +++ b/VERAGAddIn/frmAvisoAnfügen.vb @@ -1,8 +1,6 @@ Imports System.Diagnostics Imports System.Windows.Forms Imports AVISO -Imports VERAG_PROG_ALLGEMEIN -Imports VERAG_PROG_ALLGEMEIN.VERAG_OUT_EZA Public Class frmAvisoAnfuegen @@ -14,6 +12,7 @@ Public Class frmAvisoAnfuegen Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL Public ATT As List(Of String) + Public INFO As String = "" Sub New(Bezeichnung, Art) @@ -272,6 +271,11 @@ Public Class frmAvisoAnfuegen Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() Dim sv As New AVISO.frmAddSendungsvermerkShort(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value, Me.SendungsId) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value) + + If INFO <> "" Then + sv.txtDetail.Text = INFO + End If + sv.Location = Me.PointToClient(Cursor.Position) sv.ShowDialog(frmGrayOut) frmGrayOut.Close() diff --git a/VERAGAddIn/rbnMailItem.Designer.vb b/VERAGAddIn/rbnMailItem.Designer.vb index fd74683..7e2ad2d 100644 --- a/VERAGAddIn/rbnMailItem.Designer.vb +++ b/VERAGAddIn/rbnMailItem.Designer.vb @@ -41,6 +41,7 @@ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.Tab1 = Me.Factory.CreateRibbonTab Me.Group1 = Me.Factory.CreateRibbonGroup Me.Button1 = Me.Factory.CreateRibbonButton @@ -51,7 +52,7 @@ Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton Me.btnInfo = Me.Factory.CreateRibbonButton Me.btnUnsichtbar = Me.Factory.CreateRibbonButton - Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon() + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) Me.Tab1.SuspendLayout() Me.Group1.SuspendLayout() Me.SuspendLayout() diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 98fb763..eff14bd 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -6,6 +6,8 @@ Imports System.Reflection Imports System.Runtime.InteropServices Imports System.Text.RegularExpressions Imports System.Windows.Forms +Imports AVISO + 'Imports System.Windows.Forms.LinkLabel Imports HtmlAgilityPack Imports Microsoft.Office.Interop @@ -35,8 +37,8 @@ Public Class VERAGRibbon Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load - cAllgemein.TESTSYSTEM = False - 'cAllgemein.TESTSYSTEM = True + 'cAllgemein.TESTSYSTEM = False + cAllgemein.TESTSYSTEM = True LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() End Sub @@ -162,10 +164,11 @@ Public Class AVISO_Mail_Functions Dim kdNr = -1 Dim enableOverwritting = False Dim ATTACHMENTS_LIST As New List(Of String) + Dim INFO As String = "" loadAttachment(mailItem, ATTACHMENTS_LIST) If isMail_EKOL(mailItem) Then - If vbYes = MsgBox("DFDS-Anhänge laden?", vbYesNoCancel) Then getATT_DFDS(mailItem, ATTACHMENTS_LIST) + If vbYes = MsgBox("DFDS-Anhänge laden?", vbYesNoCancel) Then getATT_DFDS(mailItem, ATTACHMENTS_LIST,,, INFO) End If If isMail_Barsan(mailItem) Then @@ -175,7 +178,7 @@ Public Class AVISO_Mail_Functions Dim Bezeichnung = strFileName Dim AvisoId = Nothing - AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender, enableOverwritting) ' + AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender, enableOverwritting, INFO) ' If AvisoId < 0 Then Exit Sub @@ -387,6 +390,7 @@ Public Class AVISO_Mail_Functions Dim ATTACHMENTS_LIST As New List(Of String) Dim KundenNr = -1 Dim EingangsDatum As Date = CDate("01.01.1990") + Dim INFO As String = "" If mailItem IsNot Nothing Then @@ -409,7 +413,7 @@ Public Class AVISO_Mail_Functions KundenNr = cKundenKontakte.getKdNrFromMailAdress(senderMail, False) ' false, wenn mehrere Niederlassungen von Frimen im KdStamm vorhanden... falsche KdNr... If isMail_EKOL(mailItem) Then - If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST) + If vbYes = MsgBox("DFDS-Anhänge laden?", vbYesNoCancel) Then getATT_DFDS(mailItem, ATTACHMENTS_LIST,,, INFO) End If 'End If @@ -422,7 +426,7 @@ Public Class AVISO_Mail_Functions cGlobal.Aktive_ID = 0 - Dim mainForm As New AVISO.frmEintragAviso + Dim mainForm As New AVISO.frmEintragAviso(INFO) mainForm.ATT = ATTACHMENTS_LIST If KundenNr > 0 Then AddHandler mainForm.Shown, Sub() @@ -432,11 +436,25 @@ Public Class AVISO_Mail_Functions If EingangsDatum > CDate("01.01.1990") Then mainForm.EingangsDatum = EingangsDatum End If + + If INFO <> "" Then + If mainForm.txtÄnderungen.Text <> "" Then + mainForm.txtÄnderungen.Text &= vbNewLine & INFO + Else + mainForm.txtÄnderungen.Text = INFO + End If + End If + + mainForm.lblAnhaenge.Text &= ATTACHMENTS_LIST.Count + mainForm.TopMost = True mainForm.StartFromOUTLOOK = True mainForm.ShowDialog() ATTACHMENTS_LIST = mainForm.ATT + + + If cGlobal.Aktive_ID > 0 Then saveAttachment(ATTACHMENTS_LIST, cGlobal.Aktive_ID, -1, art, "") @@ -700,7 +718,6 @@ Public Class AVISO_Mail_Functions Dim doc As New HtmlAgilityPack.HtmlDocument() doc.LoadHtml(mailItem.HTMLBody) - ' all data rows (skip header) Dim rows = doc.DocumentNode.SelectNodes("//tr[td]") If rows Is Nothing Then Return dt @@ -728,41 +745,60 @@ Public Class AVISO_Mail_Functions Dim counter As Integer = 1 Dim sendungsNrOld As String = "" + Dim missingDocuments As String = "" For Each r In dt.Rows If r("LinkUrl") <> "" AndAlso r("LinkUrl").ToString.Contains("https://web01.ekoltransport.com.tr/dfdsdocumentservice/download/") Then + Dim link As String = r("LinkUrl") + + If link.EndsWith("%20") And link.Length > 3 Then + link = link.Remove(link.Length - 3) + End If + Dim sendungsNr As String = r("Record") - Dim Descr As String = r("Description") + Dim Descr As String = r("Description") - If Descr <> "" Then - Descr.ToString.Replace(";", "_") - Descr.ToString.Replace(".", "_") - Descr.ToString.Replace(" ", "_") - Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr) - End If + If Descr <> "" Then + Descr = Descr.ToString.Replace(";", "_") + Descr = Descr.ToString.Replace(".", "_") + Descr = Descr.ToString.Replace(" ", "_") + Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr) + End If - If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then - counter = 1 - End If + If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then + counter = 1 + End If - Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("LinkUrl"), r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False) + Dim file = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream(link, r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False) + + If IO.File.Exists(file) Then + ATT.Add(file) + + Else + If missingDocuments <> "" Then + missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") + Else + missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") + End If + End If - If IO.File.Exists(pdf) Then - ATT.Add(pdf) counter += 1 + + sendungsNrOld = r("Record") + End If - sendungsNrOld = r("Record") - - End If - Next + If missingDocuments <> "" Then + INFO = missingDocuments + End If + Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -942,13 +978,18 @@ Public Class AVISO_Mail_Functions End Sub - Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByRef kdNr, ByVal sender, ByRef enableOverwritting) As Integer + Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByRef kdNr, ByVal sender, ByRef enableOverwritting, Optional ByRef INFO = "") As Integer Select Case sender.name Case "btnAvisoMail", "btnAvisoMail2" Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung, Art) frmAvisoAnfügen.ATT = Att + If INFO <> "" Then + MsgBox(INFO) + frmAvisoAnfügen.INFO = INFO + End If + If frmAvisoAnfügen.ShowDialog = DialogResult.OK Then Dim AvisoId = frmAvisoAnfügen.AvisoId SendungsId = frmAvisoAnfügen.SendungsId @@ -957,9 +998,21 @@ Public Class AVISO_Mail_Functions Art = frmAvisoAnfügen.cboArt._value Att = frmAvisoAnfügen.ATT + Dim VermerkeDAL As New cVermerkeDAL + Dim myVermerk As New cVermerk + myVermerk.VermerkID = 0 + myVermerk.AvisoID = frmAvisoAnfügen.AvisoId + myVermerk.SendungID = SendungsId + myVermerk.Datum = Now + myVermerk.Mitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter + myVermerk.MitarbeiterId = cGlobal.AktiverMitarbeiter.MitarbeiterID + myVermerk.Hinweis_Vermerk = INFO + myVermerk.VermerkCodeId = 123 + VermerkeDAL.SpeichernVermerk(myVermerk) Return AvisoId End If + Return -1 Case Else