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

Vorauskasse

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-12-04 11:56:08 +01:00
parent e0676d2a2a
commit 6ca88da90c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aviso/usrcntlAktDetails.vb
View File

@@ -876,7 +876,7 @@ Public Class usrcntlAktDetails
End Sub End Sub
Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," &
" CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" & " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,14,25,28,29,30,35,46,47,59,94,78,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben, Datum as DatumValue" &
" FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " &
" LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " &
" WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " & " WHERE AvisoID = [[AvisoId]] [[sendwhere]] AND HintergrundVermerk =0 " &
@@ -1201,7 +1201,7 @@ Public Class usrcntlAktDetails
init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
Case "46" Case "46"
MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText) ' MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText)
init = False 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() init = False 'Vermerke_anzeigen(RowIndex)': initDgvSendungen()
Case "36" Case "36"
@@ -1572,7 +1572,7 @@ Public Class usrcntlAktDetails
Select Case code Select Case code
Case 59 Case 59
Return True Return True
Case 2, 4, 6, 8, 10, 12, 14, 30, 37, 34 Case 2, 4, 6, 8, 10, 12, 30, 37, 34
If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then If text = "" Or DirectCast(r.Cells("Hinweis_Vermerk"), DataGridViewTextBoxCell).Value.ToString.Replace("erhalten", "angefordert") = text Then
Return True Return True
End If End If