edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newMaster2024' of https://dev.azure.com/VeragAG/_git/SDL into newMaster2024

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-12-18 14:30:11 +01:00
parent 1c8623f38e e3c341ae16
commit e9d1a30e3b
25 changed files with 3947 additions and 2739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
VERAG_PROG_ALLGEMEIN/Classes/USTV/cUSTVAntrag.vb
View File

@@ -1,6 +1,7 @@

Imports System.Data.SqlClient
Imports System.Reflection
Imports Org.BouncyCastle.Ocsp
Public Class cUSTVAntrag
@@ -201,6 +202,24 @@ Public Class cUSTVAntrag
Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list)
End Function
Public Function SAVEID() As Integer
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblUStVAntrag WITH(updlock,serializable) WHERE UStVAn_ID=@UStVAn_ID ) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
" commit tran "
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
UStVAn_ID = SQL.doSQLVarListID(UStVAn_ID, sqlstr, "FMZOLL", , list)
Return UStVAn_ID
End Function
Public Function getInsertCmd() As String
Try
@@ -255,6 +274,13 @@ Public Class cUSTVAntrag
Return -1
End Function
Public Function DELETE() As Boolean
Dim sqlstr = " DELETE FROM tblUStVAntrag WITH(updlock,serializable) WHERE UStVAn_ID=" & Me.UStVAn_ID
Return SQL.doSQL(sqlstr, "FMZOLL")
End Function
End Class

7
VERAG_PROG_ALLGEMEIN/Classes/cEZB_Waehrungskurse.vb
View File

@@ -151,9 +151,14 @@ Public Class cEZB_Waehrungskurse
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
End Function
Shared Function EXCHANGE(betrag As Double, waehrungscode As String, datum As Date) As Double
Shared Function EXCHANGE_CURTOEUR(betrag As Double, waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortDateString & "' order by ezb_datum desc"
Return betrag / (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0)
End Function
Shared Function EXCHANGE_EURTOCUR(betrag As Double, waehrungscode As String, datum As Date) As Double
Dim sqlstr = " SELECT TOP 1 [ezb_kurs] FROM [tblEZB_Waehrungskurse] where ezb_waehrungscode='" & waehrungscode & "' and ezb_datum<='" & datum.ToShortDateString & "' order by ezb_datum desc"
Return (New SQL).getValueTxtBySql(sqlstr, "FMZOLL",,, 0) * betrag
End Function
End Class

12
VERAG_PROG_ALLGEMEIN/Classes/cIDS.vb
View File

@@ -114,7 +114,7 @@ Public Class cIDS
Public Function SAVE() As Boolean
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblIDSTransactionsNew WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode) " &
Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblIDSTransactionsNew WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode and isnull(charged,0) = 0) " &
" BEGIN " & getUpdateCmd() & " END " &
" Else " &
" BEGIN " & getInsertCmd() & " END " &
@@ -155,7 +155,7 @@ Public Class cIDS
Try
hasEntry = False
Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL()
Using cmd As New SqlCommand("SELECT * FROM tblIDSTransactionsNew WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode ", conn)
Using cmd As New SqlCommand("SELECT * FROM tblIDSTransactionsNew WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode", conn)
cmd.Parameters.AddWithValue("@YearMonthDay", YearMonthDay)
cmd.Parameters.AddWithValue("@Paymentsummarynumber", Paymentsummarynumber)
cmd.Parameters.AddWithValue("@CustomerCode", CustomerCode)
@@ -196,7 +196,7 @@ Public Class cIDS
End If
Next
str = str.Substring(0, str.Length - 1) 'wg. ','
Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode ")
Return (" UPDATE [tblIDSTransactionsNew] SET " & str & " WHERE YearMonthDay=@YearMonthDay AND Paymentsummarynumber=@Paymentsummarynumber AND CustomerCode=@CustomerCode AND OutletCountryCode=@OutletCountryCode AND OutletCode=@OutletCode AND ProductTypeCode=@ProductTypeCode AND isnull(charged,0) = 0 ")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
@@ -349,8 +349,8 @@ Public Class cIDS
AND tblIDSTransactionsNew.KdNrVERAG = @AdressenNr
AND tbl_IDS_Länder.[Lieferland_ISO2] = @LandKZ
AND tblIDSTransactionsNew.[VATAmount] <> 0
AND UStVAn_ID is null
GROUP BY
AND isnull(UStVAn_ID,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) &
"GROUP BY
tblIDSTransactionsNew.KdNrVERAG,
tblIDSTransactionsNew.[YearMonthDay],
ISNULL(tblIDSTransactionsNew.[OBONumber],
@@ -365,7 +365,7 @@ Public Class cIDS
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))
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader()
dt.Load(dr)

5
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -87,9 +87,7 @@ Public Class cKundenErweitert
Property kde_BankgarantielErhaltenAm As Object = Nothing
Property kde_WechselBlanko As Boolean = False
Property kde_UStV_SummeVorschaubetragEUR_PLOSE As Object = Nothing
Property kde_keineMWSt As Boolean = False
Dim SQL As New SQL
@@ -179,6 +177,7 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BankgarantielErhaltenAm", kde_BankgarantielErhaltenAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_UStV_SummeVorschaubetragEUR_PLOSE", kde_UStV_SummeVorschaubetragEUR_PLOSE))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_keineMWSt", kde_keineMWSt))
Return list
End Function

10
VERAG_PROG_ALLGEMEIN/Classes/cUTA.vb
View File

@@ -10,12 +10,6 @@ Public Class cUTA
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Public Function clearimporttable() As Boolean
Return SQL.doSQL("DELETE FROM tblUTAImportNew", "FMZOLL")
End Function
Public Function importUTALeistungen() As Boolean
'Einträge in tblUTALeistungen machen, wenn Fakturierwarenart und Lieferland noch nicht in der Tabelle enthalten sind.
@@ -1234,14 +1228,14 @@ Public Class cUTA
Sum([Gesamtbetrag_Brutto_in_Lieferlandwährung]-[Gesamtbetrag_Netto_in_Lieferlandwährung]) AS Umsatzsteuerbetrag_in_Lieferlandwährung, Lieferlandwährung_ISO,
Sum([Gesamtbetrag_Brutto_in_Darstellwährung]-[Gesamtbetrag_Netto_in_Darstellwährung]) AS Umsatzsteuerbetrag_in_Darstellwährung, Darstellwährung_ISO
FROM [tblUTAImportNew] INNER JOIN Adressen ON [tblUTAImportNew].Kundennummer = Adressen.UTAKundenNr
WHERE ([tblUTAImportNew].Rechnungsdatum Between '" & von.ToShortDateString & "' And '" & bis.ToShortDateString & "' AND [tblUTAImportNew].Lieferland_ISO2='" & LandKZ & "' AND [tblUTAImportNew].Lieferlandwährung_ISO='" & Wahrungscode & "' AND Adressen.AdressenNr=" & KundenNr & " AND abgerechnet = 1)
WHERE ([tblUTAImportNew].Rechnungsdatum Between '" & von.ToShortDateString & "' And '" & bis.ToShortDateString & "' AND [tblUTAImportNew].Lieferland_ISO2='" & LandKZ & "' AND [tblUTAImportNew].Lieferlandwährung_ISO='" & Wahrungscode & "' AND Adressen.AdressenNr=" & KundenNr & " AND charged = 1 AND isnull(tblUTAImportNew.UStVAn_ID,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) & " )
GROUP BY [tblUTAImportNew].Rechnungsdatum, [tblUTAImportNew].Rechnungsnummer_pro_Lieferland, Lieferlandwährung_ISO ,Darstellwährung_ISO,Adressen.AdressenNr
HAVING (((Sum([Gesamtbetrag_Brutto_in_Lieferlandwährung]-[Gesamtbetrag_Netto_in_Lieferlandwährung]))<>0));", 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))
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, 1, 0))
Dim dr = cmd.ExecuteReader()
dt.Load(dr)

2
VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/NCTS_API/cATEZ_ncts_api.vb
View File

@@ -175,7 +175,7 @@ Public Class cATEZ_ncts_api
'--> EUR
If GRT.nctsGRT_AmountToBeCoveredFremdWaehrung IsNot Nothing Then
If If(GRT.nctsGRT_Currency, "") <> "EUR" Then
Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE(GRT.nctsGRT_AmountToBeCoveredFremdWaehrung, GRT.nctsGRT_Currency, NCTS_FREMD.ncts_Trans_DatumZeit.ToShortDateString)
Dim betragEUR = VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.EXCHANGE_CURTOEUR(GRT.nctsGRT_AmountToBeCoveredFremdWaehrung, GRT.nctsGRT_Currency, NCTS_FREMD.ncts_Trans_DatumZeit.ToShortDateString)
GRT.nctsGRT_AmountToBeCovered = If(betragEUR > 0, betragEUR, GRT.nctsGRT_AmountToBeCoveredFremdWaehrung)
Else
GRT.nctsGRT_AmountToBeCovered = GRT.nctsGRT_AmountToBeCoveredFremdWaehrung

6
VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
View File

@@ -525,12 +525,10 @@ Public Class cMSEAPI
transactionID.Columns("batch_seq_nr").ReadOnly = True
End If
'If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
saveTransactions(num, dt, transactions, json.StringOf("receiver"), True,) ' wenn ID explizit aufgerufen keine Prüfung auf receivcer und purchaseDate
End If
Next row
@@ -1371,14 +1369,14 @@ Public Class cMSEAPI
left join [VERAG].[dbo].[tblMSETransactions] as trans on bills.[transaction_id] = trans.[transaction_id]
left join [VERAG].[dbo].[tblMSECustomers] as cust on cust.partner_customer_number = trans.partner_haulier_id
left join [VERAG].[dbo].[tblMSEInvoices] as inv on inv.customer_number = cust.customer_id and bills.invoice_date = inv.invoice_date and inv.country = trans.transaction_country
where bills.invoice_date Between '" & von & "' And '" & bis & "'and trans.charged = 1 and cust.[partner_customer_number] = " & KundenNr & " and trans.transaction_country = '" & LandKZ & "' and trans.original_currency = '" & Wahrungscode & "' AND isnull(inv.archiv,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) & "
where bills.invoice_date Between '" & von & "' And '" & bis & "'and trans.charged = 1 and cust.[partner_customer_number] = " & KundenNr & " and trans.transaction_country = '" & LandKZ & "' and trans.original_currency = '" & Wahrungscode & "' AND isnull(UStVAn_ID,0) = " & IIf(Archiv IsNot Nothing AndAlso Archiv, 1, 0) & "
group by bills.invoice_date, bills.invoice_number, cust.[customer_id], bills.specification_page_name, trans.original_currency) as temp
where temp.UST <> 0", 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))
If Archiv IsNot Nothing Then cmd.Parameters.AddWithValue("@Archiv", If(Archiv, "=", "<>"))
Dim dr = cmd.ExecuteReader()
dt.Load(dr)