mergekonfl.

Aviso/frmATEZ_NCTS.vb

@@ -118,20 +118,25 @@ Public Class frmATEZ_NCTS
                 .Carrier_EORI = usrCntl_Carrier.txtEORI.Text
                 .Guarantee_GRN = "" 'leer 
 
-                For Each doc As DataGridViewRow In dgvAnhaenge.Rows
-                    Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
-                    If isSelected Then
-                        .selectedDocuments &= doc.Cells("anh_docId").Value & ", "
-                    End If
-                Next
+                'For Each doc As DataGridViewRow In dgvAnhaenge.Rows
+                '    Dim isSelected = IIf(DBNull.Value Is doc.Cells("anh_selekt").Value, False, doc.Cells("anh_selekt").Value)
+                '    If isSelected Then
+                '        .selectedDocuments &= doc.Cells("anh_docId").Value & ", "
+                '    End If
+                'Next
 
                 .SAVE()
 
             End With
+
             saveDurchgangszollstelle(atez_data)
             saveRoute(atez_data)
+            setDurchgangszolstellen()
+            setRoute()
 
-            sendAtezData(atez_data, atez)
+            If sendAtezData(atez_data, atez) Then
+                Me.Close()
+            End If
 
             Me.Cursor = Cursors.Default
 
@@ -142,7 +147,7 @@ Public Class frmATEZ_NCTS
 
     End Sub
 
-    Private Sub sendAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN)
+    Private Function sendAtezData(atezData As cATEZ_NCTS_DATA, atez As cATEZ_NCTS_IN) As Boolean
 
         Dim failreDesc As String
 
@@ -150,7 +155,7 @@ Public Class frmATEZ_NCTS
         If authResp <> "200" Then
             failreDesc = "Authentifizierung fehlgeschlagen - " & authResp & vbNewLine & "Vorgang abgebrochen!"
             lblInfo.Text = failreDesc
-            Exit Sub
+            Return False
         End If
 
 
@@ -165,14 +170,18 @@ Public Class frmATEZ_NCTS
             If atezData.status = "Draft" Then
                 MsgBox("Fehler beim Senden" & vbNewLine & failreDesc)
                 atezData.fehlerbeschreibung = failreDesc
-                atezData.SAVE()
-                Exit Sub
+                Return atezData.SAVE()
+
             End If
             Dim result As MsgBoxResult = MsgBox("Fehler beim Senden" & vbNewLine & failreDesc & vbNewLine & "Soll NCTS als Entwurf gespeichert werden?", vbYesNoCancel)
             If result = vbYes Then
                 atezData.status = "Draft"
                 atezData.fehlerbeschreibung = failreDesc
-                atezData.SAVE()
+                Return atezData.SAVE()
+            Else
+                atezData.status = "Failure"
+                atezData.fehlerbeschreibung = failreDesc
+                Return atezData.SAVE()
             End If
 
             lblInfo.Text = "Fehler in der API "
@@ -180,11 +189,11 @@ Public Class frmATEZ_NCTS
         Else
             atezData.status = "Sent"
             atezData.atezId = IIf(azetId IsNot Nothing, azetId, "")
-            atezData.SAVE()
+            Return atezData.SAVE()
             Me.Close()
         End If
 
-    End Sub
+    End Function
 
     Function getBezugsnr(ByRef BezugsNr)
         Dim BezugsNrTmp = ""
@@ -372,7 +381,7 @@ Public Class frmATEZ_NCTS
                                                 when [anh_Art] = 'Sonstiges' then 'OTHER'
                                                 when [anh_Art] ='' then 'OTHER' End
                                                 [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] 
-                                        WHERE [anh_AvisoId]='" & AVISO.AvisoID & "' AND isnull(anh_SendungsId,0) <=0 And anh_Typ = 'PDF'
+                                        WHERE [anh_AvisoId]='" & AVISO.AvisoID & "' AND isnull(anh_SendungsId,0) <= 0 And anh_Typ = 'PDF'
                                         Order BY  [anh_Reihenfolge], anh_Datum desc, [anh_id]"
 
         Dim dt = VermerkeDAL.Anzeigen_Vermerke(hSQL)
@@ -554,6 +563,8 @@ Public Class frmATEZ_NCTS
 
     Public Sub saveDurchgangszollstelle(atezData As cATEZ_NCTS_DATA)
 
+        Dim atezTransitOffice As New cATEZ_NCTS_TransitCustomsOffice()
+        atezTransitOffice.delete(atezData.Id)
 
         If sbDurchgangszollstelle1._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle1._value)
         If sbDurchgangszollstelle2._value <> "" Then Dim TCO As New cATEZ_NCTS_TransitCustomsOffice(atezData.Id, sbDurchgangszollstelle2._value)
@@ -569,6 +580,9 @@ Public Class frmATEZ_NCTS
 
     Public Sub saveRoute(atezData As cATEZ_NCTS_DATA)
 
+        Dim atezRouten As New cATEZ_NCTS_Routen()
+        atezRouten.delete(atezData.Id)
+
 
         If sbRoute1._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute1._value)
         If sbRoute2._value <> "" Then Dim route As New cATEZ_NCTS_Routen(atezData.Id, sbRoute2._value)