diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index 718bb87..3d45b8d 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.vb b/Aviso/frmATEZ_NCTS.vb index 911dfc5..43eebf7 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -391,6 +391,7 @@ Public Class frmATEZ_NCTS getBezugsnr(BezugsNr) txtLKWId.Text = AVISO.LKW_Nr + sbBestimmungsZollstelle.SET_VALUE(SENDUNG.NCTS_Bestimmungszollstelle) cbxTemperatur.Checked = IIf(AVISO.TransportTemperatur <> "", True, False) txtTransporttemp.Text = AVISO.TransportTemperatur @@ -445,7 +446,7 @@ Public Class frmATEZ_NCTS when [anh_Art] = 'Sonstiges' then 'OTHER' when [anh_Art] ='' then 'OTHER' End [anh_Art],[anh_Typ] FROM [tblAvisoAnhaenge] - WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId=733587) And anh_Typ = 'PDF' + WHERE [anh_AvisoId]=" & AVISO.AvisoID & "AND (anh_SendungsId is null OR anh_SendungsId <=0 OR anh_SendungsId='" & SENDUNG.tblSnd_SendungID & "') And anh_Typ = 'PDF' ORDER BY anh_SendungsId desc, case when [anh_Art] = 'ATR-EUR1' then 0 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index fc61737..ca60749 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -165,29 +165,36 @@ Public Class frmHauptfenster Private Sub StartPipeListener() listenerThread = New System.Threading.Thread(Sub() - Dim pipeName As String = $"AVISO_{Process.GetCurrentProcess().Id}" - Dim pipeSecurity As New PipeSecurity() - pipeSecurity.AddAccessRule(New PipeAccessRule(Environment.UserName, PipeAccessRights.FullControl, AccessControlType.Allow)) + Try - Console.WriteLine($"Waiting for messages on pipe {pipeName}...") + Dim pipeName As String = $"AVISO_{Process.GetCurrentProcess().Id}" + Dim pipeSecurity As New PipeSecurity() + pipeSecurity.AddAccessRule(New PipeAccessRule(Environment.UserName, PipeAccessRights.FullControl, AccessControlType.Allow)) - While True - Using server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity) - Try - server.WaitForConnection() + Console.WriteLine($"Waiting for messages on pipe {pipeName}...") - Using reader = New StreamReader(server, Encoding.UTF8) - Dim message = reader.ReadLine() + While True + Using server = New NamedPipeServerStream(pipeName, PipeDirection.In, 1, PipeTransmissionMode.Byte, PipeOptions.None, 0, 0, pipeSecurity) + Try + server.WaitForConnection() - ProcessMessage(message) - End Using + Using reader = New StreamReader(server, Encoding.UTF8) + Dim message = reader.ReadLine() - server.Disconnect() - Catch ex As Exception - Console.WriteLine("Fehler im Listener: " & ex.Message) - End Try - End Using - End While + ProcessMessage(message) + End Using + + server.Disconnect() + Catch ex As Exception + Console.WriteLine("Fehler im Listener: " & ex.Message) + End Try + End Using + End While + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + + End Try End Sub) listenerThread.IsBackground = True listenerThread.Start() @@ -206,7 +213,14 @@ Public Class frmHauptfenster Protected Overrides Sub OnFormClosed(e As FormClosedEventArgs) MyBase.OnFormClosed(e) - listenerThread.Abort() + Try + If listenerThread IsNot Nothing Then + listenerThread.Abort() + End If + + Catch ex As Exception + + End Try End Sub '---------------------------------------------------------------------------------------------------------------------- @@ -1325,8 +1339,7 @@ Public Class frmHauptfenster Exit Sub End If Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) - + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try btnMitarbeiterKonto.Image = My.Resources.mitarbeiter_s @@ -2543,7 +2556,7 @@ Public Class frmHauptfenster zoll.Show() Me.Cursor = Cursors.Default Catch ex As Exception - MsgBox(ex.Message) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try End Sub @@ -3340,7 +3353,7 @@ Public Class frmHauptfenster 'MsgBox(MIC.ImportShipmentMessage.ImportShipment.Shipment.company) Catch ex As Exception - MsgBox(ex.Message & ex.StackTrace) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -4030,8 +4043,8 @@ Public Class frmHauptfenster ' Iteriere über jedes Fenster in der Liste For Each frm As Form In openForms - ' Prüfe, ob das Fenster nicht das aktuelle ist - If frm IsNot Me Then + ' Prüfe, ob das Fenster nicht das aktuelle Fenster + If frm.GetType.ToString <> "AVISO.frmHauptfenster" And frm.GetType.ToString <> "AVISO.frmLogin" Then ' Schließe das Fenster, unabhängig davon, ob es modal oder nicht ist frm.Close() End If diff --git a/Aviso/frmNotify.Designer.vb b/Aviso/frmNotify.Designer.vb index 5d69d3d..c639f8d 100644 --- a/Aviso/frmNotify.Designer.vb +++ b/Aviso/frmNotify.Designer.vb @@ -115,7 +115,6 @@ Partial Class frmNotify Me.ShowIcon = False Me.ShowInTaskbar = False Me.Text = "frmNotify" - Me.TopMost = True Me.pnl.ResumeLayout(False) Me.Header.ResumeLayout(False) Me.ResumeLayout(False) diff --git a/Aviso/frmNotify.vb b/Aviso/frmNotify.vb index 7012881..e750de3 100644 --- a/Aviso/frmNotify.vb +++ b/Aviso/frmNotify.vb @@ -1,4 +1,28 @@ -Public Class frmNotify +Imports System.Runtime.InteropServices + +Public Class frmNotify + ' WinAPI-Funktion importieren + + Private Shared Function SetWindowPos( + ByVal hWnd As IntPtr, + ByVal hWndInsertAfter As IntPtr, + ByVal X As Integer, + ByVal Y As Integer, + ByVal cx As Integer, + ByVal cy As Integer, + ByVal uFlags As UInteger + ) As Boolean + End Function + + ' Konstante für SetWindowPos + Private Const SWP_NOACTIVATE As UInteger = &H10 + Private Const SWP_NOMOVE As UInteger = &H2 + Private Const SWP_NOSIZE As UInteger = &H1 + Private Shared ReadOnly HWND_TOPMOST As New IntPtr(-1) + + + + Public Y As Integer = 0 Public AvisoID As Integer = 0 @@ -69,6 +93,13 @@ Private Sub frmNotify_Load(sender As Object, e As EventArgs) Handles Me.Load Timer.Interval = TimerInterval lblText.Cursor = IIf(AvisoID > 0, Cursors.Hand, Cursors.Default) + + + ' Fenster in den Vordergrund bringen, ohne Fokus zu erzwingen + SetWindowPos(Me.Handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOACTIVATE Or SWP_NOMOVE Or SWP_NOSIZE) + + + 'If Y = 0 Then 'Me.Location = New Point(Me.Owner.Width - Me.Width - 10, Me.Owner.Height - Me.Height - 10) ' Else diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index d633039..dd03840 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -5668,7 +5668,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem15, Me.T1BestätigungToolStripMenuItem, Me.SpeditionSUBENToolStripMenuItem, Me.ToolStripMenuItem16, Me.AuftragATANAKToolStripMenuItem, Me.ToolStripMenuItem27, Me.ToolStripMenuItem26, Me.ToolStripMenuItem28, Me.ToolStripMenuItem25, Me.GVMSInfoToolStripMenuItem, Me.CMRBestätigungToolStripMenuItem, Me.AuftragMOTISToolStripMenuItem, Me.ToolStripSeparator1, Me.dynMailsToolStripMenuItem}) Me.ContextMenuStrip1.Name = "cntxtAnh" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 422) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(223, 400) ' 'ToolStripMenuItem15 ' diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 21dc2e3..6e90dde 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -7435,4 +7435,8 @@ Public Class frmSendungsdetailsNEU End Try End Sub + + Private Sub txteori_Pruef_TextChanged(sender As Object, e As EventArgs) Handles txteori_Pruef.TextChanged + + End Sub End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb index 51bffd2..709b381 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.Designer.vb @@ -54,7 +54,6 @@ Partial Class usrcntlAktDetailsATILLANeu Me.SplitContainer = New System.Windows.Forms.SplitContainer() Me.tbcntr = New System.Windows.Forms.TabControl() Me.tbVermerke = New System.Windows.Forms.TabPage() - Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla() Me.tbZollanmeldungen = New System.Windows.Forms.TabPage() Me.Panel1 = New System.Windows.Forms.Panel() Me.dgvZollAnmeldungen = New System.Windows.Forms.DataGridView() @@ -69,6 +68,7 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbAnhaenge = New System.Windows.Forms.TabPage() Me.dgvanhaenge = New System.Windows.Forms.DataGridView() Me.Panel5 = New System.Windows.Forms.Panel() + Me.Button14 = New System.Windows.Forms.Button() Me.Button13 = New System.Windows.Forms.Button() Me.btnImportAssi = New System.Windows.Forms.Button() Me.btnQuckScan = New System.Windows.Forms.Button() @@ -159,7 +159,8 @@ Partial Class usrcntlAktDetailsATILLANeu Me.UmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AusZwischenablageEinfügenPasteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.Button14 = New System.Windows.Forms.Button() + Me.EXPAusfuhrGestellungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UsrCntlVermerkeATilla1 = New AVISO.usrCntlVermerkeATilla() Me.pnlDetailsRechts.SuspendLayout() Me.Panel3.SuspendLayout() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() @@ -279,17 +280,6 @@ Partial Class usrcntlAktDetailsATILLANeu Me.tbVermerke.Text = "Vermerk eintragen" Me.tbVermerke.UseVisualStyleBackColor = True ' - 'UsrCntlVermerkeATilla1 - ' - Me.UsrCntlVermerkeATilla1.AutoScroll = True - Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control - Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill - Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3) - Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1" - Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151) - Me.UsrCntlVermerkeATilla1.TabIndex = 0 - ' 'tbZollanmeldungen ' Me.tbZollanmeldungen.Controls.Add(Me.Panel1) @@ -576,6 +566,19 @@ Partial Class usrcntlAktDetailsATILLANeu Me.Panel5.Size = New System.Drawing.Size(561, 70) Me.Panel5.TabIndex = 112 ' + 'Button14 + ' + Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button14.Image = CType(resources.GetObject("Button14.Image"), System.Drawing.Image) + Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button14.Location = New System.Drawing.Point(1, 0) + Me.Button14.Name = "Button14" + Me.Button14.Size = New System.Drawing.Size(133, 36) + Me.Button14.TabIndex = 114 + Me.Button14.Text = "PDF " & Global.Microsoft.VisualBasic.ChrW(13) & "zusammenführen" + Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button14.UseVisualStyleBackColor = True + ' 'Button13 ' Me.Button13.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -1695,44 +1698,44 @@ Partial Class usrcntlAktDetailsATILLANeu 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(206, 6) ' 'NCTST2ToolStripMenuItem ' Me.NCTST2ToolStripMenuItem.Name = "NCTST2ToolStripMenuItem" - Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.NCTST2ToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.NCTST2ToolStripMenuItem.Text = "NCTS - Versand" ' 'AESToolStripMenuItem ' Me.AESToolStripMenuItem.Name = "AESToolStripMenuItem" - Me.AESToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.AESToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.AESToolStripMenuItem.Text = "AES - Ausfuhr" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(206, 6) ' 'SGSNCTSToolStripMenuItem ' Me.SGSNCTSToolStripMenuItem.Name = "SGSNCTSToolStripMenuItem" - Me.SGSNCTSToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.SGSNCTSToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.SGSNCTSToolStripMenuItem.Text = "SGS - NCTS" Me.SGSNCTSToolStripMenuItem.Visible = False ' 'cntxtZollantrag ' Me.cntxtZollantrag.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.cntxtZollantrag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator2, Me.NCTST2ToolStripMenuItem, Me.AESToolStripMenuItem, Me.ToolStripSeparator1, Me.SGSNCTSToolStripMenuItem, Me.NCTSATEZToolStripMenuItem}) + Me.cntxtZollantrag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator2, Me.NCTST2ToolStripMenuItem, Me.AESToolStripMenuItem, Me.ToolStripSeparator1, Me.SGSNCTSToolStripMenuItem, Me.NCTSATEZToolStripMenuItem, Me.EXPAusfuhrGestellungToolStripMenuItem}) Me.cntxtZollantrag.Name = "cntxtZollantrag" - Me.cntxtZollantrag.Size = New System.Drawing.Size(156, 104) + Me.cntxtZollantrag.Size = New System.Drawing.Size(210, 148) Me.cntxtZollantrag.Text = "Zollantrag" ' 'NCTSATEZToolStripMenuItem ' Me.NCTSATEZToolStripMenuItem.Name = "NCTSATEZToolStripMenuItem" - Me.NCTSATEZToolStripMenuItem.Size = New System.Drawing.Size(155, 22) + Me.NCTSATEZToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.NCTSATEZToolStripMenuItem.Text = "NCTS - ATEZ" Me.NCTSATEZToolStripMenuItem.Visible = False ' @@ -1769,18 +1772,22 @@ Partial Class usrcntlAktDetailsATILLANeu Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Size = New System.Drawing.Size(279, 30) Me.AusZwischenablageEinfügenPasteToolStripMenuItem.Text = "Aus Zwischenablage einfügen (Paste)" ' - 'Button14 + 'EXPAusfuhrGestellungToolStripMenuItem ' - Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button14.Image = CType(resources.GetObject("Button14.Image"), System.Drawing.Image) - Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button14.Location = New System.Drawing.Point(1, 0) - Me.Button14.Name = "Button14" - Me.Button14.Size = New System.Drawing.Size(133, 36) - Me.Button14.TabIndex = 114 - Me.Button14.Text = "PDF " & Global.Microsoft.VisualBasic.ChrW(13) & "zusammenführen" - Me.Button14.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button14.UseVisualStyleBackColor = True + Me.EXPAusfuhrGestellungToolStripMenuItem.Name = "EXPAusfuhrGestellungToolStripMenuItem" + Me.EXPAusfuhrGestellungToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.EXPAusfuhrGestellungToolStripMenuItem.Text = "EXG - Ausfuhr-Gestellung" + ' + 'UsrCntlVermerkeATilla1 + ' + Me.UsrCntlVermerkeATilla1.AutoScroll = True + Me.UsrCntlVermerkeATilla1.BackColor = System.Drawing.SystemColors.Control + Me.UsrCntlVermerkeATilla1.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlVermerkeATilla1.Location = New System.Drawing.Point(3, 3) + Me.UsrCntlVermerkeATilla1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlVermerkeATilla1.Name = "UsrCntlVermerkeATilla1" + Me.UsrCntlVermerkeATilla1.Size = New System.Drawing.Size(561, 151) + Me.UsrCntlVermerkeATilla1.TabIndex = 0 ' 'usrcntlAktDetailsATILLANeu ' @@ -1963,4 +1970,5 @@ Partial Class usrcntlAktDetailsATILLANeu Friend WithEvents btnImportAssi As Button Friend WithEvents Button13 As Button Friend WithEvents Button14 As Button + Friend WithEvents EXPAusfuhrGestellungToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 4d66a59..8dc75ab 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1810,4 +1810,69 @@ Public Class usrcntlAktDetailsATILLANeu End Try End If End Sub + + Private Sub EXPAusfuhrGestellungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EXPAusfuhrGestellungToolStripMenuItem.Click + + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN", Me.FindForm) Then + + Me.Refresh() + Me.Cursor = Cursors.WaitCursor + + Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing + If SENDUNG_LIST IsNot Nothing Then + SND = SENDUNG_LIST(0) + Else + MsgBox("Keine Sendung!") + Exit Sub + End If + + + + + If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub + + Dim Standort As String = "" + + Select Case SND.FilialenNr + Case 4803, 4809 + Standort = "VERAG AG" + Case 5601 + Standort = "Unisped GmbH" + Case 5701 + Standort = "AMBAR GmbH" + Case 4810, 5103, 5901 + Standort = "VERAG GmbH" + Case 5501 + Standort = "IMEX" + End Select + + 'sonderfälle lt. Mestan + If SND.tblSnd_Zollsystem_Land = "DE" Then + + Select Case SND.FilialenNr + Case 5501, 4803, 4809, 5103 + Standort = "VERAG GmbH" + End Select + + ElseIf SND.tblSnd_Zollsystem_Land = "AT" Then + + If SND.tblSnd_Abfertigungsart_ID = 1 Then 'ZA + Standort = "VERAG CS" + ElseIf SND.tblSnd_Abfertigungsart_ID = 38 Then 'EV-Verz + Select Case SND.FilialenNr + Case 4803, 5303, 4809, 5103 + Standort = "VERAG CS" + End Select + End If + End If + + Dim frMZA As New SDL.frmZollanmeldung("EXG", Nothing, AVISO, SND, Now.ToString("yy")) + frMZA.Show() + AddHandler frMZA.FormClosed, Sub() + ' initdgvZollAnmeldungen() + End Sub + + Me.Cursor = Cursors.Default + End If + End Sub End Class