NCTS 5

Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb

@@ -34,12 +34,18 @@ Public Class usrCntlBenachrichtigungen
 
                 Dim whereMA = " AND  ( 1<>1 "
 
+                'WARENORT
+                If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then
+                    whereMA &= " OR (ab_TO_Art='W' AND ab_TO_Code='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "') "
 
-                If cbxNeukunden.Checked Then
+                    'NEUKUNDEN
+                ElseIf cbxNeukunden.Checked Then
                     Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
                         Case "VERAG"
                             whereMA &= " OR (ab_TO_Art='T' AND ab_TO_Code='13') " 'TEAM_NEUKUNDEN --> VERAG
                     End Select
+
+                    'SONST
                 Else
 
                     If cbxCluster.Checked Then
@@ -66,13 +72,14 @@ Public Class usrCntlBenachrichtigungen
                         End If
                     End If
 
+
+
                 End If
 
                 whereMA &= " ) "
 
                 Dim sqlStr As String = "SELECT tblAvisoBenachrichtigungen.*, LKW_Nr, Status  FROM [tblAvisoBenachrichtigungen] INNER JOIN AVISO on AvisoId=ab_AvisoID WHERE ab_status=0 " & whereMA & "  ORDER BY CASE WHEN ANKUNFT <'01.01.2001' THEN '01.01.2999' ELSE ANKUNFT end ASC,ab_Datum ASC"
 
-
                 Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
                 ' List.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("maId", VERAG_PROG_ALLGEMEIN.cAllgemein.USRID))
                 'If VERAGSQL Is Nothing Then VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL '? vlt hilfts...