diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb index 9fed8ee2..75c2a87d 100644 --- a/SDL/USTV/usrCntlUSTV.vb +++ b/SDL/USTV/usrCntlUSTV.vb @@ -1419,12 +1419,25 @@ Public Class usrCntlUSTV Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Dim sqlKunde = "" - Dim sqlKundeadmin = "" + Dim whereStr = "" If KdSearchBox1.KdNr > 0 Then sqlKunde = " And AdressenNr = " & KdSearchBox1.KdNr End If + If cboJahr._value <> "" Then + If cboJahrBis._value <> "" Then + whereStr &= " AND tblUStVAntrag.UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND tblUStVAntrag.UStVAn_ReDatBis<='31.12." & cboJahrBis._value & "' " + Else + whereStr &= " AND tblUStVAntrag.UStVAn_ReDatVon>='01.01." & cboJahr._value & "' AND tblUStVAntrag.UStVAn_ReDatBis<='31.12." & cboJahr._value & "' " + End If + End If + + If txtSucheID.Text <> "" AndAlso IsNumeric(txtSucheID.Text) AndAlso txtSucheID.Text > 0 Then + whereStr &= " AND UStVAn_ID=" & txtSucheID.Text & " " + End If + + If MyComboBox1._value <> "" Then whereStr &= " AND dbo.Adressen.LandKz='" & MyComboBox1._value & "' " Dim sqlQery = "SELECT dbo.tblUStVAntrag.UStVAn_ID, dbo.tblUStVAntrag.UStVAn_KuNr, dbo.tblUStVAntrag.UStVAn_ReDatVon, @@ -1443,13 +1456,17 @@ Public Class usrCntlUSTV WHERE dbo.tblUStVErstattung.UStVAn_ID = dbo.tblUStVAntrag.UStVAn_ID), 0) ELSE 0 END AS UStVAn_VZBetragAktuell FROM dbo.tblUStVAntrag INNER JOIN dbo.Adressen ON dbo.tblUStVAntrag.UStVAn_KuNr = dbo.Adressen.AdressenNr - WHERE (dbo.tblUStVAntrag.UStVAn_VZBetrag IS NOT NULL)" & IIf(sqlKunde <> "", sqlKunde, "") + WHERE (dbo.tblUStVAntrag.UStVAn_VZBetrag IS NOT NULL)" & IIf(sqlKunde <> "", sqlKunde, "") & whereStr Dim dtVorauszahlung As DataTable = SQL.loadDgvBySql(sqlQery, "FMZOLL") ContextMenuStrip3.Hide() - If dtVorauszahlung.Rows.Count = 0 Then Exit Sub + If dtVorauszahlung.Rows.Count = 0 Then + MsgBox("keine Daten!") + Exit Sub + End If + cProgramFunctions.genExcelFromDT_NEW(dtVorauszahlung,,,,,, True)