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

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-05-14 22:05:29 +02:00
parent 57d030605a 2f3400bc6d
commit 0d3e625005
9 changed files with 212 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
View File

@@ -736,7 +736,6 @@ Public Class cMessenger
Public Class cMessenger_ChatMessages
Property chatMg_id As Integer ' INT Not NULL PRIMARY KEY IDENTITY,
Property chatMg_chatId As Integer ' INT Not NULL,
Property chatMg_maId As Integer ' INT Not NULL,
Property chatMg_datetime As Date = Now
@@ -771,7 +770,6 @@ Public Class cMessenger
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_datetime", chatMg_datetime))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_maName", chatMg_maName))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_maFirma", chatMg_maFirma))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_type", chatMg_type))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_text", chatMg_text))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("chatMg_anhang_docId", chatMg_anhang_docId))
@@ -920,7 +918,7 @@ Public Class cMessenger
Try
Me.CHAT_MESSAGES_STATUS_LIST.Clear()
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id ", conn)
Using cmd As New SqlCommand("SELECT chatMgSt_MaId FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMg_id ", conn)
cmd.Parameters.AddWithValue("@chatMg_id", Me.chatMg_id)
Dim dr = cmd.ExecuteReader()
While dr.Read
@@ -1021,7 +1019,7 @@ Public Class cMessenger
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT chatMgSt_chatMsgId FROM tblMessenger_ChatMessageStatus WHERE chatMgSt_chatMsgId=@chatMgSt_chatMsgId AND chatMgSt_MaId=@chatMgSt_MaId ) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &

6
VERAG_PROG_ALLGEMEIN/Classes/cSDL.vb
View File

@@ -61,11 +61,11 @@ Public Class cSDL
Property Archiviert As Boolean = False
Property LKWAbgemeldet As Boolean = False
Property LKWAbgemeldetAM As Object = Nothing
Property Fahrer As Object = Nothing
Property Kaution As Object = Nothing
Property BelegNr As Object = Nothing
Property Nationalitaet As Object = Nothing
Property CO2Kategorie As Object = Nothing
Public hasentry
Dim SQL As New SQL
@@ -154,6 +154,8 @@ Public Class cSDL
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Fahrer", Fahrer))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Kaution", Kaution))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BelegNr", BelegNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Nationalitaet", Nationalitaet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("CO2Kategorie", CO2Kategorie))
Return list
End Function