diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj
index d4f7543..5698ab8 100644
--- a/Aviso/Aviso.vbproj
+++ b/Aviso/Aviso.vbproj
@@ -108,7 +108,7 @@
x64
- LME.pfx
+ Aviso_TemporaryKey.pfx
diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb
index bc043f1..2a6970c 100644
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
@@ -27,7 +27,10 @@ Partial Class frmSendungsdetailsNEU
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+ Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.pnl = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl()
@@ -38,6 +41,7 @@ Partial Class frmSendungsdetailsNEU
Me.dgvAnhang = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.btnDirektAnfuegen = New System.Windows.Forms.Button()
Me.Panel19 = New System.Windows.Forms.Panel()
+ Me.Button19 = New System.Windows.Forms.Button()
Me.Button17 = New System.Windows.Forms.Button()
Me.btnQuckScan = New System.Windows.Forms.Button()
Me.Panel21 = New System.Windows.Forms.Panel()
@@ -169,7 +173,6 @@ Partial Class frmSendungsdetailsNEU
Me.btnKassenbuchEintrag = New System.Windows.Forms.Button()
Me.btnLeihgeld = New System.Windows.Forms.Button()
Me.Panel6 = New System.Windows.Forms.Panel()
- Me.Button19 = New System.Windows.Forms.Button()
Me.txtFrachtfuehrer = New VERAG_PROG_ALLGEMEIN.KdSearchBox()
Me.Panel12 = New System.Windows.Forms.Panel()
Me.lblErr_FraechterKdNr = New System.Windows.Forms.Label()
@@ -415,6 +418,8 @@ Partial Class frmSendungsdetailsNEU
Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem()
Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.tbATEZ = New System.Windows.Forms.TabPage()
+ Me.dgvATEZNCTS = New System.Windows.Forms.DataGridView()
Me.pnl.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout()
@@ -474,6 +479,8 @@ Partial Class frmSendungsdetailsNEU
Me.ctxtWeitereFormulare.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
Me.ContextMenuStrip2.SuspendLayout()
+ Me.tbATEZ.SuspendLayout()
+ CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'pnl
@@ -508,6 +515,7 @@ Partial Class frmSendungsdetailsNEU
Me.TabControl1.Controls.Add(Me.TabPage1)
Me.TabControl1.Controls.Add(Me.TabPage2)
Me.TabControl1.Controls.Add(Me.TabPage3)
+ Me.TabControl1.Controls.Add(Me.tbATEZ)
Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill
Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
Me.TabControl1.Location = New System.Drawing.Point(0, 3)
@@ -612,6 +620,21 @@ Partial Class frmSendungsdetailsNEU
Me.Panel19.Size = New System.Drawing.Size(1206, 45)
Me.Panel19.TabIndex = 0
'
+ 'Button19
+ '
+ Me.Button19.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.Button19.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
+ Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.Button19.Location = New System.Drawing.Point(81, 5)
+ Me.Button19.Name = "Button19"
+ Me.Button19.Size = New System.Drawing.Size(72, 34)
+ Me.Button19.TabIndex = 8
+ Me.Button19.Text = "ATEZ"
+ Me.Button19.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.Button19.UseVisualStyleBackColor = True
+ Me.Button19.Visible = False
+ '
'Button17
'
Me.Button17.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2239,8 +2262,8 @@ Partial Class frmSendungsdetailsNEU
'clmnPreis
'
Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill
- DataGridViewCellStyle4.Format = "C2"
- Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle4
+ DataGridViewCellStyle7.Format = "C2"
+ Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle7
Me.clmnPreis.HeaderText = "Preis"
Me.clmnPreis.MaxInputLength = 15
Me.clmnPreis.Name = "clmnPreis"
@@ -2435,21 +2458,6 @@ Partial Class frmSendungsdetailsNEU
Me.Panel6.Size = New System.Drawing.Size(775, 325)
Me.Panel6.TabIndex = 1
'
- 'Button19
- '
- Me.Button19.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.Button19.Image = Global.AVISO.My.Resources.Resources.spedbuch_small
- Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.Button19.Location = New System.Drawing.Point(81, 5)
- Me.Button19.Name = "Button19"
- Me.Button19.Size = New System.Drawing.Size(72, 34)
- Me.Button19.TabIndex = 8
- Me.Button19.Text = "ATEZ"
- Me.Button19.TextAlign = System.Drawing.ContentAlignment.MiddleRight
- Me.Button19.UseVisualStyleBackColor = True
- Me.Button19.Visible = False
- '
'txtFrachtfuehrer
'
Me.txtFrachtfuehrer._AlleFirmenCLUSTER = False
@@ -5347,6 +5355,54 @@ Partial Class frmSendungsdetailsNEU
Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(255, 30)
Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen"
'
+ 'tbATEZ
+ '
+ Me.tbATEZ.Controls.Add(Me.dgvATEZNCTS)
+ Me.tbATEZ.Location = New System.Drawing.Point(4, 29)
+ Me.tbATEZ.Name = "tbATEZ"
+ Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3)
+ Me.tbATEZ.Size = New System.Drawing.Size(1206, 288)
+ Me.tbATEZ.TabIndex = 6
+ Me.tbATEZ.Text = "ATEZ"
+ Me.tbATEZ.UseVisualStyleBackColor = True
+ '
+ 'dgvATEZNCTS
+ '
+ Me.dgvATEZNCTS.AllowUserToAddRows = False
+ Me.dgvATEZNCTS.AllowUserToDeleteRows = False
+ Me.dgvATEZNCTS.AllowUserToResizeRows = False
+ DataGridViewCellStyle4.BackColor = System.Drawing.Color.Azure
+ DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+ Me.dgvATEZNCTS.BackgroundColor = System.Drawing.Color.White
+ DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ DataGridViewCellStyle5.BackColor = System.Drawing.Color.LightBlue
+ DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!)
+ DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+ DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
+ Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing
+ Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 3)
+ Me.dgvATEZNCTS.MultiSelect = False
+ Me.dgvATEZNCTS.Name = "dgvATEZNCTS"
+ Me.dgvATEZNCTS.ReadOnly = True
+ Me.dgvATEZNCTS.RowHeadersVisible = False
+ Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
+ DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6
+ Me.dgvATEZNCTS.RowTemplate.Height = 20
+ Me.dgvATEZNCTS.RowTemplate.ReadOnly = True
+ Me.dgvATEZNCTS.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False]
+ Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
+ Me.dgvATEZNCTS.ShowCellErrors = False
+ Me.dgvATEZNCTS.ShowRowErrors = False
+ Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 282)
+ Me.dgvATEZNCTS.TabIndex = 105
+ Me.dgvATEZNCTS.TabStop = False
+ '
'frmSendungsdetailsNEU
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
@@ -5441,6 +5497,8 @@ Partial Class frmSendungsdetailsNEU
Me.ctxtWeitereFormulare.ResumeLayout(False)
Me.ContextMenuStrip1.ResumeLayout(False)
Me.ContextMenuStrip2.ResumeLayout(False)
+ Me.tbATEZ.ResumeLayout(False)
+ CType(Me.dgvATEZNCTS, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
@@ -5832,4 +5890,6 @@ Partial Class frmSendungsdetailsNEU
Friend WithEvents AntragQualitätskontrolleToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolStripMenuItem31 As ToolStripMenuItem
Friend WithEvents ToolStripMenuItem32 As ToolStripMenuItem
+ Friend WithEvents tbATEZ As TabPage
+ Friend WithEvents dgvATEZNCTS As DataGridView
End Class
diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb
index fec9d1b..8f391b0 100644
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -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
@@ -6354,5 +6356,52 @@ Public Class frmSendungsdetailsNEU
End Sub
End Sub
+ Sub initdgvATEZ()
+ With dgvATEZNCTS
+ .Columns.Clear()
+ .ReadOnly = False
+ .DataSource = SQL.loadDgvBySql("select [Id],'ATEZ' as Art ,[VERAG_LRN] as BezugsNr,[erstellung] as Erstellung,[Status] as Status FROM [tblATEZ_NCTS] WHERE AvisoId='" & AvisoId & "' AND [SendungsId]='" & SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID & "'", "FMZOLL")
+ If .Columns.Count <= 0 Then Exit Sub
+ 'Ä.Columns("txtStatus").ReadOnly = False
+ .Columns("Id").Visible = False
+
+ .Columns("Art").HeaderText = "Art"
+ .Columns("Art").Width = 80
+
+ .Columns("Status").HeaderText = "Art"
+ .Columns("Status").Width = 80
+
+ .Columns("BezugsNr").HeaderText = "BezugsNr"
+ .Columns("BezugsNr").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+
+ .Columns("Erstellung").HeaderText = "Erstellt"
+ .Columns("Erstellung").Width = 100
+ .Columns("Erstellung").DefaultCellStyle.Format = "dd.MM.yy HH:mm"
+ .Columns("Erstellung").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+ .ReadOnly = False
+ End With
+
+ End Sub
+
+ 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)
+
+ Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy"))
+ frmAttilaATEZNCTS.Show(Me)
+ Me.Refresh()
+ End If
+
+
+ Catch ex As Exception
+ MsgBox(ex.Message & ex.StackTrace)
+ End Try
+
+ End Sub
End Class