AddInn erweitert (Hibzufügeb von Verträge und Gestellungsgarantien).
This commit is contained in:
@@ -35,7 +35,7 @@ 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
|
||||
LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
|
||||
|
||||
End Sub
|
||||
@@ -144,6 +144,7 @@ Public Class AVISO_Mail_Functions
|
||||
Dim SendungsId = -1
|
||||
Dim Art = ""
|
||||
Dim kdNr = -1
|
||||
Dim enableOverwritting = False
|
||||
Dim ATTACHMENTS_LIST As New List(Of String)
|
||||
loadAttachment(mailItem, ATTACHMENTS_LIST)
|
||||
|
||||
@@ -155,7 +156,7 @@ Public Class AVISO_Mail_Functions
|
||||
Dim Bezeichnung = strFileName
|
||||
Dim AvisoId = Nothing
|
||||
|
||||
AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender) '
|
||||
AvisoId = getAvisoId(Bezeichnung, pdf_mail, SendungsId, Art, ATTACHMENTS_LIST, kdNr, sender, enableOverwritting) '
|
||||
|
||||
If AvisoId < 0 Then Exit Sub
|
||||
|
||||
@@ -170,7 +171,7 @@ Public Class AVISO_Mail_Functions
|
||||
saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender,, kdNr)
|
||||
saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
|
||||
ElseIf pdf_mail = "ONLYPDF_DATENSERVER" Then
|
||||
saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr)
|
||||
saveAttachmentOnDatenserver(ATTACHMENTS_LIST, AvisoId, BezAnhang, sender, kdNr, enableOverwritting)
|
||||
ElseIf pdf_mail = "ONLYMAIL_DATENSERVER" Then
|
||||
saveMailOnDatenserver(mailItem, AvisoId, Bezeichnung, sender, , kdNr)
|
||||
Else 'ONLYMAIL
|
||||
@@ -418,7 +419,7 @@ Public Class AVISO_Mail_Functions
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
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)
|
||||
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.
|
||||
@@ -427,7 +428,7 @@ Public Class AVISO_Mail_Functions
|
||||
Dim Bezeichnung = BezeichnungAnh
|
||||
If Bezeichnung = "" Then Bezeichnung = fi.Name
|
||||
|
||||
uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr)
|
||||
uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting)
|
||||
|
||||
Next
|
||||
End If
|
||||
@@ -631,7 +632,7 @@ Public Class AVISO_Mail_Functions
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional sender As Object = Nothing, Optional saveAttachments As Boolean = True, Optional kdNr As Integer = -1)
|
||||
Shared Sub saveMailOnDatenserver(mailItem As Outlook.MailItem, AvisoId As Integer, Optional bezeichnung As String = "", Optional sender As Object = Nothing, Optional saveAttachments As Boolean = True, Optional kdNr As Integer = -1, Optional enableOverwritting As Boolean = False)
|
||||
Try
|
||||
If AvisoId > 0 Then
|
||||
|
||||
@@ -642,7 +643,7 @@ Public Class AVISO_Mail_Functions
|
||||
mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG)
|
||||
|
||||
|
||||
uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr)
|
||||
uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting)
|
||||
|
||||
' Clean up the temporary .MSG file from the user's temporary folder
|
||||
System.IO.File.Delete(strTmpPath)
|
||||
@@ -657,7 +658,7 @@ 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) As Integer
|
||||
Shared Function getAvisoId(ByRef Bezeichnung, ByRef pdf_mail, ByRef SendungsId, ByRef Art, ByRef Att, ByRef kdNr, ByVal sender, ByRef enableOverwritting) As Integer
|
||||
|
||||
|
||||
Select Case sender.name
|
||||
@@ -686,6 +687,7 @@ Public Class AVISO_Mail_Functions
|
||||
Bezeichnung = frmAvisoFormularAnfuegen.Bezeichnung
|
||||
pdf_mail = frmAvisoFormularAnfuegen.PDF_MAIL
|
||||
Att = frmAvisoFormularAnfuegen.ATT
|
||||
enableOverwritting = frmAvisoFormularAnfuegen.enableOverwritting
|
||||
|
||||
Return AvisoId
|
||||
|
||||
@@ -700,7 +702,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)
|
||||
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)
|
||||
|
||||
If sender Is Nothing Then
|
||||
Exit Sub
|
||||
@@ -721,14 +723,13 @@ Public Class AVISO_Mail_Functions
|
||||
Else
|
||||
c.kdvm_emailId = DS.da_id
|
||||
End If
|
||||
|
||||
c.SAVE()
|
||||
End If
|
||||
|
||||
Case "btnVertraege"
|
||||
|
||||
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr)
|
||||
Dim path = DS.uploadDataToDATENSERVER(strTmpPath)
|
||||
Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
|
||||
If path Then
|
||||
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
|
||||
KV.kv_datenarchivId = DS.da_id
|
||||
@@ -740,7 +741,7 @@ Public Class AVISO_Mail_Functions
|
||||
|
||||
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 path = DS.uploadDataToDATENSERVER(strTmpPath)
|
||||
Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
|
||||
If path Then
|
||||
gg.gg_datenarchivId = DS.da_id
|
||||
gg.SAVE()
|
||||
|
||||
Reference in New Issue
Block a user