CBAM

SDL/OriginalArchiv_ATR/frmOriginalArchiv_ATR.vb

@@ -20,6 +20,13 @@ Public Class frmOriginalArchiv_ATR
         txtAbfertDat.Text = Now.ToShortDateString 'CDate("01." & Now.ToString("MM.yyyy")).AddMonths(-1).ToShortDateString
         txtAbfertDatBis.Text = Now.ToShortDateString
 
+
+        cboDatum.Items.Clear()
+        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausstellungs-Datum", "ADat"))
+        cboDatum.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Erhalten-Datum", "EDat"))
+        cboDatum.changeItem("ADat")
+
+
         btnMonat.Text = MONAT.ToString("MMMM")
         btnJahr.Text = JAHR.Year
 
@@ -148,14 +155,28 @@ Public Class frmOriginalArchiv_ATR
     Function getWhere() As String
         Dim sqlstr = ""
 
-        If txtAbfertDat.Text <> "" Then
-            If txtAbfertDatBis.Text <> "" Then
-                sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @DatumBis) "
-            Else
-                sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @Datum ) "
+
+        If cboDatum._value = "ADat" Then
+
+            If txtAbfertDat.Text <> "" Then
+                If txtAbfertDatBis.Text <> "" Then
+                    sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @DatumBis) "
+                Else
+                    sqlstr &= " AND ([atr_austellungsdatum] BETWEEN @Datum AND @Datum ) "
+                End If
+            End If
+        ElseIf cboDatum._value = "EDat" Then
+
+            If txtAbfertDat.Text <> "" Then
+                If txtAbfertDatBis.Text <> "" Then
+                    sqlstr &= " AND ([atr_erhalenDatum] BETWEEN @Datum AND @DatumBis) "
+                Else
+                    sqlstr &= " AND ([atr_erhalenDatum] BETWEEN @Datum AND @Datum ) "
+                End If
             End If
         End If
 
+
         If txtSuche._value <> "" Then
             sqlstr &= " AND ( "
             sqlstr &= " atr_documentNr LIKE '" & txtSuche._value & "%' OR "