This commit is contained in:
2025-12-31 09:01:21 +01:00
parent 03018f0390
commit b24d57cd2a
4 changed files with 33 additions and 27 deletions

View File

@@ -463,13 +463,14 @@ Public Class AVISO_Mail_Functions
Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, BezeichnungAnh As String, Optional sender As Object = Nothing, Optional kdNr As Integer = -1, Optional enableOverwritting As Boolean = False)
Try
If AvisoId > 0 Then
If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" ' nur wenn 1 Anhang wird die Bezeichnung übernommen.
Dim multifiles As Boolean = False
If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" : multifiles = True ' nur wenn 1 Anhang wird die Bezeichnung übernommen.
For Each ATT In ATTACHMENTS_LIST
Dim fi As New IO.FileInfo(ATT)
Dim Bezeichnung = BezeichnungAnh
If Bezeichnung = "" Then Bezeichnung = fi.Name
uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting)
uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting, multifiles)
Next
End If
@@ -499,7 +500,7 @@ Public Class AVISO_Mail_Functions
End While
'Dim iof As New IO.FileInfo(attachment.PathName)
Dim fileName As String = attachment.FileName
fileName = Left(Regex.Replace(fileName, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_")
fileName = Right(Regex.Replace(fileName, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_")
fileName = fileName.Replace("""", "")
fileName = fileName.Replace("", "")
fileName = fileName.Replace("", "")
@@ -801,7 +802,6 @@ Public Class AVISO_Mail_Functions
mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG)
uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting)
' Clean up the temporary .MSG file from the user's temporary folder
@@ -861,7 +861,7 @@ Public Class AVISO_Mail_Functions
Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1, Optional enableOverweriting As Boolean = False)
Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1, Optional enableOverweriting As Boolean = False, Optional multifiles As Boolean = False)
If sender Is Nothing Then
Exit Sub
@@ -873,7 +873,7 @@ Public Class AVISO_Mail_Functions
Select Case button.Name
Case "btnVollmachten"
Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr)
Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr, multifiles)
Dim path = DS.uploadDataToDATENSERVER(strTmpPath)
If path Then
Dim c As New cKundenVollmachten(AvisoId)
@@ -887,7 +887,7 @@ Public Class AVISO_Mail_Functions
Case "btnVertraege"
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr)
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr, multifiles)
Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
If path Then
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
@@ -899,7 +899,7 @@ Public Class AVISO_Mail_Functions
Case "btnGestellungsgarantien"
Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(AvisoId)
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr)
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr, multifiles)
Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
If path Then
gg.gg_datenarchivId = DS.da_id