edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2022-09-01 16:11:12 +02:00
parent 7f5057dc3e
commit 4b6d595a89
48 changed files with 1650 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VERAG_PROG_ALLGEMEIN/Classes/SQL.vb
View File

@@ -593,7 +593,9 @@ Public Class SQL
Return defaultReturn
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & conn.ConnectionString, System.Reflection.MethodInfo.GetCurrentMethod.Name & sql)
Dim connstr = ""
If conn IsNot Nothing Then connstr = conn.ConnectionString
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & connstr, System.Reflection.MethodInfo.GetCurrentMethod.Name & sql)
End Try
'MsgBox("3")
Return defaultReturn

3
VERAG_PROG_ALLGEMEIN/Classes/cAdressen.vb
View File

@@ -227,6 +227,9 @@ Public Class cAdressen
Public Function doesOrdnungsbegriffExist() As Boolean
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL(False)

11
VERAG_PROG_ALLGEMEIN/Classes/cEmailBenachrichtigung.vb
View File

@@ -197,6 +197,17 @@ Public Class cEmailBenachrichtigung
End Select
End Function
Public Shared Function getBCCEmail() As String
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "IMEX" : Return "noreply@imex-group.at"
Case "ATILLA" : Return "noreply@verag.ag"
Case "UNISPED" : Return "No-Reply@unisped.at"
Case "FRONTOFFICE" : Return "noreply@front-office.eu"
Case "AMBAR" : Return "" '"noreply@verag.ag"
Case Else : Return "noreply@verag.ag"
End Select
End Function
Shared Sub eMails_einlesenOLD(hFrächter_kdnr As String, hAuftraggeber_kdnr As String, art As Integer, ByRef Emails As String, ByRef Emails_CC As String, ByRef Emails_BCC As String, ByRef Emails_list_sent As VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigungList)
'ART:
'1=Ankunft

3
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -4,6 +4,7 @@
Public Class cMitarbeiter
Property mit_id As Integer
Property mit_username As String = ""
Property mit_abweichenderAnzeigename As String = ""
Property mit_pwd As String = ""
Property mit_geschlecht As String = ""
Property mit_affix As String = ""
@@ -110,6 +111,7 @@ Public Class cMitarbeiter
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_id", mit_id,, True, True))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_username", mit_username))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_abweichenderAnzeigename", mit_abweichenderAnzeigename))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_pwd", mit_pwd))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_geschlecht", mit_geschlecht))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_affix", mit_affix))
@@ -298,6 +300,7 @@ Public Class cMitarbeiter
Try
Me.mit_id = dr.Item("mit_id")
Me.mit_username = dr.Item("mit_username")
Me.mit_abweichenderAnzeigename = dr.Item("mit_abweichenderAnzeigename")
Me.mit_pwd = dr.Item("mit_pwd")
Me.mit_affix = dr.Item("mit_affix")
If Not dr.Item("mit_geschlecht") Is DBNull.Value Then Me.mit_geschlecht = dr.Item("mit_geschlecht")

5
VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb
View File

@@ -792,7 +792,10 @@ Public Class cSMS
'Keine Übermittlung.
Dim MaId As Integer = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & Me.sms_AvisoId & "' ", "AVISO", -1)
If MaId > 0 Then
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(Me.sms_AvisoId, Nothing, 3, "B", MaId, "*WhatsApp Fehler*", 0, "", "Fehler bei der WhatsApp Übermittlung: " & If(Me.sms_Failure, ""))
Dim absenderFirma = ""
VERAG_PROG_ALLGEMEIN.cSMS.GET_AccountInfo(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, Me.sms_Account, absenderFirma)
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(Me.sms_AvisoId, Nothing, 3, "B", MaId, "*WhatsApp Fehler*", 0, "", "Fehler bei der WhatsApp Übermittlung: " & If(Me.sms_Failure, ""),,, absenderFirma)
End If
End Select

5
VERAG_PROG_ALLGEMEIN/Classes/cVorauskasse.vb
View File

@@ -149,14 +149,15 @@ Public Class cVorauskasse
Public Shared Function LOADByFilialeAbfNr(FilialeNr As Integer, AbfertigungsNr As Integer, Optional vk_Rolle As String = "") As cVorauskasse
Public Shared Function LOADByFilialeAbfNr(FilialeNr As Integer, AbfertigungsNr As Integer, Optional vk_Rolle As String = "", Optional vk_KdNr As String = "") As cVorauskasse
Try
Dim VK As New cVorauskasse
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblVorauskassen WHERE vk_AbfertigungsNr=@vk_AbfertigungsNr AND vk_FilialeNr=@vk_FilialeNr " & If(If(vk_Rolle, "") <> "", "AND vk_Rolle=@vk_Rolle ", ""), conn)
Using cmd As New SqlCommand("SELECT * FROM tblVorauskassen WHERE vk_AbfertigungsNr=@vk_AbfertigungsNr AND vk_FilialeNr=@vk_FilialeNr " & If(If(vk_Rolle, "") <> "", "AND vk_Rolle=@vk_Rolle ", "") & If(If(vk_KdNr, "") <> "", "AND vk_KdNr=@vk_KdNr ", ""), conn)
cmd.Parameters.AddWithValue("@vk_FilialeNr", FilialeNr)
cmd.Parameters.AddWithValue("@vk_AbfertigungsNr", AbfertigungsNr)
cmd.Parameters.AddWithValue("@vk_Rolle", vk_Rolle)
cmd.Parameters.AddWithValue("@vk_KdNr", vk_KdNr)
Dim dr = cmd.ExecuteReader()
If dr.Read Then
For Each li In VK.getParameterList()