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

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

Browse Source
This commit is contained in:
d.breimaier
2022-11-25 11:42:21 +01:00
parent 22778c3d15 7b0acd449d
commit abbf016761
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aviso/frmHauptfenster.vb
View File

@@ -1106,13 +1106,13 @@ Public Class frmHauptfenster
If cboMyAvisoAnzeige._value <> "" Then
If cboMyAvisoAnzeige._value = "ALLE" Then
' inBearbeitungSQL = " 1=1 " 'ALLE
inBearbeitungSQL = " ( tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') OR Aviso.[TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "') OR tblSendungen.LetzterMitarbeiterId=@maId) "
inBearbeitungSQL = " ( (tblSendungen.[tblSnd_TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "')) OR (Aviso.[TeamId] IN (SELECT [team_id] FROM [ADMIN].[dbo].[tblTeams] WHERE [team_firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND tblSendungen.[tblSnd_TeamId] is null)) OR tblSendungen.LetzterMitarbeiterId=@maId) "
ElseIf cboMyAvisoAnzeige._value = "T1" Then
inBearbeitungSQL = " tblSnd_Abfertigungsart_ID=5 "
'NUR VERAG/IMEX:
inBearbeitungSQL &= " AND FilialenNr IN (SELECT FilialenNr FROM " & VERAG_PROG_ALLGEMEIN.cAllgemein.FMZOLL_SERVER & ".VERAG.dbo.Filialen WHERE Filialen.FilialenNr=tblSendungen.FilialenNr and Filialen.Firma IN ('VERAG','IMEX')) "
ElseIf cboMyAvisoAnzeige._value <> "Benutzer" And IsNumeric(cboMyAvisoAnzeige._value) Then
inBearbeitungSQL = " (Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
inBearbeitungSQL = " ((Aviso.[TeamId]= " & cboMyAvisoAnzeige._value & " AND tblSendungen.[tblSnd_TeamId] is null) OR tblSendungen.[tblSnd_TeamId]= " & cboMyAvisoAnzeige._value & " OR tblSendungen.LetzterMitarbeiterId=@maId) "
End If
End If