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

fix AVISO-Sendungschat

Browse Source
This commit is contained in:
d.breimaier
2026-03-03 11:08:57 +01:00
parent 5149713da7
commit 05d2c29d44
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
View File

@@ -1220,7 +1220,7 @@ Public Class cAvisoDAL
Return daten
End Function
Public Function Suche_LKW(LKW_Nr As String) As String
Public Function Suche_LKW(ByRef LKW_Nr As String, ByRef Optional avisoID As Integer = 1) As String
'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
@@ -1236,7 +1236,9 @@ Public Class cAvisoDAL
If CDate(VarToDate(dr.Item("Datum"))) > Now.AddDays(-4) Then
Suche_LKW = "Achtung: der LKW mit der Nr. " & LKW_Nr & " wurde bereits vor kurzem eingetragen - und zwar am " &
Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
avisoID = CInt(dr.Item("AvisoID"))
End If
End If
dr.Close()
End Using
@@ -1245,7 +1247,7 @@ Public Class cAvisoDAL
Return Suche_LKW
End Function
Public Function Suche_LKWStatus(LKW_Nr As String) As String
Public Function Suche_LKWStatus(ByRef LKW_Nr As String, Optional ByRef AVISOID As Integer = -1) As String
'hier wird nachgesehen, wann diese LKW-Nr zuletzt eingetragen war
Suche_LKWStatus = ""
@@ -1269,6 +1271,7 @@ Public Class cAvisoDAL
dr.Read()
Suche_LKWStatus = "Achtung: der LKW mit der Nr. " & LKW_Nr & " existiert bereits mit dem Status '" & cGlobal.getStatusText(VarToInt2(dr.Item("Status"))) & "', Eingetragen, am " &
Format(CDate(VarToDate(dr.Item("Datum"))), "ddd, dd.MM.yyyy - HH:mm")
AVISOID = CInt(dr.Item("AvisoID"))
End If
dr.Close()
End Using

2
VERAG_PROG_ALLGEMEIN/Classes/cMessenger.vb
View File

@@ -326,7 +326,7 @@ Public Class cMessenger
Public Sub LOAD_ByLKW(chat_AvisoId As Integer, chat_SendungsId As Integer, chat_art As String, Optional topMax As String = "", Optional dateTmp As Object = Nothing)
Try
Using conn As SqlConnection = SQL.GetNewOpenConnectionADMIN()
Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
Using cmd As New SqlCommand("Select * FROM tblMessenger_Chat WHERE chat_AvisoId=@chat_AvisoId " & If(chat_SendungsId > 0, " AND chat_SendungsId=@chat_SendungsId ", "") & " AND chat_art='" & chat_art & "'", conn)
cmd.Parameters.AddWithValue("@chat_AvisoId", chat_AvisoId)
cmd.Parameters.AddWithValue("@chat_SendungsId", chat_SendungsId)
cmd.Parameters.AddWithValue("@chat_art", chat_art)

7
VERAG_PROG_ALLGEMEIN/Schnittstellen/cDatev_Interface.vb
View File

@@ -16,7 +16,7 @@ Public Class cDatev_Interface
'STAMMDATEN
Shared Function getStammdaten(filialNr As Integer) As DataTable
Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ, isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse], isnull(Adressen.landkz,'') as [Länderkennzeichen]"
Dim sqlStr = "Select right([KundenNrZentrale],5) As [Kontonummer], isnull([Ordnungsbegriff],'') as Ordnungsbegriff, isnull([Name 1],'') as Name, isnull([Name 2],'') as Name2, LTRIM([Ort]) as Ort,KundenNr As [Kundennummer],isnull(UstIdKz,'') As [EU-Land] ,isnull(UstIdNr,'') As [EU-UstID], isnull(Anrede,'') as Anrede,isnull(KTO,'') as Bankkonto, isnull(BLZ,'') as [BLZ], '' as [Bankname], '' as [Länderkennzeichen Bank], '' as [IBAN], '' as [BIC], '' as [Anrede], '' as [Adresszusatz], ISNULL([Strasse],'') as Strasse, ISNULL(PLZ,'') as PLZ, isnull(UstIdNr,'') as [Steuernummer], isnull(Ansprechpartner,'') as [Ansprechpartner], isnull(Telefon,'') as [Telefonnummer], isnull([E-Mail],'') as [E-Mail], isnull([Telefax],'') as [Faxnummer], '' as [Internetadresse], isnull(Adressen.landkz,'') as [Länderkennzeichen], isnull(Kunden.Zahlungsziel, 10) as ZahlungszielInTagen"
sqlStr &= " FROM Adressen INNER JOIN Kunden ON Kundennr=AdressenNr "
sqlStr &= " LEFT JOIN tblKundenErweitert ON KundenNr=kde_KundenNr "
sqlStr &= " LEFT JOIN [Länderverzeichnis für die Außenhandelsstatistik] as St ON St.LandKz=Adressen.LandKz "
@@ -76,7 +76,10 @@ Public Class cDatev_Interface
personenRow &= FormatStringDVO(row("Bankkonto")) & ";"
personenRow &= emptyFormatedValue()
personenRow &= FormatStringDVO(row("IBAN")) & ";"
personenRow &= emptyFormatedValue(197)
personenRow &= emptyFormatedValue(65)
personenRow &= FormatStringDVO(row("ZahlungszielInTagen")) & ";"
personenRow &= emptyFormatedValue(144)
Return personenRow