Aviso, etc.

2026-02-11 16:10:41 +01:00
parent 7e7cb6e49e
commit 8d8bbc644e
6 changed files with 164 additions and 150 deletions
--- a/Aviso/AktenErfassung/frmEintragAviso.designer.vb
+++ b/Aviso/AktenErfassung/frmEintragAviso.designer.vb
@@ -152,9 +152,10 @@ Partial Class frmEintragAviso
        Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label2 = New System.Windows.Forms.Label()
+        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
+        Me.lblAnhaenge = New System.Windows.Forms.Label()
        Me.UsrCntlAviso_Vorpapiere1 = New AVISO.usrCntlAviso_Vorpapiere()
        Me.UsrCntlEintragAvisoAtilla = New AVISO.usrCntlEintragAvisoAtilla()
-        Me.lblErrErfasstDat = New System.Windows.Forms.Label()
        Me.panAdmin.SuspendLayout()
        Me.grpAviso.SuspendLayout()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1826,6 +1827,28 @@ Partial Class frmEintragAviso
        Me.Label2.TabIndex = 5
        Me.Label2.Text = "FIRMA:"
        '
+        'lblErrErfasstDat
+        '
+        Me.lblErrErfasstDat.AutoSize = True
+        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
+        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
+        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
+        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
+        Me.lblErrErfasstDat.TabIndex = 52
+        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
+        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
+        Me.lblErrErfasstDat.Visible = False
+        '
+        'lblAnhaenge
+        '
+        Me.lblAnhaenge.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.lblAnhaenge.AutoSize = True
+        Me.lblAnhaenge.Location = New System.Drawing.Point(699, 641)
+        Me.lblAnhaenge.Name = "lblAnhaenge"
+        Me.lblAnhaenge.Size = New System.Drawing.Size(56, 13)
+        Me.lblAnhaenge.TabIndex = 56
+        Me.lblAnhaenge.Text = "Anhänge: "
+        '
        'UsrCntlAviso_Vorpapiere1
        '
        Me.UsrCntlAviso_Vorpapiere1.BackColor = System.Drawing.Color.White
@@ -1843,18 +1866,6 @@ Partial Class frmEintragAviso
        Me.UsrCntlEintragAvisoAtilla.TabIndex = 8
        Me.UsrCntlEintragAvisoAtilla.Visible = False
        '
-        'lblErrErfasstDat
-        '
-        Me.lblErrErfasstDat.AutoSize = True
-        Me.lblErrErfasstDat.ForeColor = System.Drawing.Color.Red
-        Me.lblErrErfasstDat.Location = New System.Drawing.Point(139, 5)
-        Me.lblErrErfasstDat.Name = "lblErrErfasstDat"
-        Me.lblErrErfasstDat.Size = New System.Drawing.Size(85, 26)
-        Me.lblErrErfasstDat.TabIndex = 52
-        Me.lblErrErfasstDat.Text = "Darf nicht in der " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Zukunft liegen!"
-        Me.lblErrErfasstDat.TextAlign = System.Drawing.ContentAlignment.TopRight
-        Me.lblErrErfasstDat.Visible = False
-        '
        'frmEintragAviso
        '
        Me.AcceptButton = Me.btnOK
@@ -1862,6 +1873,7 @@ Partial Class frmEintragAviso
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(792, 765)
+        Me.Controls.Add(Me.lblAnhaenge)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.cboFirma)
        Me.Controls.Add(Me.UsrCntlAviso_Vorpapiere1)
@@ -1925,12 +1937,10 @@ Partial Class frmEintragAviso
    Friend WithEvents btnOK As System.Windows.Forms.Button
    Friend WithEvents lblErfAm As System.Windows.Forms.Label
    Friend WithEvents btnAbbruch As System.Windows.Forms.Button
-    Friend WithEvents txtInfo As System.Windows.Forms.TextBox
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents lblFraecher As System.Windows.Forms.Label
    Friend WithEvents lblAvisierer As System.Windows.Forms.Label
    Friend WithEvents lblLkwKennzeichen As System.Windows.Forms.Label
-    Friend WithEvents txtÄnderungen As System.Windows.Forms.TextBox
    Friend WithEvents lblAenderungen As System.Windows.Forms.Label
    Friend WithEvents txtLKW_Nr As System.Windows.Forms.TextBox
    Friend WithEvents txtDatum As System.Windows.Forms.TextBox
@@ -2054,4 +2064,7 @@ Partial Class frmEintragAviso
    Friend WithEvents lblTeamAvisierer As Label
    Friend WithEvents cbxEintreffenAus As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents lblErrErfasstDat As Label
+    Public WithEvents lblAnhaenge As Label
+    Public WithEvents txtInfo As TextBox
+    Public WithEvents txtÄnderungen As TextBox
 End Class
--- a/Aviso/AktenErfassung/frmEintragAviso.vb
+++ b/Aviso/AktenErfassung/frmEintragAviso.vb
@@ -32,6 +32,8 @@ Public Class frmEintragAviso
    Dim PROG As New cProgramFunctions
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

+    Dim INFO As String = ""
+

    Public FIRMA_TMP As String = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA

@@ -40,6 +42,14 @@ Public Class frmEintragAviso
        Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
    End Sub

+
+    Public Sub New(INFO As String)
+        InitializeComponent()
+        Icon = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.GetProgrammIcon
+
+        Me.INFO = INFO
+    End Sub
+
    Private Sub frmEintragAviso_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
        If FIRMA_TMP = "ATILLA" And myAviso.Status = VERAG_PROG_ALLGEMEIN.cGlobal.Status_Ankunft Then
            If myAviso.Frächter = "" Then
@@ -325,6 +335,9 @@ Public Class frmEintragAviso
            dtpAvisoEingangDatum.Value = Now.Date
            dtpAvisoEingangZeit.Value = LeerDatum
            txtÄnderungen.Text = "Neuanlage von " & cGlobal.AktiverMitarbeiter.Mitarbeiter
+            If INFO <> "" Then txtÄnderungen.Text &= vbNewLine & vbNewLine & INFO
+
+
            lblStatus.Text = "Neuanlage"
            optAvisoEingang.Checked = True
            kdAvisierer.Text = ""
@@ -666,18 +679,18 @@ Public Class frmEintragAviso
            'If Neuanlage Then
            '  If optAvisoEingang.Checked Then
            '  If optAvisoEingang.Checked Thensend
-            '    If dtpAvisoEingangDatum.Value < Now.Date Then
+            '    If dtpAvisoEingangDatum.Value <Now.Date Then
            '         Dim antwort As MsgBoxResult = MsgBox("Das Aviso-Eingangsdatum liegt in der Vergangenheit. Wollen Sie den Eintrag trotzdem speichern?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle),
-            '                                 "Aviso speichern")
-            '        If antwort = vbNo Then
-            '          dtpAvisoEingangDatum.Focus()
-            '          Exit Sub
-            '      End If
-            '    End If
-            '  End If
-            'End If
+                                        '                                 "Aviso speichern")
+                                        '        If antwort = vbNo Then
+                                        '          dtpAvisoEingangDatum.Focus()
+                                        '          Exit Sub
+                                        '      End If
+                                        '    End If
+                                        '  End If
+                                        'End If

-            If txtLKW_Nr.Text.Trim = "" Then
+                                        If txtLKW_Nr.Text.Trim = "" Then
                ' MsgBox("Bitte die LKW-Nummer eingegeben.", vbInformation)
                lblErr_LKW.Visible = True
                txtLKW_Nr.Focus()
@@ -1079,6 +1092,10 @@ Public Class frmEintragAviso
                End If
            End If

+            If INFO <> "" Then
+                AvisoStatusFunctions.insertVermerkAllg(tmpId, INFO, 123)
+            End If
+
            If myAviso.Warenort Then
                AvisoStatusFunctions.insertVermerkAllg(tmpId, "ATB-Nr. folgt", 80)
            End If