From 863bcf8c3d3cabb4a89cf69ce9f67885e02ae340 Mon Sep 17 00:00:00 2001 From: "m.ilhan" Date: Thu, 8 May 2025 11:08:42 +0200 Subject: [PATCH 1/2] open sendungsdetails from speditionsbuch --- SDL/Speditionsbuch/frmSpeditionsbuchSuche.vb | 35 ++++++---- .../usrCntlSpeditionsBuchSuche.Designer.vb | 14 +++- .../usrCntlSpeditionsBuchSuche.resx | 67 ++++++++++--------- .../usrCntlSpeditionsBuchSuche.vb | 26 +++++++ 4 files changed, 93 insertions(+), 49 deletions(-) diff --git a/SDL/Speditionsbuch/frmSpeditionsbuchSuche.vb b/SDL/Speditionsbuch/frmSpeditionsbuchSuche.vb index e437cd19..81916206 100644 --- a/SDL/Speditionsbuch/frmSpeditionsbuchSuche.vb +++ b/SDL/Speditionsbuch/frmSpeditionsbuchSuche.vb @@ -4,19 +4,28 @@ Imports System.Globalization Public Class frmSpeditionsbuchSuche Dim SQL As New SQL - Private Sub frmSpeditionsbuchSuche_Load(sender As Object, e As EventArgs) Handles Me.Load - 'Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height - Me.Height = Screen.FromPoint(Cursor.Position).WorkingArea.Size.Height ' Anderer Versuch?? - Me.Top = 0 - - 'For i = 0 To Screen.AllScreens.Length - 1 - ' Dim r As Rectangle = Screen.AllScreens(i).Bounds - ' If r.Contains(Cursor.Position) Then - - - - ' End If - 'Next + + ''' + ''' Leitet das interne Event vom UserControl nach außen weiter. + ''' + Public Event SendungsdetailsRequested(ByVal AvisoId As Integer, ByVal SendungId As Integer) + Public Sub New() + InitializeComponent() + ' Hier das interne Control-Event abfangen und weiterwerfen: + AddHandler UsrCntlSpeditionsBuchSuche1.SendungsdetailsRequested, + AddressOf Me.RaiseSendungsdetailsRequested End Sub + + Private Sub RaiseSendungsdetailsRequested( + ByVal AvisoId As Integer, + ByVal SendungId As Integer) + RaiseEvent SendungsdetailsRequested(AvisoId, SendungId) + End Sub + + Private Sub frmSpeditionsbuchSuche_Load(sender As Object, e As EventArgs) Handles Me.Load + Me.Height = Screen.FromPoint(Cursor.Position).WorkingArea.Size.Height + Me.Top = 0 + End Sub + End Class \ No newline at end of file diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb index d4ccf789..e0de19ee 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.Designer.vb @@ -32,6 +32,7 @@ Partial Class usrCntlSpeditionsBuchSuche Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(usrCntlSpeditionsBuchSuche)) Me.TabPage1 = New System.Windows.Forms.TabPage() Me.cntxtCntxtSpeditionsbuch = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.SendungsdetailsÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EintragLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.txtAvisoId = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblLKWId = New System.Windows.Forms.Label() @@ -237,15 +238,21 @@ Partial Class usrCntlSpeditionsBuchSuche 'cntxtCntxtSpeditionsbuch ' Me.cntxtCntxtSpeditionsbuch.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.EintragLöschenToolStripMenuItem}) + Me.cntxtCntxtSpeditionsbuch.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SendungsdetailsÖffnenToolStripMenuItem, Me.EintragLöschenToolStripMenuItem}) Me.cntxtCntxtSpeditionsbuch.Name = "cntxtCntxtSpeditionsbuch" - Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(156, 26) + Me.cntxtCntxtSpeditionsbuch.Size = New System.Drawing.Size(199, 70) Me.cntxtCntxtSpeditionsbuch.Text = "cntxtSpeditionsbuch" ' + 'SendungsdetailsÖffnenToolStripMenuItem + ' + Me.SendungsdetailsÖffnenToolStripMenuItem.Name = "SendungsdetailsÖffnenToolStripMenuItem" + Me.SendungsdetailsÖffnenToolStripMenuItem.Size = New System.Drawing.Size(198, 22) + Me.SendungsdetailsÖffnenToolStripMenuItem.Text = "Sendungsdetails öffnen" + ' 'EintragLöschenToolStripMenuItem ' Me.EintragLöschenToolStripMenuItem.Name = "EintragLöschenToolStripMenuItem" - Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.EintragLöschenToolStripMenuItem.Size = New System.Drawing.Size(198, 22) Me.EintragLöschenToolStripMenuItem.Text = "Eintrag löschen" ' 'txtAvisoId @@ -3019,4 +3026,5 @@ Partial Class usrCntlSpeditionsBuchSuche Friend WithEvents Button24 As Button Friend WithEvents Button25 As Button Friend WithEvents MyComboBox2 As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents SendungsdetailsÖffnenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx index 3076e447..0e290de1 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.resx @@ -174,39 +174,40 @@ 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 + AElFTkSuQmCC \ No newline at end of file diff --git a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb index 87b2c035..33ee49b4 100644 --- a/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb +++ b/SDL/Speditionsbuch/usrCntlSpeditionsBuchSuche.vb @@ -5,6 +5,7 @@ Imports VERAG_PROG_ALLGEMEIN Public Class usrCntlSpeditionsBuchSuche Dim SQL As New SQL + Public Event SendungsdetailsRequested(ByVal AvisoId As Integer, ByVal SendungId As Integer) Dim AVISOSERVER = VERAG_PROG_ALLGEMEIN.cAllgemein.AVISO_SERVER & " .AVISO.dbo.AVISO" @@ -2550,4 +2551,29 @@ Public Class usrCntlSpeditionsBuchSuche getrHandlingAussenstellen(, "AMBAR an ALL", where, True) End Sub + + Private Sub SendungsdetailsÖffnenToolStripMenuItem_Click( + sender As Object, e As EventArgs) _ + Handles SendungsdetailsÖffnenToolStripMenuItem.Click + + If DataGridView.SelectedRows.Count <> 1 Then + MsgBox("Bitte wählen Sie genau eine Zeile aus.") + Exit Sub + End If + + Dim r = DataGridView.SelectedRows(0) + Dim spb = New cSpeditionsbuch( + FilialenNr:=CInt(r.Cells("FilialenNr").Value), + AbfertigungsNr:=CInt(r.Cells("AbfertigungsNr").Value), + UnterNr:=CInt(r.Cells("UnterNr").Value) + ) + + + RaiseEvent SendungsdetailsRequested(spb.AvisoID, spb.SendungID) + + + End Sub + + + End Class From bb96191b1e5a1ea04b3188eca34417ca85c4d2c8 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 8 May 2025 11:57:33 +0200 Subject: [PATCH 2/2] vers --- SDL/My Project/AssemblyInfo.vb | 4 ++-- SDL/USTV/frmMDM_USTVAntrag.vb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index 04cd0c6a..fb620283 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 928f08a6..87589039 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -2,7 +2,7 @@ Imports System.Reflection Imports System.Windows.Documents Imports com.sun.org.apache.xpath.internal.objects -Imports itextsharp.text.pdf +Imports iTextSharp.text.pdf Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN