This commit is contained in:
2024-12-06 17:09:28 +01:00
parent ec7bd277e4
commit 4bab0f420b

View File

@@ -237,10 +237,15 @@ Public Class cPLOSE
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
Public Shared Function GET_Antraege(von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As List(Of cPLOSE_USTV_ANTR)
Public Shared Function GET_Antraege(von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing, Optional MWSTSummenAusBeleg As Boolean = False) As List(Of cPLOSE_USTV_ANTR)
Dim LIST As New List(Of cPLOSE_USTV_ANTR)
GET_Antraege_PLOSE(LIST, von, bis, KundenNr, Land, Archiv)
If Not MWSTSummenAusBeleg Then
GET_Antraege_PLOSE(LIST, von, bis, KundenNr, Land, Archiv)
Else
GET_Antraege_PLOSE_NEU(LIST, von, bis, KundenNr, Land, Archiv)
End If
GET_Antraege_ByLieferantCode(LIST, "'90'", von, bis, KundenNr, Land, Archiv) 'SOFICO
GET_Antraege_ByLieferantCodeNULL(LIST, von, bis, KundenNr, Land, Archiv) 'SOFICO
@@ -423,6 +428,54 @@ Public Class cPLOSE
End Function
Public Shared Function GET_Antraege_PLOSE_NEU(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT plInv_SupplierRechnungsDatum,plInv_SupplierRechnungsNr, plInv_Lieferant,plInv_Nettobetrag,plInv_MWSTBetrag, plInv_Bruttobetrag, 'EUR' as plInv_WaehrungAbbuchung , case when plInv_LieferantCode = 'PSS' then 0 else 9 end as plInv_LieferantCode from tblPLOSE_Inv_Data
INNER JOIN Adressen on PLOSEKundenNr=plInv_PLOSEKundennummer
where cast(plInv_SupplierRechnungsDatum as date) between @von and @bis and AdressenNr=@AdressenNr and
plInv_SupplierCountry ='" & Land & "'and plInv_MWSTBetrag <> 0 AND (plInv_LieferantCode = 'PSS' OR plInv_LieferantCode = 'UNI') AND plInv_SupplierRechnungsNr not like '%-SFC-%'" & 'wie Lieferantencode = 90
"order by plInv_SupplierRechnungsDatum", conn)
cmd.Parameters.AddWithValue("@von", von)
cmd.Parameters.AddWithValue("@bis", bis)
cmd.Parameters.AddWithValue("@AdressenNr", KundenNr)
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader()
While dr.Read
Dim cPLOSE_USTV_ANT As New cPLOSE_USTV_ANTR
cPLOSE_USTV_ANT.plose_RechnungsDatum = dr.Item("plInv_SupplierRechnungsDatum")
cPLOSE_USTV_ANT.plose_RechnungsNr = dr.Item("plInv_SupplierRechnungsNr")
cPLOSE_USTV_ANT.plose_Lieferant = dr.Item("plInv_Lieferant")
cPLOSE_USTV_ANT.plose_LieferantCode = dr.Item("plInv_LieferantCode")
cPLOSE_USTV_ANT.plose_NettobetragTransaktion = dr.Item("plInv_Nettobetrag")
cPLOSE_USTV_ANT.plose_MWSTBetrag = dr.Item("plInv_MWSTBetrag")
cPLOSE_USTV_ANT.plose_BruttobetragTransaktion = dr.Item("plInv_Bruttobetrag")
cPLOSE_USTV_ANT.plose_NettobetragWaehrungAbbuchung = dr.Item("plInv_Nettobetrag")
cPLOSE_USTV_ANT.plose_MWSTBetragWaehrungAbbuchung = dr.Item("plInv_MWSTBetrag")
cPLOSE_USTV_ANT.plose_BruttobetragWaehrungAbbuchung = dr.Item("plInv_Bruttobetrag")
cPLOSE_USTV_ANT.plose_WaehrungAbbuchung = dr.Item("plInv_WaehrungAbbuchung")
LIST.Add(cPLOSE_USTV_ANT)
End While
dr.Close()
End Using
End Using
Return True
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
'Public Shared Function GET_Antraege_PLOSE(ByRef LIST As List(Of cPLOSE_USTV_ANTR), von As Date, bis As Date, KundenNr As Integer, Land As String, Optional Archiv As Object = Nothing) As Boolean
' Try
' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL