From ea01d6026b783392838602f028f5de65d538157e Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 8 Nov 2022 10:57:18 +0100 Subject: [PATCH] =?UTF-8?q?Umstellung=20auf=20neuen=20Webservice=20bei=20P?= =?UTF-8?q?DF-Anzeige=20von=20UID-Pr=C3=BCfung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SDL/Classes/cEORIWebService.vb | 46 ++++++++++++++++++++++++++ SDL/Classes/cFinanzOnlineWebService.vb | 31 +++++++++++++++++ SDL/kunden/usrCntlKundenuebersicht.vb | 30 +++++++++++++---- 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/SDL/Classes/cEORIWebService.vb b/SDL/Classes/cEORIWebService.vb index a85e9797..fb7c8e0c 100644 --- a/SDL/Classes/cEORIWebService.vb +++ b/SDL/Classes/cEORIWebService.vb @@ -176,6 +176,52 @@ Public Class cEORIWebService End Function + Shared Function genEORI_FormularWithoutSaving(ByVal txtEORI As String, Optional AvisoId As Integer = -1, Optional SendungsId As Integer = -1, Optional ByRef EORI_ERGInt As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben + Try + + Dim msgErgebnis = "" + Dim tmp_SESSION_ID = "" + Dim Firma = "" + + Dim EORI_ERG = ValidateEoriNumber(txtEORI) + + + If EORI_ERG.Result.Count > 0 Then + + If EORI_ERG.Result(0).Status = 0 Or EORI_ERG.Result(0).Status = 1 Then + + Firma = EORI_ERG.Result(0).Name & vbNewLine + Firma &= EORI_ERG.Result(0).Street & vbNewLine + Firma &= EORI_ERG.Result(0).Country & " " & EORI_ERG.Result(0).PostalCode & " " & EORI_ERG.Result(0).City + Firma = Firma.Trim + + EORI_ERGInt = EORI_ERG.Result(0).Status + Select Case EORI_ERG.Result(0).Status + Case 0 : msgErgebnis = "EORI-Nr. GÜLTIG - OK" + Case 1 : msgErgebnis = "EORI-Nr. UNGÜLTIG" + End Select + + Dim PdfTmp = SDL.FormularManagerNEU.EORI_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, txtEORI, AvisoId, SendungsId) + + Return PdfTmp + + End If + Else + MsgBox("Fehler bei der Prüfung der EORI-Nummer. WebService evtl. nicht verfügbar.") + End If + Return "" + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + Return "" + + End Function + + + + Shared Function ValidateEoriNumber(ByVal number As String) As EoriResponseModel If number Is Nothing Then Return Nothing diff --git a/SDL/Classes/cFinanzOnlineWebService.vb b/SDL/Classes/cFinanzOnlineWebService.vb index 74868b31..a9421665 100644 --- a/SDL/Classes/cFinanzOnlineWebService.vb +++ b/SDL/Classes/cFinanzOnlineWebService.vb @@ -198,6 +198,37 @@ Public Class cFinanzOnlineWebService End Function + Shared Function genUID_FormularWithoutSaving(ByVal txtUid As String, Optional AvisoId As Integer = -1, Optional SendungsId As Integer = -1, Optional ByRef UID_ERG As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben + Try + + Dim msgErgebnis = "" + Dim tmp_SESSION_ID = "" + Dim Firma = "" + + UID_ERG = Call_Web_Service_MethodUID_Abfrage_NEU2020(txtUid, Firma, tmp_SESSION_ID, msgErgebnis) + + If UID_ERG = 0 Or UID_ERG = 1 Then + Select Case UID_ERG + Case 0 : msgErgebnis = "UID-Nr. GÜLTIG - OK" + Case 1 : msgErgebnis = "UID-Nr. UNGÜLTIG" + End Select + + Dim PdfTmp = SDL.FormularManagerNEU.UID_PRUEFUNG(msgErgebnis, Firma, tmp_SESSION_ID, uid, txtUid, tid, AvisoId, SendungsId) + Return PdfTmp + Else + MsgBox(msgErgebnis) + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + Return "" + + End Function + + + Shared Function Call_Web_Service_MethodUID_Abfrage_NEU2020(ByVal txtUid As String, Optional ByRef Firma As String = "", Optional ByRef tmp_SESSION_ID As String = "", Optional ByRef msgErgebnis As String = "", Optional SaveErgInAdressenKdNr As Integer = -1) As String 'SESSION_ID wir nur zurückgegeben initValues() diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb index 4e731b20..d767a24b 100644 --- a/SDL/kunden/usrCntlKundenuebersicht.vb +++ b/SDL/kunden/usrCntlKundenuebersicht.vb @@ -1,6 +1,7 @@ Imports System.Data.SqlClient Imports System.Globalization Imports System.IO +'Imports DocumentFormat.OpenXml.Drawing.Charts Imports SDL.EORI Imports sun.invoke.empty @@ -1934,13 +1935,17 @@ Public Class usrCntlKundenuebersicht If uid Is Nothing Then Exit Sub If uidKz = "" Then Exit Sub If uid = "" Then Exit Sub - Dim url = "http://ec.europa.eu/taxation_customs/vies/vatResponse.html?memberStateCode=" & uidKz & "&number=" & uid & "&requesterMemberStateCode=" & uidKz_antragsteller & "&requesterNumber=" & uid_antragsteller - Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) - If pdf <> "" Then Process.Start(pdf) + + Dim url = SDL.cFinanzOnlineWebService.genUID_FormularWithoutSaving(uidKz + uid) + + 'Dim url = "http://ec.europa.eu/taxation_customs/vies/vatResponse.html?memberStateCode=" & uidKz & "&number=" & uid & "&requesterMemberStateCode=" & uidKz_antragsteller & "&requesterNumber=" & uid_antragsteller ' alte SOAP-Abfrage!!! + If url <> "" Then + Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) + 'If pdf <> "" Then Process.Start(pdf) + End If + End Sub - - Sub printEORI(eoriNr, Optional pdfPath = "") timer_EORI.Interval = 2000 If eoriNr Is Nothing Then Exit Sub @@ -2355,9 +2360,20 @@ Public Class usrCntlKundenuebersicht Me.Cursor = Cursors.WaitCursor 'printEORI(KUNDE.EORITIN, "C:\Users\DEVELOPER1\Desktop\test.pdf") - Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & KUNDE.EORITIN & "&Expand=true" + 'Dim url = "https://ec.europa.eu/taxation_customs/dds2/eos/eori_validation.jsp?Lang=de&EoriNumb=" & KUNDE.EORITIN & "&Expand=true" + + Dim EORI_NR = KUNDE.EORITIN.ToString() + + EORI_NR.Replace("-", "").Replace(" ", "").Trim + + If EORI_NR = "" Then Me.Cursor = Cursors.Default : Exit Sub + + Dim url = SDL.cEORIWebService.genEORI_Formular(EORI_NR) + Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURL(url) - If pdf <> "" Then Process.Start(pdf) + 'If pdf <> "" Then Process.Start(pdf) + + Me.Cursor = Cursors.Default End Sub