Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb

@@ -8,7 +8,7 @@ Imports System.Windows.Forms.VisualStyles.VisualStyleElement
 
 Public Class cATEZ_NCTS_DATA
 
-    Public Property Id As String
+    Public Property Id As Integer
     Public Property VERAG_LRN As String
     Public Property LicensePlateContainerNo As String
     Public Property DepartureCustomsOffice As String
@@ -33,6 +33,7 @@ Public Class cATEZ_NCTS_DATA
     Public Property AvisoId As Integer
     Public Property SendungsId As Integer
     Public Property atezId As String
+    Public Property json As String
 
     Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -40,6 +41,7 @@ Public Class cATEZ_NCTS_DATA
 
     Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
         Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
+
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Id", Id, , True, True))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("AvisoId", AvisoId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SendungsId", SendungsId))
@@ -64,6 +66,7 @@ Public Class cATEZ_NCTS_DATA
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("atezId", atezId))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("status", status))
         list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("erstellung", erstellung))
+        list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("json", json))
 
         Return list
     End Function
@@ -72,8 +75,8 @@ Public Class cATEZ_NCTS_DATA
 
     End Sub
 
-    Sub New(VERAG_LRN)
-        Me.VERAG_LRN = VERAG_LRN
+    Sub New(Id)
+        Me.Id = Id
         LOAD()
     End Sub
 
@@ -145,6 +148,7 @@ Public Class cATEZ_NCTS_DATA
                 Using cmd As New SqlCommand("SELECT * FROM tblATEZ_NCTS WHERE Id=@Id  ", conn)
                     cmd.Parameters.AddWithValue("@Id", Id)
                     Dim dr = cmd.ExecuteReader()
+
                     If dr.Read Then
                         For Each li In getParameterList()
                             Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable)
@@ -578,8 +582,8 @@ Public Class cATEZ_NCTS_IN
         Dim Route_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen)
         VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_Routen.LOAD_LIST_ByNCTS(Route_LIST, ncts.Id)
 
+        Dim i As Integer = 0
         For Each route In Route_LIST
-            Dim i As Integer = 0
             success = jsonData.UpdateString("Route[" & i & "].Country", route.Route_Country)
             i = i + 1
         Next
@@ -588,8 +592,9 @@ Public Class cATEZ_NCTS_IN
         Dim TCO_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice)
         VERAG_PROG_ALLGEMEIN.cATEZ_NCTS_TransitCustomsOffice.LOAD_LIST_ByNCTS(TCO_LIST, ncts.Id)
 
+        i = 0
         For Each tco In TCO_LIST
-            Dim i As Integer = 0
+
             success = jsonData.UpdateString("TransitCustomsOffices[" & i & "].TransitCustomsOffice", tco.TransitCustomsOffice)
             i = i + 1
         Next
@@ -597,8 +602,9 @@ Public Class cATEZ_NCTS_IN
 
         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
             If isSelected Then
-                Dim i As Integer = 0
+
                 Dim bd As New Chilkat.BinData
                 'Dim json1 As New Chilkat.JsonObject
                 success = bd.LoadFile(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value))
@@ -609,6 +615,8 @@ Public Class cATEZ_NCTS_IN
             End If
 
         Next
+        ncts.json = jsonData.Emit()
+
 
         Return success