From a40ff7a7c21b88329f373497ad873d852427c37b Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 10 Mar 2026 11:37:00 +0100 Subject: [PATCH] ATBGestellung, Gesamtsicherheiten, etc. --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmGesamtsicherheitenNEU.vb | 2 +- Aviso/frmSendungsdetailsNEU.vb | 6 +- Aviso/usrCntlSND_ATBGestellung.Designer.vb | 110 ++++++++++++--------- Aviso/usrCntlSND_ATBGestellung.vb | 8 +- 5 files changed, 75 insertions(+), 55 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 0c98f19..2244c45 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/frmGesamtsicherheitenNEU.vb b/Aviso/frmGesamtsicherheitenNEU.vb index 0d15e0d..e627229 100644 --- a/Aviso/frmGesamtsicherheitenNEU.vb +++ b/Aviso/frmGesamtsicherheitenNEU.vb @@ -616,7 +616,7 @@ Public Class frmGesamtsicherheitenNEU If dt.Rows.Count > 0 Then Me.avisoID = setNullToZero(dt.Rows(0).Item("gs_avisoId")) - Me.LKWKZ = dt.Rows(0).Item("gs_LKWKZ") + Me.LKWKZ = IIf(IsDBNull(dt.Rows(0).Item("gs_LKWKZ")), "", dt.Rows(0).Item("gs_LKWKZ")) Me.FilialNummer = setNullToZero(dt.Rows(0).Item("gs_filialenNr")) Me.Abfertigungsnummer = dt.Rows(0).Item("gs_abfertigungsNr") Me.warenortID = setNullToZero(dt.Rows(0).Item("gs_warenort")) diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 2e0ee0b..7e0da22 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -602,7 +602,7 @@ Public Class frmSendungsdetailsNEU End If ContextMenuStrip3.Items.Clear() - Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [AVISO].[dbo].[tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO") + Dim dt = SQL.loadDgvBySql("SELECT [grz_Grenzstelle],grz_BezeichnungCBO FROM [tblGrenzstelle] where grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "'", "AVISO") If dt IsNot Nothing Then dt.Rows.Add({"???", "??? - andere"}) For Each r As DataRow In dt.Rows @@ -1654,7 +1654,7 @@ Public Class frmSendungsdetailsNEU Case 44 usrcntl_ATB.txtATBT1.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1, "") usrcntl_ATB.txtATBNr.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr, "") - usrcntl_ATB.txtT1Datum.Text = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist, "") + usrcntl_ATB.txtT1Datum._value = loadValue(SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist, "") If SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren Is Nothing Then usrcntl_ATB.cbxATBFakturieren.CheckState = CheckState.Indeterminate @@ -2100,7 +2100,7 @@ Public Class frmSendungsdetailsNEU If pnlT1.Controls.Count > 0 AndAlso pnlT1.Controls(0).GetType Is GetType(usrCntlSND_ATBGestellung) Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_T1 = usrcntl_ATB.txtATBT1.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATB_Nr = usrcntl_ATB.txtATBNr.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist = usrcntl_ATB.txtT1Datum.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_T1_Frist = usrcntl_ATB.txtT1Datum._value Select Case usrcntl_ATB.cbxATBFakturieren.CheckState Case CheckState.Indeterminate : SENDUNG_LIST(CURRENT_INDEX).tblSnd_ATBFakturieren = Nothing diff --git a/Aviso/usrCntlSND_ATBGestellung.Designer.vb b/Aviso/usrCntlSND_ATBGestellung.Designer.vb index 343052d..cb81d4f 100644 --- a/Aviso/usrCntlSND_ATBGestellung.Designer.vb +++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb @@ -23,6 +23,9 @@ Partial Class usrCntlSND_ATBGestellung Private Sub InitializeComponent() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.Label1 = New System.Windows.Forms.Label() Me.btnGesSicherheit = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox() @@ -32,14 +35,14 @@ Partial Class usrCntlSND_ATBGestellung Me.Label3 = New System.Windows.Forms.Label() Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label33 = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.txtT1Datum = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.DateTimePicker1 = New System.Windows.Forms.DateTimePicker() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.pnlT1.SuspendLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnlT1 ' + Me.pnlT1.Controls.Add(Me.PictureBox5) Me.pnlT1.Controls.Add(Me.txtT1Datum) Me.pnlT1.Controls.Add(Me.DateTimePicker1) Me.pnlT1.Controls.Add(Me.Label1) @@ -57,6 +60,52 @@ Partial Class usrCntlSND_ATBGestellung Me.pnlT1.Size = New System.Drawing.Size(549, 125) Me.pnlT1.TabIndex = 0 ' + 'txtT1Datum + ' + Me.txtT1Datum._DateTimeOnly = False + Me.txtT1Datum._numbersOnly = False + Me.txtT1Datum._numbersOnlyKommastellen = "" + Me.txtT1Datum._numbersOnlyTrennzeichen = True + Me.txtT1Datum._Prozent = False + Me.txtT1Datum._ShortDateNew = True + Me.txtT1Datum._ShortDateOnly = False + Me.txtT1Datum._TimeOnly = False + Me.txtT1Datum._TimeOnly_Seconds = False + Me.txtT1Datum._value = "" + Me.txtT1Datum._Waehrung = False + Me.txtT1Datum._WaehrungZeichen = True + Me.txtT1Datum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtT1Datum.ForeColor = System.Drawing.Color.Black + Me.txtT1Datum.Location = New System.Drawing.Point(272, 33) + Me.txtT1Datum.MaxLength = 10 + Me.txtT1Datum.MaxLineLength = -1 + Me.txtT1Datum.MaxLines_Warning = "" + Me.txtT1Datum.MaxLines_Warning_Label = Nothing + Me.txtT1Datum.Name = "txtT1Datum" + Me.txtT1Datum.Size = New System.Drawing.Size(83, 20) + Me.txtT1Datum.TabIndex = 38 + ' + 'DateTimePicker1 + ' + Me.DateTimePicker1.CustomFormat = "''" + Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom + Me.DateTimePicker1.Location = New System.Drawing.Point(272, 33) + Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0) + Me.DateTimePicker1.Name = "DateTimePicker1" + Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No + Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20) + Me.DateTimePicker1.TabIndex = 39 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.Location = New System.Drawing.Point(158, 36) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(101, 13) + Me.Label1.TabIndex = 26 + Me.Label1.Text = "Vorpapier / T1 Frist:" + ' 'btnGesSicherheit ' Me.btnGesSicherheit.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -192,51 +241,16 @@ Partial Class usrCntlSND_ATBGestellung Me.Label33.TabIndex = 3 Me.Label33.Text = "Vorpapier / T1:" ' - 'Label1 + 'PictureBox5 ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(158, 36) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(101, 13) - Me.Label1.TabIndex = 26 - Me.Label1.Text = "Vorpapier / T1 Frist:" - ' - 'txtT1Datum - ' - Me.txtT1Datum._DateTimeOnly = False - Me.txtT1Datum._numbersOnly = False - Me.txtT1Datum._numbersOnlyKommastellen = "" - Me.txtT1Datum._numbersOnlyTrennzeichen = True - Me.txtT1Datum._Prozent = False - Me.txtT1Datum._ShortDateNew = True - Me.txtT1Datum._ShortDateOnly = False - Me.txtT1Datum._TimeOnly = False - Me.txtT1Datum._TimeOnly_Seconds = False - Me.txtT1Datum._value = "" - Me.txtT1Datum._Waehrung = False - Me.txtT1Datum._WaehrungZeichen = True - Me.txtT1Datum.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtT1Datum.ForeColor = System.Drawing.Color.Black - Me.txtT1Datum.Location = New System.Drawing.Point(272, 33) - Me.txtT1Datum.MaxLength = 10 - Me.txtT1Datum.MaxLineLength = -1 - Me.txtT1Datum.MaxLines_Warning = "" - Me.txtT1Datum.MaxLines_Warning_Label = Nothing - Me.txtT1Datum.Name = "txtT1Datum" - Me.txtT1Datum.Size = New System.Drawing.Size(83, 20) - Me.txtT1Datum.TabIndex = 38 - ' - 'DateTimePicker1 - ' - Me.DateTimePicker1.CustomFormat = "''" - Me.DateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom - Me.DateTimePicker1.Location = New System.Drawing.Point(272, 33) - Me.DateTimePicker1.Margin = New System.Windows.Forms.Padding(0) - Me.DateTimePicker1.Name = "DateTimePicker1" - Me.DateTimePicker1.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.DateTimePicker1.Size = New System.Drawing.Size(115, 20) - Me.DateTimePicker1.TabIndex = 39 + Me.PictureBox5.BackgroundImage = Global.AVISO.My.Resources.Resources.fragezeichen1 + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox5.Location = New System.Drawing.Point(0, 8) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(18, 19) + Me.PictureBox5.TabIndex = 132 + Me.PictureBox5.TabStop = False + Me.PictureBox5.Visible = False ' 'usrCntlSND_ATBGestellung ' @@ -245,6 +259,7 @@ Partial Class usrCntlSND_ATBGestellung Me.Size = New System.Drawing.Size(553, 129) Me.pnlT1.ResumeLayout(False) Me.pnlT1.PerformLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -261,4 +276,5 @@ Partial Class usrCntlSND_ATBGestellung Friend WithEvents Label1 As Label Friend WithEvents txtT1Datum As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents DateTimePicker1 As DateTimePicker + Friend WithEvents PictureBox5 As PictureBox End Class diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb index 619edfe..de1a199 100644 --- a/Aviso/usrCntlSND_ATBGestellung.vb +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -42,7 +42,7 @@ Public Class usrCntlSND_ATBGestellung If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub If SND.tblSnd_T1_Frist IsNot Nothing AndAlso IsDate(SND.tblSnd_T1_Frist) Then - If CDate(SND.tblSnd_T1_Frist) <= Today() Then + If CDate(SND.tblSnd_T1_Frist) >= Today() Then '-> OK Else MsgBox("T1 Frist ist abgelaufen!") @@ -267,7 +267,6 @@ Public Class usrCntlSND_ATBGestellung Private Sub usrCntlSND_ATBGestellung_Load(sender As Object, e As EventArgs) Handles MyBase.Load - initGesamtsicherheiten() End Sub @@ -318,6 +317,11 @@ Public Class usrCntlSND_ATBGestellung txtT1Datum._value = CDate(sender.value).ToShortDateString End Sub + Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click + Dim webAddress As String = "https://wiki.verag.ag/e/de/software/aviso/howtos/Gesamtsicherheiten-AUTO" + Process.Start(webAddress) + End Sub + 'Public Sub setValues() ' txtATBT1.Text = If(NCTS_GA.nga_name, "")