From 1309d507cb094e874578a6059aa4f889da46b616 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 1 Sep 2023 17:00:00 +0200 Subject: [PATCH] ATEZ -> umgebaut --- .../ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb index b25eca24..04277a92 100644 --- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb +++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb @@ -37,7 +37,6 @@ Public Class cATEZ_NCTS_DATA Public Property json As String Public Property dakosy_ref As String Public Property selectedDocuments As String - Public Property fehlerbeschreibung As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -570,7 +569,7 @@ Public Class cATEZ_NCTS_IN Dim sbRequestBody As New Chilkat.StringBuilder jsonData.EmitSb(sbRequestBody) - Debug.WriteLine(sbRequestBody) + 'Debug.WriteLine(sbRequestBody) Dim sbResponseBody As New Chilkat.StringBuilder success = rest.FullRequestSb("POST", "/api/integrations/verag", sbRequestBody, sbResponseBody) @@ -582,8 +581,18 @@ Public Class cATEZ_NCTS_IN Else If (rest.ResponseStatusCode <> 200) Then - failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText - Return failureDesc + If rest.ResponseStatusCode = 500 Then + Dim jsonResultFailure As New Chilkat.JsonObject + jsonResultFailure.LoadSb(sbResponseBody) + jsonResultFailure.Emit() + failureDesc = jsonResultFailure.StringOf("code") & "-" & jsonResultFailure.StringOf("message") + Return failureDesc + Else + + failureDesc = rest.ResponseStatusCode & "-" & rest.ResponseStatusText + Return failureDesc + End If + Else Dim jsonResult As New Chilkat.JsonObject @@ -601,7 +610,7 @@ Public Class cATEZ_NCTS_IN End Try End Function - Shared Function setJson(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + Shared Function setJson(ncts As cATEZ_NCTS_DATA) Dim success As Boolean @@ -646,6 +655,15 @@ Public Class cATEZ_NCTS_IN ncts.json = jsonData.Emit() + + Return success + + End Function + + Public Function setJsonPDF(ncts As cATEZ_NCTS_DATA, dgv As DataGridView) + + Dim success As Boolean + Dim i As Integer = 0 For Each r As DataGridViewRow In dgv.Rows Dim isSelected = IIf(DBNull.Value Is r.Cells("anh_selekt").Value, False, r.Cells("anh_selekt").Value) i = 0 @@ -659,11 +677,9 @@ Public Class cATEZ_NCTS_IN success = jsonData.UpdateString("Attachments.Attachment[" & i & "].base64BinaryStream", bd.GetEncoded("base64")) i = i + 1 End If - Next jsonData.Emit() - Return success End Function