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

MSE, Essensbestellungen, MDM, Kundebearbeiten, Vollmachten

Browse Source
This commit is contained in:
d.breimaier
2024-11-18 12:47:16 +01:00
parent a13d1b06d6
commit 66665fcd2f
15 changed files with 455 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,8 +58,9 @@ Public Class cMSEAPI
Dim curDateTime As Integer = jwt.GenNumericDate(0)
' Set the timestamp defining an expiration time (end time) for the token
' to be now + 10 MIN (600 seconds)
success = claims.AddIntAt(-1, "exp", curDateTime + 600)
' to be now + 20 MIN (1200 seconds)
'Import von ca 30 000 DS dauert schon mal länger als 15min!
success = claims.AddIntAt(-1, "exp", curDateTime + 1200)
jwt.AutoCompact = True
@@ -1363,14 +1364,15 @@ Public Class cMSEAPI
FROM [VERAG].[dbo].[tblMSESettlements] as bills
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
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 & "'
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) & "
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, 1, 0))
Dim dr = cmd.ExecuteReader()
dt.Load(dr)
@@ -1390,7 +1392,7 @@ Public Class cMSEAPI
End Function
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, mse_kdNr As Integer) As Boolean
Public Shared Function UPDATE_ARCHIV(reDat As Date, reNr As Integer, mse_kdNr As Integer, country As String) As Boolean
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -1398,12 +1400,13 @@ Public Class cMSEAPI
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reDat", reDat))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("reNr", reNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mse_kdNr", mse_kdNr))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("country", country))
Return SQL.doSQLVarList("
UPDATE [tblMSEInvoices] set archiv=1, [archiviertDatum]=GETDATE()
WHERE cast(invoice_date as date) = @reDat and invoice_id = @reNr and customer_number=@mse_kdNr
WHERE cast(invoice_date as date) = @reDat and invoice_id = @reNr and customer_number=@mse_kdNr and country = @country
", "FMZOLL",, list)
Catch ex As Exception