From 6276aee28f50cd8e435940de9f262765fd74bb99 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Wed, 12 Mar 2025 17:01:52 +0100
Subject: [PATCH] Fremdrechnungen, offeneAntraege

---
 SDL/USTV/frmUSTVoffeneAntraege.vb | 26 ++++++++++++++++++++++++++
 SDL/mdm/usrcntlFremdrechnungen.vb |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/SDL/USTV/frmUSTVoffeneAntraege.vb b/SDL/USTV/frmUSTVoffeneAntraege.vb
index 33ad27a9..4421bce3 100644
--- a/SDL/USTV/frmUSTVoffeneAntraege.vb
+++ b/SDL/USTV/frmUSTVoffeneAntraege.vb
@@ -1,4 +1,5 @@
 Imports System.Windows.Documents
+Imports com.sun.org.apache.bcel.internal.generic
 Imports com.sun.org.apache.xpath.internal.objects
 Imports DocumentFormat.OpenXml.Drawing.Spreadsheet
 Imports VERAG_PROG_ALLGEMEIN
@@ -10,6 +11,7 @@ Public Class frmUSTVoffeneAntraege
     Dim datumVon As Date = Nothing
     Dim kdNr As Integer = -1
     Dim kdName As String
+    Dim dtkeineMWST As DataTable
     Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
         initLieferant("PLOSE", sender)
     End Sub
@@ -536,6 +538,19 @@ Public Class frmUSTVoffeneAntraege
             sqlwhereLand &= " and isnull(UStVAn_ID,0) = 0 "
         End If
 
+
+        Dim dtkeineMWST_ohneContraint As DataTable = dtkeineMWST.Select("Lieferant = ''").CopyToDataTable
+        Dim counter = 0
+        Dim landBez As String = ""
+        For Each row As DataRow In dtkeineMWST_ohneContraint.Rows
+            landBez = "'" & row.Item("Erstattungsland") & "'"
+            counter = counter + 1
+            If (dtkeineMWST_ohneContraint.Rows.Count <> 0 And counter <> dtkeineMWST_ohneContraint.Rows.Count) Then landBez &= ","
+        Next
+        sqlwhereLand &= " AND Einreichland not in (" & landBez & ")"
+
+
+
         Dim year = CDate(dat_Sum_Von.Value).Year
 
         If year >= 2025 Then
@@ -688,6 +703,13 @@ Public Class frmUSTVoffeneAntraege
                         where 1 = 1 and isnull(kde_keineMWSt,0) = 0 " & sqlwhereLand & sqlwhereSteuerNr &
                         " group by isnull(UStVAn_ID,0) , Lieferant, KdNr, Kundenname,Kundenland, Einreichland, tblSteuernummern.UStV"
 
+            Dim SQLWhere = ""
+
+
+
+
+
+
             .SET_SQL(sqlstring, "FMZOLL")
             .LOAD()
             If .Columns.Count > 0 Then
@@ -926,4 +948,8 @@ Public Class frmUSTVoffeneAntraege
 
 
     End Sub
+
+    Private Sub frmUSTVoffeneAntraege_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        dtkeineMWST = (New SQL).loadDgvBySql("select Land, Erstattungsland, Lieferant from tblKeineMWSTErstattung", "FMZOLL")
+    End Sub
 End Class
\ No newline at end of file
diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb
index 1bd6516e..88645df3 100644
--- a/SDL/mdm/usrcntlFremdrechnungen.vb
+++ b/SDL/mdm/usrcntlFremdrechnungen.vb
@@ -74,9 +74,9 @@ Public Class usrcntlFremdrechnungen
         End If
 
         KUNDE = kundenSQL.getKundeByKdNr(kdNr)
+        dtkeineMWST = (New SQL).loadDgvBySql("select Land, Erstattungsland, Lieferant from tblKeineMWSTErstattung", "FMZOLL")
 
         If KUNDE IsNot Nothing Then
-            dtkeineMWST = (New SQL).loadDgvBySql("select Land, Erstattungsland, Lieferant from tblKeineMWSTErstattung", "FMZOLL")
             dtKundeMWST = (New SQL).loadDgvBySql("select LandKz from tblKundenMWST where KdNr = " & KUNDE.KundenNr, "FMZOLL")
         End If