Merge

Aviso/Aviso.vbproj

@@ -108,7 +108,7 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Aviso_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>LME.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility" />

Aviso/frmATEZ_NCTS.vb

@@ -1,4 +1,5 @@
-Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers
+Imports DocumentFormat.OpenXml.Vml.Presentation
+Imports GrapeCity.ActiveReports.Design.DdrDesigner.Designers
 Imports GrapeCity.ActiveReports.ReportsCore.Tools
 Imports Newtonsoft.Json.Linq
 Imports SDL
@@ -72,6 +73,8 @@ Public Class frmATEZ_NCTS
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        Try
+            Me.Cursor = Cursors.WaitCursor
 
             If id > 0 Then
 
@@ -133,6 +136,15 @@ Public Class frmATEZ_NCTS
                         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
+                            .selectedDocuments &= doc.Cells("anh_docId").Value & ", "
+                        End If
+                    Next
+
                     .SAVE()
 
                 End With
@@ -160,8 +172,12 @@ Public Class frmATEZ_NCTS
                 sendAtezData(atezData, atez)
 
             End If
+            Me.Cursor = Cursors.Default
 
+        Catch ex As Exception
 
+            Me.Cursor = Cursors.Default
+        End Try
 
     End Sub
 
@@ -208,7 +224,8 @@ Public Class frmATEZ_NCTS
         BezugsNr = BezugsNrTmp
         zusatz = "A"
 
-        If dgv IsNot Nothing Then
+        If dgv IsNot Nothing And dgv.Rows.Count > 0 Then
+            BezugsNr = BezugsNrTmp & "/" & zusatz
             For Each r As DataGridViewRow In dgv.Rows
                 If r.Cells("BezugsNr").Value = BezugsNr Then
 
@@ -277,7 +294,9 @@ Public Class frmATEZ_NCTS
 
 
                 lblBezugsnummer.Text = atez_data.VERAG_LRN
-                cboStammreferenz._value = atez_data.SendungsId
+
+                cboStammreferenz.fillWithSQL("SELECT [dySr_Stammreferenz],[dySr_Bezeichnung] FROM [tblDakosy_Stammreferenzen] WHERE dySr_Land='DE' AND dySr_Verfahren='NCTS'  and dySr_dy_Mandant='" & txtDyMandant.Text & "'  and dySr_dy_Niederlassung IN ('','" & txtDyNiederlassung.Text & "')  and dySr_visible=1", False, "FMZOLL", True)
+                cboStammreferenz.changeItem(atez_data.DAKOSY_TemplateCode)
 
                 txtLKWId.Text = atez_data.LicensePlateContainerNo
 

Aviso/frmSendungsdetailsNEU.vb

@@ -5749,11 +5749,18 @@ Public Class frmSendungsdetailsNEU
         If txtFrachtfuehrer.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtFrachtführer.Text = txtFrachtfuehrer.KdData_ADRESSEN.getAdressFromatted()
         If txtEmpfaenger.KdData_ADRESSEN IsNot Nothing Then f.uCmr.txtEmpfänger.Text = txtEmpfaenger.KdData_ADRESSEN.getAdressFromatted()
 
-        f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, "")))
+        f.uCmr.dgvLadungenKurz.Rows.Add(If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Colli, ""), "Pk", If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Warenbezeichnung, ""), If(SENDUNG_LIST(CURRENT_INDEX).tblSnd_Gewicht, ""))
 
         f.uCmr.txtKfz.Text = AVISO.LKW_Nr
         f.uCmr.txtAnhänger.Text = AVISO.LKW_Nr
 
+        If SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle <> "" Then
+            f.uCmr.txtAnweisungenDesAbsenders.Text = "Bestimmungszollstelle: " & vbNewLine & SENDUNG_LIST(CURRENT_INDEX).NCTS_Bestimmungszollstelle ' usrcntl_NCTS.txtT1VerzollungsadresseBestimmungszollstelle.Text
+
+        End If
+
+
+
         If f.ShowDialog(Me) Then
 
             Dim da_id = -1

Aviso/usrcntlAktDetailsATILLANeu.vb

@@ -1648,7 +1648,6 @@ Public Class usrcntlAktDetailsATILLANeu
 
         Try
 
-
             If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
                 Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0)
 
@@ -1661,7 +1660,6 @@ Public Class usrcntlAktDetailsATILLANeu
             MsgBox(ex.Message & ex.StackTrace)
         End Try
         Me.Cursor = Cursors.Default
-
     End Sub
 
     Private Sub Button12_Click_1(sender As Object, e As EventArgs) Handles Button12.Click
@@ -1671,7 +1669,7 @@ Public Class usrcntlAktDetailsATILLANeu
     Private Sub dgvATEZNCTS_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles dgvATEZNCTS.CellDoubleClick
 
         Try
-
+            Me.Cursor = Cursors.WaitCursor
 
             If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
                 Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(0)
@@ -1685,7 +1683,7 @@ Public Class usrcntlAktDetailsATILLANeu
         Catch ex As Exception
         MsgBox(ex.Message & ex.StackTrace)
         End Try
-        Me.Cursor = Cursors.Default
+
     End Sub
 
 End Class