From d12db728049a800416f21e0eb4ce03ae7dc7e0c6 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 31 Aug 2023 08:44:07 +0200 Subject: [PATCH] ATEZ +Procedure --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmATEZ_NCTS.Designer.vb | 10 ++-- Aviso/frmATEZ_NCTS.vb | 13 ++++- Aviso/frmSendungsdetailsNEU.Designer.vb | 56 ++++++++++++-------- Aviso/frmSendungsdetailsNEU.vb | 12 ++--- Aviso/usrcntlAktDetailsATILLANeu.Designer.vb | 2 +- 6 files changed, 56 insertions(+), 41 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 2a18a30..6c20a04 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmATEZ_NCTS.Designer.vb b/Aviso/frmATEZ_NCTS.Designer.vb index 20530b2..88ef04b 100644 --- a/Aviso/frmATEZ_NCTS.Designer.vb +++ b/Aviso/frmATEZ_NCTS.Designer.vb @@ -22,7 +22,6 @@ 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() @@ -62,7 +61,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.components) + Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview() Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Label9 = New System.Windows.Forms.Label() Me.sbAbgangZollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() @@ -93,6 +92,7 @@ Partial Class frmATEZ_NCTS 'pnlHead ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlHead.BackColor = System.Drawing.Color.White Me.pnlHead.Controls.Add(Me.lblInfo) Me.pnlHead.Controls.Add(Me.Label6) Me.pnlHead.Controls.Add(Me.Label8) @@ -230,7 +230,7 @@ Partial Class frmATEZ_NCTS Me.txtDat._value = "" Me.txtDat._Waehrung = False Me.txtDat._WaehrungZeichen = True - Me.txtDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtDat.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!) Me.txtDat.ForeColor = System.Drawing.Color.Black Me.txtDat.Location = New System.Drawing.Point(151, 137) Me.txtDat.MaxLength = 10 @@ -299,10 +299,10 @@ Partial Class frmATEZ_NCTS Me.cbxTemperatur.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cbxTemperatur.Location = New System.Drawing.Point(13, 164) Me.cbxTemperatur.Name = "cbxTemperatur" - Me.cbxTemperatur.Size = New System.Drawing.Size(125, 17) + Me.cbxTemperatur.Size = New System.Drawing.Size(131, 17) Me.cbxTemperatur.TabIndex = 137 Me.cbxTemperatur.TabStop = False - Me.cbxTemperatur.Text = "Trasport-Temperatur:" + Me.cbxTemperatur.Text = "Transport-Temperatur:" Me.cbxTemperatur.UseVisualStyleBackColor = True ' 'sbDurchgangszollstelle5 diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index d8a1181..988d3e4 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -125,6 +125,14 @@ Public Class frmATEZ_NCTS .Carrier_Adress_Street = usrCntl_Carrier.txtStrasse.Text .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 + .SAVE() End With @@ -396,7 +404,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) @@ -499,8 +507,9 @@ CASE WHEN [anh_Art] = 'ATR-EUR1' then 'EUR' End If End Sub - Private Sub dtpDat_ValueChanged(sender As Object, e As EventArgs) + Private Sub dtpDat_ValueChanged(sender As Object, e As EventArgs) Handles dtpDat.ValueChanged txtDat._value = CDate(sender.value).ToShortDateString End Sub + End Class \ No newline at end of file diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 6d0ee91..bc043f1 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -38,7 +38,6 @@ 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() @@ -78,6 +77,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem24 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem31 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem32 = New System.Windows.Forms.ToolStripMenuItem() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.pnlKundenZolltarif = New System.Windows.Forms.Panel() Me.Label22 = New System.Windows.Forms.Label() @@ -169,6 +169,7 @@ 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() @@ -611,21 +612,6 @@ 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) @@ -891,7 +877,7 @@ Partial Class frmSendungsdetailsNEU 'MenuStrip ' Me.MenuStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem13, Me.ToolStripMenuItem7, Me.ToolStripMenuItem6, Me.ToolStripMenuItem11, Me.ToolStripMenuItem17, Me.ToolStripMenuItem21, Me.ToolStripMenuItem31, Me.ToolStripMenuItem12}) + Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem13, Me.ToolStripMenuItem7, Me.ToolStripMenuItem6, Me.ToolStripMenuItem11, Me.ToolStripMenuItem17, Me.ToolStripMenuItem21, Me.ToolStripMenuItem31, Me.ToolStripMenuItem12, Me.ToolStripMenuItem32}) Me.MenuStrip.Location = New System.Drawing.Point(0, 0) Me.MenuStrip.Name = "MenuStrip" Me.MenuStrip.Size = New System.Drawing.Size(1206, 32) @@ -975,7 +961,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem20.Text = "EZA" ' 'ToolStripMenuItem18 @@ -984,7 +970,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem18.Text = "T1" ' 'ToolStripMenuItem19 @@ -993,7 +979,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem19.Text = "T2" ' 'ToolStripMenuItem21 @@ -1041,12 +1027,20 @@ Partial Class frmSendungsdetailsNEU ' 'ToolStripMenuItem12 ' - Me.ToolStripMenuItem12.Image = Global.AVISO.My.Resources.Resources.android_note + Me.ToolStripMenuItem12.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem12.Name = "ToolStripMenuItem12" - Me.ToolStripMenuItem12.Size = New System.Drawing.Size(69, 28) - Me.ToolStripMenuItem12.Text = " Log" + Me.ToolStripMenuItem12.Size = New System.Drawing.Size(75, 28) + Me.ToolStripMenuItem12.Text = " ATEZ" Me.ToolStripMenuItem12.ToolTipText = "Logbuch" ' + 'ToolStripMenuItem32 + ' + Me.ToolStripMenuItem32.Image = Global.AVISO.My.Resources.Resources.android_note + Me.ToolStripMenuItem32.Name = "ToolStripMenuItem32" + Me.ToolStripMenuItem32.Size = New System.Drawing.Size(69, 28) + Me.ToolStripMenuItem32.Text = " Log" + Me.ToolStripMenuItem32.ToolTipText = "Logbuch" + ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.pnlKundenZolltarif) @@ -2441,6 +2435,21 @@ 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 @@ -5822,4 +5831,5 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents Button19 As Button Friend WithEvents AntragQualitätskontrolleToolStripMenuItem As ToolStripMenuItem Friend WithEvents ToolStripMenuItem31 As ToolStripMenuItem + Friend WithEvents ToolStripMenuItem32 As ToolStripMenuItem End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 378f8b9..7ce84bb 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -3777,7 +3777,7 @@ Public Class frmSendungsdetailsNEU - Private Sub ToolStripMenuItem12_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem12.Click + Private Sub ToolStripMenuItem12_Click(sender As Object, e As EventArgs) Handles ToolStripMenuItem32.Click If dgvZollAnmeldungen.SelectedRows.Count > 0 Then Dim log As New SDL.frmDY_LogBuch(dgvZollAnmeldungen.SelectedRows(0).Cells("dy_id").Value) ' log.Parent = Me.FindForm @@ -6269,17 +6269,13 @@ Public Class frmSendungsdetailsNEU Me.Cursor = Cursors.Default End Sub - Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click + Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click, ToolStripMenuItem12.Click 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 @@ -6291,9 +6287,9 @@ Public Class frmSendungsdetailsNEU - MsgBox("Funktion noch nicht implementiert!") - Exit Sub + Exit Sub + MsgBox("Funktion noch nicht implementiert!") Dim failreDesc As String = "" If dgvAnhang.SelectedRows.Count = 0 Then diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index 9e69363..ee09062 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -864,7 +864,7 @@ Partial Class usrcntlAktDetailsATILLANeu ' Me.Button12.Location = New System.Drawing.Point(0, 0) Me.Button12.Name = "Button12" - Me.Button12.Size = New System.Drawing.Size(75, 23) + Me.Button12.Size = New System.Drawing.Size(27, 23) Me.Button12.TabIndex = 0 Me.Button12.Visible = False '