SndDetails

2026-03-31 10:20:37 +02:00
parent 455477f60c
commit fea2340e8b
6 changed files with 450 additions and 420 deletions
--- a/Elemente/SendTAB.Designer.vb
+++ b/Elemente/SendTAB.Designer.vb
@@ -25,6 +25,7 @@ Partial Class sendTAB
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(sendTAB))
        Me.pnl = New System.Windows.Forms.Panel()
+        Me.lblColliWeight = New System.Windows.Forms.Label()
        Me.pic = New System.Windows.Forms.PictureBox()
        Me.lblAuftr = New System.Windows.Forms.Label()
        Me.lblAbfBez = New System.Windows.Forms.Label()
@@ -39,6 +40,7 @@ Partial Class sendTAB
        'pnl
        '
        Me.pnl.BackColor = System.Drawing.Color.LightGray
+        Me.pnl.Controls.Add(Me.lblColliWeight)
        Me.pnl.Controls.Add(Me.pic)
        Me.pnl.Controls.Add(Me.lblAuftr)
        Me.pnl.Controls.Add(Me.lblAbfBez)
@@ -47,14 +49,31 @@ Partial Class sendTAB
        Me.pnl.Location = New System.Drawing.Point(0, 0)
        Me.pnl.Margin = New System.Windows.Forms.Padding(0)
        Me.pnl.Name = "pnl"
-        Me.pnl.Size = New System.Drawing.Size(90, 50)
+        Me.pnl.Size = New System.Drawing.Size(100, 60)
        Me.pnl.TabIndex = 0
        '
+        'lblColliWeight
+        '
+        Me.lblColliWeight.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lblColliWeight.BackColor = System.Drawing.Color.DarkGray
+        Me.lblColliWeight.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.lblColliWeight.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.5!)
+        Me.lblColliWeight.Location = New System.Drawing.Point(1, 47)
+        Me.lblColliWeight.Margin = New System.Windows.Forms.Padding(0)
+        Me.lblColliWeight.Name = "lblColliWeight"
+        Me.lblColliWeight.Size = New System.Drawing.Size(100, 13)
+        Me.lblColliWeight.TabIndex = 4
+        Me.lblColliWeight.Text = "-"
+        Me.lblColliWeight.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.lblColliWeight.UseCompatibleTextRendering = True
+        '
        'pic
        '
+        Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pic.Cursor = System.Windows.Forms.Cursors.Hand
        Me.pic.Image = CType(resources.GetObject("pic.Image"), System.Drawing.Image)
-        Me.pic.Location = New System.Drawing.Point(78, 2)
+        Me.pic.Location = New System.Drawing.Point(88, 2)
        Me.pic.Name = "pic"
        Me.pic.Size = New System.Drawing.Size(10, 10)
        Me.pic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
@@ -63,10 +82,13 @@ Partial Class sendTAB
        '
        'lblAuftr
        '
+        Me.lblAuftr.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.lblAuftr.Cursor = System.Windows.Forms.Cursors.Hand
        Me.lblAuftr.Location = New System.Drawing.Point(3, 19)
        Me.lblAuftr.Name = "lblAuftr"
-        Me.lblAuftr.Size = New System.Drawing.Size(86, 31)
+        Me.lblAuftr.Size = New System.Drawing.Size(96, 27)
        Me.lblAuftr.TabIndex = 2
        Me.lblAuftr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        '
@@ -94,7 +116,7 @@ Partial Class sendTAB
        '
        Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungDuplizierenToolStripMenuItem})
        Me.cntxt.Name = "cntxt"
-        Me.cntxt.Size = New System.Drawing.Size(184, 48)
+        Me.cntxt.Size = New System.Drawing.Size(184, 26)
        '
        'SendungDuplizierenToolStripMenuItem
        '
@@ -110,7 +132,7 @@ Partial Class sendTAB
        Me.Controls.Add(Me.pnl)
        Me.Margin = New System.Windows.Forms.Padding(2, 2, 0, 0)
        Me.Name = "sendTAB"
-        Me.Size = New System.Drawing.Size(90, 50)
+        Me.Size = New System.Drawing.Size(100, 60)
        Me.pnl.ResumeLayout(False)
        Me.pnl.PerformLayout()
        CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit()
@@ -125,5 +147,5 @@ Partial Class sendTAB
    Friend WithEvents pic As System.Windows.Forms.PictureBox
    Friend WithEvents cntxt As System.Windows.Forms.ContextMenuStrip
    Friend WithEvents SendungDuplizierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-
+    Public WithEvents lblColliWeight As Label
 End Class
--- a/Aviso/Benutzerdefinierte
+++ b/Aviso/Benutzerdefinierte
@@ -165,16 +165,15 @@
        XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
        fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
        tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEwAACxMBAJqcGAAAAdtJREFUSEu91b8vX1Ec
-        xnG/F8IiUWksTSr+Af+AoQYGtYrFJoLBn/BFLDaJRBNiYrAZDZams6QpdpWIVjo1EcL1PnKOfM65z/3e
-        izC8kt7PeT7nSVSOhizL3pUcOrVarUnNX0sOHQq70KPOXkMOKRrAJn5VLSXX6Pe21HmQG7DwGYfIvEql
-        ZJqw4Xe2VcaJPgi2Yx03frFSKWe9WMYfhB1ZGn0QOjULKVnK7CN2fCaVK40+CIQfSZFcKd+L+O/PlX2b
-        f/pHQGAlWUg9lsL9guziDirn3OOvvT8qCwhVKV1LZsoVxu3dUZFFsKzUXabmwRlm0WnvjUpShMtKi5xg
-        WN2ZG6RYfEnpDBrVfbmBwvKeuayeA4yg8B2WwxQXLPgLy8yrfUsOAy7oxzf88xeW+Y26z6AcOiy2wZWp
-        i+uRL1Ighyx0Ywn2bXyOwtLcgGAf3AuiLrKOxMySpdGHQ2gV136pnilUeZE+2PujMidZUH5iEh0+X1Z6
-        bu+PyhwCE8mCdYkxsVNU6v6u/rDZaDEg9NUsBReYQ/Q2mh1VeoxBm4uWLIK21P1ffFE5i0wovYV7dYbQ
-        YjPRQopwKJ1W5wpZV/odn9R5bpBicQyt6qwI+VE0q7Pc4K3J4dvJGh4AKs9H2nJin04AAAAASUVORK5C
-        YII=
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAa1JREFUSEu91U2rTlEY
+        xvHj4EyIieIkE0W+gC9gwIABpicTMwkDH+GHTMyUosiIgZmhgYmMlbzMUfKSkRLxaNfatbvXvZ+1T+dl
+        8J9ca133v/Z+9v0szGazhc2kCnqwGLP1oAp6sBt7Y75WqqADR3Afb6ZKsaX0HsSzIVWAQ3iOWWGStHsF
+        uFs6D+N5TyztwB38HgibUizjBr4OOqk0Ft8HUVOK/XiU3E+lsdw/kjEqKa7hZ3K35+mosAy4mZQqafmB
+        PMbf5E7PP3ybK1yF9HaSR77jbFM4UdoNi9mQD7iEXZOEE6VjvMOJOK8pXIP0YrcI4qxJwiJ9kgzNeIaT
+        8/ZwFWTgajI840rsRqogiA7jHn4kwzM+xu80UgUD2VKRxaEtquXQFGIProfduBpGpVWAA2WDxCGRV0nW
+        lGbCW/iVDIicn/DJdNJ9LWEsRV7jHHaW+y3pp5ZwJSn1fMHppDMm7f5XX84VlgFnkvJnXI67sSF9i6NN
+        YSLt3sXxeCcykP4pW+cYtg3vVKUwoJdeiGdjFOkLHIxnHVUQ6d4Ztsd8HjiFrTHvqIKNpgo2mv8qz0fa
+        BPXDKgAAAABJRU5ErkJggg==
 </value>
  </data>
  <metadata name="cntxt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
--- a/Aviso/Benutzerdefinierte
+++ b/Aviso/Benutzerdefinierte
@@ -7,12 +7,12 @@

    Dim list As List(Of MyListItem)

-    Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click
+    Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lblAuftr.Click, lblAbfBez.Click, pnl.Click, Me.Click, lblNr.Click, lblColliWeight.Click

        RaiseEvent MECLICK(Me)
    End Sub

-    Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click
+    Private Sub Label2_Click(sender As Object, e As MouseEventArgs) Handles lblAuftr.MouseClick, lblAbfBez.MouseClick, pnl.MouseClick, Me.MouseClick, lblNr.MouseClick, pnl.Click, MyBase.Click, lblNr.Click, lblAuftr.Click, lblAbfBez.Click, lblColliWeight.Click
        If e.Button = MouseButtons.Right Then
            Me.ContextMenuStrip = cntxt
            cntxt.Show(MousePosition)
--- a/Aviso/frmSendungsdetailsNEU.Designer.vb
+++ b/Aviso/frmSendungsdetailsNEU.Designer.vb
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -1099,12 +1099,21 @@ Public Class frmSendungsdetailsNEU
                        b.lblAbfBez.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                        b.lblAuftr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
                        b.lblNr.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)
+                        b.lblColliWeight.BackColor = IIf(b.value = pos, Color.FromArgb(0, 34, 98), Color.DarkGray)
+                        b.lblColliWeight.ForeColor = IIf(b.value = pos, VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor, Color.Black)

                        '    Dim r As DataRow = AVISO_newDataSet.tblSendungen.Rows(b.value)
                        '   MsgBox(da("tblSnd_PosUnterNr") & ".  ")
                        b.lblNr.Text = SENDUNG_LIST(b.value).tblSnd_PosUnterNr & ".  "
                        b.lblAbfBez.Text = ADMIN.getValueTxtBySql("SELECT Abfertigungsbezeichnung FROM Abfertigungsarten WHERE [Abfertigungsart]='" & SENDUNG_LIST(b.value).tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
                        b.lblAuftr.Text = loadValue(SENDUNG_LIST(b.value).tblSnd_Empfaenger, "")
+                        b.lblColliWeight.Text = ""
+
+                        If SENDUNG_LIST(b.value).tblSnd_Colli IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Colli) Then b.lblColliWeight.Text = CDbl(SENDUNG_LIST(b.value).tblSnd_Colli).ToString("N0") & " Pk"
+                        If SENDUNG_LIST(b.value).tblSnd_Gewicht IsNot Nothing AndAlso IsNumeric(SENDUNG_LIST(b.value).tblSnd_Gewicht) Then
+                            b.lblColliWeight.Text &= If(b.lblColliWeight.Text <> "", "/", "") & CDbl(SENDUNG_LIST(b.value).tblSnd_Gewicht).ToString("N0") & " kg"
+                        End If
+

                        'End If
                    End If
@@ -1975,7 +1984,7 @@ Public Class frmSendungsdetailsNEU

        If SENDUNG_LIST(CURRENT_INDEX).tblSnd_SpeditionsbuchEingetragen Then
            btnSpeditionsbuchEintragen.BackgroundImage = My.Resources.speditionsbuchAktiv
-            setTooltioBtn(btnSpeditionsbuchEintragen, "Status 'Speditionsbuch Eingetragen' entfernen")
+            setTooltioBtn(btnSpeditionsbuchEintragen, "Speditionsbuch Eingetrag öffnen")
        End If


@@ -8137,7 +8146,7 @@ Public Class frmSendungsdetailsNEU

    Private Sub btnStatusAbklaerungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbklaerungTR.Click
        Me.Cursor = Cursors.WaitCursor
-        If AVISOFUNC.setSendungAbklaerungTR(SendungsId, AvisoId) Then
+        If AVISOFUNC.setSendungAbklaerungTR(SendungID, AvisoId) Then
            initDataBinding()
        End If
        Me.Cursor = Cursors.Default
@@ -8145,7 +8154,7 @@ Public Class frmSendungsdetailsNEU

    Private Sub btnStatusVorbereitetQS_Click(sender As Object, e As EventArgs) Handles btnStatusVorbereitetQS.Click
        Me.Cursor = Cursors.WaitCursor
-        If AVISOFUNC.setSendungVorbereitetQS(SendungsId, AvisoId) Then
+        If AVISOFUNC.setSendungVorbereitetQS(SendungID, AvisoId) Then
            initDataBinding()
        End If
        Me.Cursor = Cursors.Default
@@ -8153,7 +8162,7 @@ Public Class frmSendungsdetailsNEU

    Private Sub btnStatusVorgeschrieben_Click(sender As Object, e As EventArgs) Handles btnStatusVorgeschrieben.Click
        Me.Cursor = Cursors.WaitCursor
-        If AVISOFUNC.setSendungVorgeschrieben(SendungsId, AvisoId) Then
+        If AVISOFUNC.setSendungVorgeschrieben(SendungID, AvisoId) Then
            initDataBinding()
        End If
        Me.Cursor = Cursors.Default
@@ -8161,7 +8170,7 @@ Public Class frmSendungsdetailsNEU

    Private Sub btnStatusAbfertigungTR_Click(sender As Object, e As EventArgs) Handles btnStatusAbfertigungTR.Click
        Me.Cursor = Cursors.WaitCursor
-        If AVISOFUNC.setSendungAbfertigungTR(SendungsId, AvisoId) Then
+        If AVISOFUNC.setSendungAbfertigungTR(SendungID, AvisoId) Then
            initDataBinding()
        End If
        Me.Cursor = Cursors.Default
@@ -8170,7 +8179,7 @@ Public Class frmSendungsdetailsNEU
    Private Sub btnSpeditionsbuchEintragen_Click(sender As Object, e As EventArgs) Handles btnSpeditionsbuchEintragen.Click
        Me.Cursor = Cursors.WaitCursor
        If Not cbxFremdspedition.Checked Then
-            If AVISOFUNC.setSendungFakturiert(SendungsId, AvisoId) Then
+            If AVISOFUNC.setSendungSpeditionsbuchEintrag(SendungID, AvisoId) Then
                initDataBinding()
            End If
        End If
@@ -8179,7 +8188,7 @@ Public Class frmSendungsdetailsNEU

    Private Sub btnSendungFakturiert_Click(sender As Object, e As EventArgs) Handles btnSendungFakturiert.Click
        Me.Cursor = Cursors.WaitCursor
-        If AVISOFUNC.setSendungFakturiert(SendungsId, AvisoId) Then
+        If AVISOFUNC.setSendungFakturiert(SendungID, AvisoId) Then
            initDataBinding()
        End If
        Me.Cursor = Cursors.Default
--- a/Aviso/usrcntlAktDetails.vb
+++ b/Aviso/usrcntlAktDetails.vb
@@ -1346,7 +1346,7 @@ Public Class usrcntlAktDetails
                                        End If

                                    End If
-                                    Else
+                                Else
                                    If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then
                                        optionCell.Value = paarBez
                                        optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk '" & paarBez & "' einzutragen."