diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index 2087ab3..c510e00 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -108,7 +108,7 @@
x64
- LME.pfx
+ Aviso_TemporaryKey.pfx
diff --git a/Aviso/frmATEZ_NCTS.Designer.vb b/Aviso/frmATEZ_NCTS.Designer.vb
index 88ef04b..54514fb 100644
--- a/Aviso/frmATEZ_NCTS.Designer.vb
+++ b/Aviso/frmATEZ_NCTS.Designer.vb
@@ -22,6 +22,7 @@ Partial Class frmATEZ_NCTS
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
Private Sub InitializeComponent()
+ Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmATEZ_NCTS))
Me.Button1 = New System.Windows.Forms.Button()
Me.pnlHead = New System.Windows.Forms.Panel()
@@ -61,7 +62,7 @@ Partial Class frmATEZ_NCTS
Me.Label4 = New System.Windows.Forms.Label()
Me.sbBestimmungsZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
Me.Label3 = New System.Windows.Forms.Label()
- Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
+ Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.Label9 = New System.Windows.Forms.Label()
Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox()
@@ -69,6 +70,8 @@ Partial Class frmATEZ_NCTS
Me.Label1 = New System.Windows.Forms.Label()
Me.txtDyNiederlassung = New System.Windows.Forms.Label()
Me.lblBezugsnummer = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.cboProzedur = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.pnlHead.SuspendLayout()
CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@@ -93,6 +96,8 @@ Partial Class frmATEZ_NCTS
'
Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
Me.pnlHead.BackColor = System.Drawing.Color.White
+ Me.pnlHead.Controls.Add(Me.Label2)
+ Me.pnlHead.Controls.Add(Me.cboProzedur)
Me.pnlHead.Controls.Add(Me.lblInfo)
Me.pnlHead.Controls.Add(Me.Label6)
Me.pnlHead.Controls.Add(Me.Label8)
@@ -921,6 +926,31 @@ Partial Class frmATEZ_NCTS
Me.lblBezugsnummer.Text = "4800/000000/17 AAA"
Me.lblBezugsnummer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
'
+ 'Label2
+ '
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(10, 36)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(52, 13)
+ Me.Label2.TabIndex = 150
+ Me.Label2.Text = "Prozedur:"
+ Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopRight
+ '
+ 'cboProzedur
+ '
+ Me.cboProzedur._allowedValuesFreiText = Nothing
+ Me.cboProzedur._allowFreiText = False
+ Me.cboProzedur._value = ""
+ Me.cboProzedur.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer))
+ Me.cboProzedur.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.cboProzedur.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.cboProzedur.FormattingEnabled = True
+ Me.cboProzedur.Location = New System.Drawing.Point(151, 33)
+ Me.cboProzedur.Name = "cboProzedur"
+ Me.cboProzedur.Size = New System.Drawing.Size(100, 21)
+ Me.cboProzedur.TabIndex = 149
+ '
'frmATEZ_NCTS
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -985,4 +1015,6 @@ Partial Class frmATEZ_NCTS
Friend WithEvents Label1 As Label
Friend WithEvents txtDyNiederlassung As Label
Friend WithEvents lblBezugsnummer As Label
+ Friend WithEvents Label2 As Label
+ Friend WithEvents cboProzedur As VERAG_PROG_ALLGEMEIN.MyComboBox
End Class
diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb
index 44d09b9..315a92c 100644
--- a/Aviso/frmATEZ_NCTS.vb
+++ b/Aviso/frmATEZ_NCTS.vb
@@ -103,6 +103,7 @@ Public Class frmATEZ_NCTS
.VERAG_LRN = lblBezugsnummer.Text
.LicensePlateContainerNo = txtLKWId.Text
.DAKOSY_TemplateCode = cboStammreferenz._value
+ .DAKOSY_Procedure = cboProzedur._value
.DAKOSY_IOPartner = txtDyMandant.Text
.DAKOSY_Division3 = txtDyNiederlassung.Text
.DepartureCustomsOffice = sbAbgangZollstelle._value
@@ -249,6 +250,17 @@ Public Class frmATEZ_NCTS
initSeachboxes()
initAttachment()
+
+ cboProzedur.Items.Clear()
+ cboProzedur.Items.Add(New MyListItem("T1", "T1"))
+ cboProzedur.Items.Add(New MyListItem("T2", "T2"))
+ cboProzedur.Items.Add(New MyListItem("TIR", "TIR"))
+
+ Select Case FIRMA_DY
+ Case "ATILLA" : cboProzedur.changeItem("T2")
+ Case Else : cboProzedur.changeItem("T1")
+ End Select
+
If openExisting Then
If id > 0 Then
@@ -265,6 +277,7 @@ Public Class frmATEZ_NCTS
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)
+ cboProzedur.changeItem(atez_data.DAKOSY_Procedure)
txtLKWId.Text = atez_data.LicensePlateContainerNo
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index fe52151..f4f4322 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -407,8 +407,8 @@ Public Class frmSendungsdetailsNEU
' ToolStripMenuItem13.Enabled = True
End If
- If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me) Then
- Button19.Visible = True
+ If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ATEZ_NCTS", Me) Then
+ Button20.Visible = True
End If
@@ -3067,6 +3067,8 @@ Public Class frmSendungsdetailsNEU
initVermerke()
ElseIf TabControl1.SelectedTab Is tbAnhang Then
initAnhang()
+ ElseIf TabControl1.SelectedTab Is tbKundenInfo Then
+ initdgvATEZ()
ElseIf TabControl1.SelectedTab Is tbKundenInfo Then
Dim kdSrc As VERAG_PROG_ALLGEMEIN.KdSearchBox = txtAuftraggeber
If kdSrc.KdNr_value <= 0 Then kdSrc = txtEmpfaenger
@@ -6276,30 +6278,31 @@ Public Class frmSendungsdetailsNEU
Me.Cursor = Cursors.Default
End Sub
- Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click, ToolStripMenuItem12.Click
cntxAPI.Show(Cursor.Position)
- 'If Not atez.setData(atezData, dgvAnhang) Then MsgBox("Fehler beim Erstellen der Daten")
-
- 'atez.SendRequestWithAuthHeader("application/json", failreDesc)
-
- 'If failreDesc <> "" Then
- ' atezData.status = failreDesc
- ' atezData.SAVE()
- ' MsgBox(failreDesc)
- 'Else
- ' atezData.status = "Sent"
- ' atezData.SAVE()
- 'End If
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ End Try
End Sub
- Private Sub ToolStripMenuItem31_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem31.Click
- 'MsgBox("Funktion noch nicht implementiert!")
- 'Exit Sub
+ Private Sub Button20_Click_1(sender As Object, e As EventArgs) Handles Button20.Click
+ SAVE_ME()
+
+ Try
+ If SENDUNG_LIST IsNot Nothing AndAlso SENDUNG_LIST.Count > 0 Then
+ Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX)
+ Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"))
+ frmAttilaATEZNCTS.Show(Me)
+ End If
+
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ End Try
+ Me.Cursor = Cursors.Default
SAVE_ME()
If Not IsNumeric(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) OrElse CInt(SENDUNG_LIST(CURRENT_INDEX).AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub
@@ -6345,4 +6348,5 @@ Public Class frmSendungsdetailsNEU
End Sub
+ End Sub
End Class