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

Aviso/frmATEZ_NCTS.vb

@@ -9,7 +9,7 @@ Imports VERAG_PROG_ALLGEMEIN
 Public Class frmATEZ_NCTS
 
     Dim ART As String = ""
-    Dim FilialenNr As Integer
+    Dim FilialenNr As String = ""
     Dim AbfertigungsNr As Integer
     Dim JAHR As Integer = Now.ToString("yy")
     Public isSTAMMREF As Boolean = False
@@ -129,6 +129,15 @@ Public Class frmATEZ_NCTS
                     .Carrier_EORI = usrCntl_Carrier.txtEORI.Text
                     .Guarantee_GRN = "" 'leer 
 
+                    Select Case SENDUNG.tblSnd_Abfertigungsart_ID
+                        Case 5, 45 : .DAKOSY_Procedure = "T1"
+                        Case 6 : .DAKOSY_Procedure = "T2"
+                        Case 8 : .DAKOSY_Procedure = "TIR"
+                        Case Else : .DAKOSY_Procedure = "T2"
+                    End Select
+
+
+
                     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
@@ -253,6 +262,13 @@ Public Class frmATEZ_NCTS
 
     Private Sub frmATEZNCTS_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
+        If FilialenNr = "" Then
+            MsgBox("Keine Filiale ausgewählt!")
+            Me.Close()
+        End If
+
+        FIRMA_DY = SDL.frmZollanmeldung.getFirma_DY(FilialenNr, Nothing)
+
         Select Case FIRMA_DY
             Case "VERAG" : txtDyMandant.Text = "VERG"
                 txtDyNiederlassung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG
@@ -262,6 +278,7 @@ Public Class frmATEZ_NCTS
             Case "AMBAR" : txtDyMandant.Text = "ATIL" : txtDyNiederlassung.Text = "AMBWO"
         End Select
 
+
         initSeachboxes()
         initAttachment()
 
@@ -415,7 +432,7 @@ CASE WHEN  [anh_Art] = 'ATR-EUR1' then 'EUR'
                                                 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 anh_Typ = 'PDF'
                                         Order BY  [anh_Reihenfolge], anh_Datum desc, [anh_id]"
 
         Dim dt = VermerkeDAL.Anzeigen_Vermerke(hSQL)
@@ -522,4 +539,5 @@ CASE WHEN  [anh_Art] = 'ATR-EUR1' then 'EUR'
         txtDat._value = CDate(sender.value).ToShortDateString
     End Sub
 
+
 End Class