diff --git a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb index 06d1329..e2faaa1 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.Designer.vb @@ -87,6 +87,7 @@ Partial Class frmSendungAnhangImport ' 'flpnlAviso ' + Me.flpnlAviso.AllowDrop = True Me.flpnlAviso.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.flpnlAviso.AutoScroll = True @@ -131,6 +132,7 @@ Partial Class frmSendungAnhangImport ' 'flpnlSendungen ' + Me.flpnlSendungen.AllowDrop = True Me.flpnlSendungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.flpnlSendungen.AutoScroll = True @@ -419,7 +421,7 @@ Partial Class frmSendungAnhangImport Me.cntxt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.cntxt.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiHochladenToolStripMenuItem, Me.DateiScannenToolStripMenuItem, Me.AusZwischenablageeinfügenToolStripMenuItem}) Me.cntxt.Name = "cntxt" - Me.cntxt.Size = New System.Drawing.Size(250, 92) + Me.cntxt.Size = New System.Drawing.Size(250, 70) ' 'DateiHochladenToolStripMenuItem ' @@ -479,11 +481,13 @@ Partial Class frmSendungAnhangImport ' Me.PdfViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.PdfViewer.FindTextHighLightColor = System.Drawing.Color.FromArgb(CType(CType(200, Byte), Integer), CType(CType(153, Byte), Integer), CType(CType(193, Byte), Integer), CType(CType(218, Byte), Integer)) + Me.PdfViewer.FormFillEnabled = False Me.PdfViewer.IgnoreCase = False Me.PdfViewer.IsToolBarVisible = True Me.PdfViewer.Location = New System.Drawing.Point(0, 0) Me.PdfViewer.MultiPagesThreshold = 60 Me.PdfViewer.Name = "PdfViewer" + Me.PdfViewer.OnRenderPageExceptionEvent = Nothing Me.PdfViewer.Size = New System.Drawing.Size(844, 655) Me.PdfViewer.TabIndex = 0 Me.PdfViewer.Threshold = 60 diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index bd32de3..6569965 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -2,9 +2,12 @@ 'Imports iTextSharp.text.pdf 'Imports iTextSharp.text Imports System.IO +Imports Spire.Pdf 'Imports GrapeCity.Documents.Pdf -Imports Spire.Pdf +'Imports Spire.Pdf + + Public Class frmSendungAnhangImport @@ -69,7 +72,7 @@ Public Class frmSendungAnhangImport Sub initElement(USRCNTL As usrCntlSendungAnhangElement) AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED) ' If BrowserLoaded Then - + If Not STRG_PRESSED Then @@ -117,24 +120,37 @@ Public Class frmSendungAnhangImport End Sub Sub initLocationViewer(loc, typ) - PdfViewer.CloseDocument() - WebBrowser.Navigate("") - If typ = "PDF" Then - If cbxAlternativePDFAnsicht.Checked Then + + Try + + + 'If PdfViewer IsNot Nothing AndAlso PdfViewer.IsDocumentLoaded Then + ' PdfViewer.CloseDocument() + 'End If + PdfViewer.Visible = False + WebBrowser.Visible = False + + WebBrowser.Navigate("") + If typ = "PDF" Then + If cbxAlternativePDFAnsicht.Checked Then + PdfViewer.Visible = False + WebBrowser.Visible = (loc <> "") + WebBrowser.Navigate(loc) + Else + WebBrowser.Visible = False + PdfViewer.Visible = (loc <> "") + PdfViewer.LoadFromFile(loc) + End If + ElseIf typ = "BILD" Then PdfViewer.Visible = False WebBrowser.Visible = (loc <> "") WebBrowser.Navigate(loc) - Else - WebBrowser.Visible = False - PdfViewer.Visible = (loc <> "") - PdfViewer.LoadFromFile(loc) End If - ElseIf typ = "BILD" Then - PdfViewer.Visible = False - WebBrowser.Visible = (loc <> "") - WebBrowser.Navigate(loc) - End If - Button5.Visible = PdfViewer.Visible + Button5.Visible = PdfViewer.Visible + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try End Sub Function getAcitvePnl() As FlowLayoutPanel @@ -1313,7 +1329,7 @@ Public Class frmSendungAnhangImport End If End Sub - Public Sub addData_SendungAnhang(Path) + Public Function addData_SendungAnhang(Path, Optional addFlpnl = True) As Integer Dim fi As New FileInfo(Path) @@ -1325,10 +1341,11 @@ Public Class frmSendungAnhangImport Dim Typ = "" If getFileTypeValid(fi.Extension.Replace(".", ""), Typ) Then If saveToDS(AvisoId, fi.Name, Path, "", Typ, da_id, anhId, destPath) Then - addUsrcnlToPnl(destPath, da_id, anhId, filename, Typ) + If addFlpnl Then addUsrcnlToPnl(destPath, da_id, anhId, filename, Typ) End If - End If - End Sub + End If + Return anhId + End Function Public Shared Function getFileTypeValid(extension, ByRef Typ) As Boolean Select Case extension.ToString.Replace(".", "").ToUpper @@ -1727,6 +1744,160 @@ Public Class frmSendungAnhangImport End Try End Sub + + Private Sub flpnlAviso_DragDrop(sender As Object, e As DragEventArgs) Handles flpnlAviso.DragDrop + If e.Data.GetDataPresent(DataFormats.FileDrop) Then + + Dim files() As String = e.Data.GetData(DataFormats.FileDrop) + For Each path In files + addData_SendungAnhang(path) + Next + + ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then + Dim FilePath = EmAilAttach(e) + If FilePath <> "" Then + addData_SendungAnhang(FilePath) + End If + End If + + + + End Sub + Private Sub flpnlSendungen_DragDrop(sender As Object, e As DragEventArgs) Handles flpnlSendungen.DragDrop + If cboSendungen._value = "" Then Exit Sub + If cboSendungen._value = "-1" Then Exit Sub + + Try + Dim added = False + + If e.Data.GetDataPresent(DataFormats.FileDrop) Then + Dim files() As String = e.Data.GetData(DataFormats.FileDrop) + For Each path In files + + Dim anhID = addData_SendungAnhang(path, False) + If anhID > 0 Then + added = True + Dim ANH = New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(anhID) + + Dim f As New frmSendungAnhangUmbenennenUmkateg(ANH.anh_Name, ANH.anh_Art) + If f.ShowDialog = DialogResult.OK Then + ANH.anh_SendungsId = cboSendungen._value + ANH.anh_Name = f.txtBezeichnung.Text + ANH.anh_Art = f.cboArt._value + ANH.SAVE() 'Eintrag wird überschreiben + End If + End If + Next + + ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then + Dim FilePath = EmAilAttach(e) + If FilePath <> "" Then + + Dim anhID = addData_SendungAnhang(FilePath, False) + If anhID > 0 Then + added = True + Dim ANH = New VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge(anhID) + + Dim f As New frmSendungAnhangUmbenennenUmkateg(ANH.anh_Name, ANH.anh_Art) + If f.ShowDialog = DialogResult.OK Then + ANH.anh_SendungsId = cboSendungen._value + ANH.anh_Name = f.txtBezeichnung.Text + ANH.anh_Art = f.cboArt._value + ANH.SAVE() 'Eintrag wird überschreiben + End If + End If + End If + End If + + + + If added Then + + initFlpANH_LIST() + ' initLocationViewer(ANH.FILE_PATH, ) + 'If flpnlAviso.Controls.Count > 0 Then + ' DirectCast(flpnlAviso.Controls(0), usrCntlSendungAnhangElement).CLICK_Me() + 'End If + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + End Try + + End Sub + + Function EmAilAttach(e As DragEventArgs) As String + Try + + ' We have a embedded file. First lets try to get the file name out of memory + Dim theStream As IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), IO.Stream) + Dim fileGroupDescriptor(512) As Byte + theStream.Read(fileGroupDescriptor, 0, 512) + Dim fileName As System.Text.StringBuilder = New System.Text.StringBuilder("") + Dim i As Integer = 76 + + While Not (fileGroupDescriptor(i) = 0) + fileName.Append(Convert.ToChar(fileGroupDescriptor(i))) + System.Math.Min(System.Threading.Interlocked.Increment(i), i - 1) + End While + + theStream.Close() + ' We should have the file name or if its an email, the subject line. Create our temp file based on the temp path and this info + Dim myTempFile As String = IO.Path.GetTempPath & fileName.ToString + ' Look to see if this is a email message. If so save that temporarily and get the temp file. + If InStr(myTempFile, ".msg") > 0 Then + Dim objOL As New Microsoft.Office.Interop.Outlook.Application + Dim objMI As Microsoft.Office.Interop.Outlook.MailItem + If objOL.ActiveExplorer.Selection.Count > 1 Then + MsgBox("Es kann nur ein Element übertagen werden.", MsgBoxStyle.OkOnly Or MsgBoxStyle.Information, "Ein Element pro Vorgang") + End If + For Each objMI In objOL.ActiveExplorer.Selection() + objMI.SaveAs(myTempFile) + Exit For + Next + objOL = Nothing + objMI = Nothing + Else + ' If its a attachment we need to pull the file itself out of memory + Dim ms As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) + Dim FileBytes(CInt(ms.Length)) As Byte + ' read the raw data into our variable + ms.Position = 0 + ms.Read(FileBytes, 0, CInt(ms.Length)) + ms.Close() + ' save the raw data into our temp file + Dim fs As IO.FileStream = New IO.FileStream(myTempFile, IO.FileMode.OpenOrCreate, IO.FileAccess.Write) + fs.Write(FileBytes, 0, FileBytes.Length) + fs.Close() + End If + ' Make sure we have a actual file and also if we do make sure we erase it when done + If IO.File.Exists(myTempFile) Then + ' Assign the file name to the add dialog + EmAilAttach = myTempFile + Else + EmAilAttach = String.Empty + End If + + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + EmAilAttach = String.Empty + End Try + + End Function + Private Sub flpnlAviso_DragEnter(sender As Object, e As DragEventArgs) Handles flpnlAviso.DragEnter + e.Effect = DragDropEffects.All + End Sub + + Private Sub flpnlSnd_DragEnter(sender As Object, e As DragEventArgs) Handles flpnlSendungen.DragEnter + e.Effect = DragDropEffects.All + End Sub + 'Private Sub flpnlSendungen_Paint(sender As Object, e As PaintEventArgs) Handles flpnlSendungen.Paint + ' Dim files() As String = e.Data.GetData(DataFormats.FileDrop) + ' For Each path In files + ' addData_SendungAnhang(path) + ' Next + 'End Sub + 'Private Sub txtBezeichnung_GotFocus(sender As Object, e As EventArgs) Handles txtBezeichnung.GotFocus ' txtBezeichnung.SelectAll() 'End Sub diff --git a/Aviso/Auswertung/usrctStatistik.vb b/Aviso/Auswertung/usrctStatistik.vb index e29e6c3..b8ebf4e 100644 --- a/Aviso/Auswertung/usrctStatistik.vb +++ b/Aviso/Auswertung/usrctStatistik.vb @@ -20,7 +20,7 @@ Public Class usrctStatistik Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Dim g As Graphics = Panel1.CreateGraphics g.Clear(Color.FromArgb(245, 245, 245)) - Dim p As Panel = DirectCast(sender, Panel) + Dim p As Panel = Panel1 'DirectCast(sender, Panel) 'Jahre: Dim topbound = 10 For i = 2013 To Now.Year diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 2eca8a9..b436d93 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -203,17 +203,17 @@ ..\..\..\dll\NumericBox.dll - + False - ..\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.License.dll + ..\..\..\dll\PDF Spire\6.8.5\Spire.License.dll - + False - ..\packages\Spire.PDFViewer.4.9.5\lib\net46\Spire.Pdf.dll + ..\..\..\dll\PDF Spire\6.8.5\Spire.Pdf.dll - + False - ..\..\..\dll\Spire.PDF\Spire.PdfViewer.Forms.dll + ..\..\..\dll\PDF Spire\6.8.5\Spire.PdfViewer.Forms.dll @@ -1124,6 +1124,7 @@ + @@ -1132,6 +1133,9 @@ + + + Always @@ -1142,7 +1146,6 @@ - diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index 958872b..3645bdc 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -276,11 +276,11 @@ Public Class SendungOptions End If If dt.Rows.Count > 1 Then - VALUES.Frachtfuehrer_Bar_BelegNr2 = getBenutzerShort(dt.Rows(0)("Benutzer").ToString) & " / " & dt.Rows(1)("rksv_BelegId").ToString + VALUES.Frachtfuehrer_Bar_BelegNr2 = getBenutzerShort(dt.Rows(1)("Benutzer").ToString) & " / " & dt.Rows(1)("rksv_BelegId").ToString VALUES.Frachtfuehrer_Bar_Betrag2 = CDbl(dt.Rows(1)("rksv_umsatz")).ToString("C2") End If If dt.Rows.Count > 2 Then - VALUES.Frachtfuehrer_Bar_BelegNr3 = getBenutzerShort(dt.Rows(0)("Benutzer").ToString) & " / " & dt.Rows(2)("rksv_BelegId").ToString + VALUES.Frachtfuehrer_Bar_BelegNr3 = getBenutzerShort(dt.Rows(2)("Benutzer").ToString) & " / " & dt.Rows(2)("rksv_BelegId").ToString VALUES.Frachtfuehrer_Bar_Betrag3 = CDbl(dt.Rows(2)("rksv_umsatz")).ToString("C2") End If Catch ex As Exception diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index f165e3b..e1bf6c8 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/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 6f6860b..e5715fb 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -519,6 +519,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property fragezeichen() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("fragezeichen", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -639,6 +649,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property info() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("info", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1348,6 +1368,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property verimex() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("verimex", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1369,7 +1399,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.1.9 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 3.5.4.2 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 8a9bffd..82387bf 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -121,8 +121,8 @@ ..\Resources\personInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lorry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Versionsinfo.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 @@ -136,6 +136,9 @@ ..\Resources\els.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\mitarbeiter_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -163,8 +166,8 @@ ..\Resources\fakturiertAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\weiterleiten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,8 +181,11 @@ ..\Resources\nellenquack.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Atilla.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\digitalerAkt.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,8 +196,8 @@ ..\Resources\person_add.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\tranparent30Perc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,8 +211,8 @@ ..\Resources\android-clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Atilla.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\pdf11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,8 +220,8 @@ aviso2015 - - ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\parkplatz.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -265,6 +271,9 @@ ..\Resources\searchGG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\sanduhr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Unisped_logo.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,9 +289,6 @@ ..\Resources\tts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\belegEUR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\noAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,9 +304,6 @@ ..\Resources\gear2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\handy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -313,14 +316,14 @@ ..\Resources\vorauszahlung1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\SUB.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\dakosy_dy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\stift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vermerkBtn.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\beleg1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,9 +352,6 @@ ..\Resources\IMEX-LOGO_simple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\statusBtn_vorgeschrieben_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -376,11 +376,14 @@ ..\Resources\SBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoll_mm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\android-note1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\digitalerAkt_small.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\person.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\personCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -424,21 +427,18 @@ ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\warning2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mitarbeiter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\fakturiertInaktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\vorauszahlung.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fragezeichen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\bundesanzeiger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,6 +481,9 @@ ..\Resources\3s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\avisoNewMsg.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -499,9 +502,6 @@ ..\Resources\LateAviso_s.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\evolog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -523,11 +523,14 @@ ..\Resources\email_big1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 3.5.1.9 + 3.5.4.2 + + + ..\Resources\lorry.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\statusBtn_vorgeschrieben_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -535,8 +538,8 @@ ..\Resources\soenmez.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\beleg.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_down_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\statusBtn_vorbereitet_Aktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -559,13 +562,19 @@ ..\Resources\word.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Verag-AG-Logopng.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\speditionsbuchAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\IMEX.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_down_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Aviso/My Project/license.elic.xml b/Aviso/My Project/license.elic.xml index 9bba7f4..dac3c48 100644 --- a/Aviso/My Project/license.elic.xml +++ b/Aviso/My Project/license.elic.xml @@ -1,15 +1,15 @@ - + Runtime VERAG Spedition AG al@verag.ag VERAG Spedition AG - 2019-09-12T00:00:00Z - 2020-09-12T00:00:00Z + 2020-08-12T00:00:00Z + 2021-08-12T00:00:00Z Spire.PDF Platinum - 5.8 + 6.5 1 1 diff --git a/Aviso/Resources/Unisped_logo.jpg b/Aviso/Resources/Unisped_logo.jpg index b36b587..d2216e6 100644 Binary files a/Aviso/Resources/Unisped_logo.jpg and b/Aviso/Resources/Unisped_logo.jpg differ diff --git a/Aviso/Resources/fragezeichen.png b/Aviso/Resources/fragezeichen.png new file mode 100644 index 0000000..db10927 Binary files /dev/null and b/Aviso/Resources/fragezeichen.png differ diff --git a/Aviso/Resources/info.png b/Aviso/Resources/info.png new file mode 100644 index 0000000..338bf1b Binary files /dev/null and b/Aviso/Resources/info.png differ diff --git a/Aviso/Resources/logo.png b/Aviso/Resources/logo.png new file mode 100644 index 0000000..0671562 Binary files /dev/null and b/Aviso/Resources/logo.png differ diff --git a/Aviso/eAviso/frm_eAVISO.Designer.vb b/Aviso/eAviso/frm_eAVISO.Designer.vb index 080aca6..f54151b 100644 --- a/Aviso/eAviso/frm_eAVISO.Designer.vb +++ b/Aviso/eAviso/frm_eAVISO.Designer.vb @@ -171,7 +171,7 @@ Partial Class frm_eAVISO Me.Button12.ForeColor = System.Drawing.Color.Black Me.Button12.Image = Global.AVISO.My.Resources.Resources.lorry Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button12.Location = New System.Drawing.Point(777, 35) + Me.Button12.Location = New System.Drawing.Point(920, 35) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(204, 53) Me.Button12.TabIndex = 2 diff --git a/Aviso/eAviso/frm_eAVISO.vb b/Aviso/eAviso/frm_eAVISO.vb index d7a7f83..ee05d83 100644 --- a/Aviso/eAviso/frm_eAVISO.vb +++ b/Aviso/eAviso/frm_eAVISO.vb @@ -5,7 +5,7 @@ Sub intiDGV_Vorpapier() With MyDatagridview1 - .DataSource = SQL.loadDgvBySql("SELECT [ncts_Id],[ncts_Partnersystem],[ncts_dyaArt],[ncts_MRN],[ncts_Erstellung],[ncts_Befoerderungsmittel_KennzeichenAbgang] Kennzeichen,[ncts_SumA_Befoerderer_Name]Befoerderer FROM [tblNCTS_TR] WHERE ncts_Partnersystem='ATEZ' ", "FMZOLL") + .DataSource = SQL.loadDgvBySql("SELECT [ncts_Id],[ncts_Partnersystem],[ncts_dyaArt],[ncts_MRN],[ncts_Erstellung],[ncts_Befoerderungsmittel_KennzeichenAbgang] Kennzeichen,[ncts_SumA_Befoerderer_Name]Befoerderer FROM [tblNCTS_TR] WHERE ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ' ", "FMZOLL") If .Columns.Count = 0 Then Exit Sub @@ -96,13 +96,17 @@ Dim PREPAPER As New cNCTSPartnerWorker.cNCTS_TR(r.Cells("ncts_Id").Value) AVISO.LKW_Nr = PREPAPER.ncts_Befoerderungsmittel_KennzeichenAbgang - AVISO.LKW_Nationalitaet = PREPAPER.ncts_Befoerderungsmittel_SttaszugehoerigkeitAbgangCode + AVISO.LKW_Nationalitaet = PREPAPER.ncts_Befoerderungsmittel_StaatszugehoerigkeitGrenzueberschreitendCode 'TransportArrivalCountryCode AVISO.Auftraggeber = PREPAPER.ncts_Partnersystem '"ATEZ" AVISO.Frächter = If(PREPAPER.ncts_SumA_Befoerderer_Name, "X") AVISO.Datum = Now AVISO.VoraussichtlichesEintreffen = Nothing + If IsDate(PREPAPER.ncts_Trans_DatumZeit) Then + AVISO.VoraussichtlichesEintreffen = CDate(PREPAPER.ncts_Trans_DatumZeit).AddDays(4) + If CDate(AVISO.VoraussichtlichesEintreffen).DayOfWeek = 7 Then AVISO.VoraussichtlichesEintreffen = CDate(AVISO.VoraussichtlichesEintreffen).AddDays(1) + End If AVISO.Telefonisch = "digital" 'AVISO.Telefonisch As String 'AVISO.Änderungen As String @@ -209,6 +213,12 @@ SENDUNG.tblSnd_Empfaenger = AD.Name1 & "; " & AD.City SENDUNG.tblSnd_EmpfaengerKdNr = -1 End If + + SENDUNG.tblSnd_Frachtfuehrer = AVISO.Frächter + SENDUNG.tblSnd_FrachtfuehrerKdNr = AVISO.Frächter_KdNr + SENDUNG.tblSnd_Avisierer = AVISO.Auftraggeber + SENDUNG.tblSnd_AvisiererKdNr = AVISO.Auftraggeber_KdNr + Next SENDUNG.VORSYSTEM = SHIPMENT.shTr_Partnersystem @@ -220,13 +230,17 @@ cnt += 1 End If Next + + 'UPDATE STATUS + PREPAPER.UPDATE_AVISO_Einarbeitet(True) + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(AVISO.AvisoID) - Me.Close() + Me.Close() + + End If End If - End If - End Sub End Class \ No newline at end of file diff --git a/Aviso/frmAnkunftAendern.vb b/Aviso/frmAnkunftAendern.vb index 7719c47..c3eb310 100644 --- a/Aviso/frmAnkunftAendern.vb +++ b/Aviso/frmAnkunftAendern.vb @@ -21,7 +21,7 @@ End Sub Private Sub frmAnkunftAendern_Load(sender As Object, e As EventArgs) Handles Me.Load - MsgBox(AVISO.Grenzstelle) + If AVISO Is Nothing Then Exit Sub If AVISO.Grenzstelle.Replace("???", "") = "" Then If AVISO.Zollstelle IsNot Nothing Then @@ -44,6 +44,7 @@ Case "NKD" : Return "NICKELSDORF" Case "NEU" : Return "NEUHAUS" Case "SFD" : Return "SPIELFELD" + Case "AMB" : Return "AMBAR" Case Else : Return Grenzstelle End Select End Function diff --git a/Aviso/frmAvisoWeiterleiten.Designer.vb b/Aviso/frmAvisoWeiterleiten.Designer.vb index 0a1f7e1..f4081dd 100644 --- a/Aviso/frmAvisoWeiterleiten.Designer.vb +++ b/Aviso/frmAvisoWeiterleiten.Designer.vb @@ -74,11 +74,12 @@ Partial Class frmAvisoWeiterleiten Me.Panel5 = New System.Windows.Forms.Panel() Me.Label6 = New System.Windows.Forms.Label() Me.dgvAnmhaenge = New System.Windows.Forms.DataGridView() + Me.clmnAnhFilePath = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAnhFileName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Button1 = New System.Windows.Forms.Button() Me.Label5 = New System.Windows.Forms.Label() Me.rtbVermerk = New System.Windows.Forms.RichTextBox() - Me.clmnAnhFilePath = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.clmnAnhFileName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.btnVERIMEX = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() @@ -108,7 +109,7 @@ Partial Class frmAvisoWeiterleiten Me.pnl.Dock = System.Windows.Forms.DockStyle.Top Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(733, 37) + Me.pnl.Size = New System.Drawing.Size(854, 37) Me.pnl.TabIndex = 0 ' 'Label3 @@ -116,7 +117,7 @@ Partial Class frmAvisoWeiterleiten Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!) - Me.Label3.Location = New System.Drawing.Point(576, 7) + Me.Label3.Location = New System.Drawing.Point(697, 7) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(109, 24) Me.Label3.TabIndex = 8 @@ -126,7 +127,7 @@ Partial Class frmAvisoWeiterleiten ' Me.pic.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.pic.Image = Global.AVISO.My.Resources.Resources.weiterleiten_small1 - Me.pic.Location = New System.Drawing.Point(689, 3) + Me.pic.Location = New System.Drawing.Point(810, 3) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(44, 32) Me.pic.TabIndex = 7 @@ -248,7 +249,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel4.Location = New System.Drawing.Point(320, 37) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(413, 599) + Me.Panel4.Size = New System.Drawing.Size(534, 599) Me.Panel4.TabIndex = 20 ' 'Panel1 @@ -260,7 +261,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel1.Dock = System.Windows.Forms.DockStyle.Left Me.Panel1.Location = New System.Drawing.Point(200, 57) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(200, 365) + Me.Panel1.Size = New System.Drawing.Size(325, 365) Me.Panel1.TabIndex = 20 ' 'flpFirma @@ -268,7 +269,7 @@ Partial Class frmAvisoWeiterleiten Me.flpFirma.Dock = System.Windows.Forms.DockStyle.Fill Me.flpFirma.Location = New System.Drawing.Point(0, 28) Me.flpFirma.Name = "flpFirma" - Me.flpFirma.Size = New System.Drawing.Size(198, 335) + Me.flpFirma.Size = New System.Drawing.Size(323, 335) Me.flpFirma.TabIndex = 1 ' 'Panel3 @@ -279,7 +280,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(198, 28) + Me.Panel3.Size = New System.Drawing.Size(323, 28) Me.Panel3.TabIndex = 2 ' 'Label1 @@ -578,10 +579,11 @@ Partial Class frmAvisoWeiterleiten Me.MyFlowLayoutPanel1.Controls.Add(Me.btnUNIPED) Me.MyFlowLayoutPanel1.Controls.Add(Me.btnIMEX) Me.MyFlowLayoutPanel1.Controls.Add(Me.btnFrontoffice) + Me.MyFlowLayoutPanel1.Controls.Add(Me.btnVERIMEX) Me.MyFlowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top Me.MyFlowLayoutPanel1.Location = New System.Drawing.Point(0, 0) Me.MyFlowLayoutPanel1.Name = "MyFlowLayoutPanel1" - Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(411, 57) + Me.MyFlowLayoutPanel1.Size = New System.Drawing.Size(532, 57) Me.MyFlowLayoutPanel1.TabIndex = 21 ' 'btnVERAG @@ -639,7 +641,7 @@ Partial Class frmAvisoWeiterleiten Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom Me.Panel5.Location = New System.Drawing.Point(0, 422) Me.Panel5.Name = "Panel5" - Me.Panel5.Size = New System.Drawing.Size(411, 175) + Me.Panel5.Size = New System.Drawing.Size(532, 175) Me.Panel5.TabIndex = 22 ' 'Label6 @@ -666,16 +668,30 @@ Partial Class frmAvisoWeiterleiten Me.dgvAnmhaenge.ReadOnly = True Me.dgvAnmhaenge.RowHeadersVisible = False Me.dgvAnmhaenge.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnmhaenge.Size = New System.Drawing.Size(249, 70) + Me.dgvAnmhaenge.Size = New System.Drawing.Size(375, 70) Me.dgvAnmhaenge.TabIndex = 17 ' + 'clmnAnhFilePath + ' + Me.clmnAnhFilePath.HeaderText = "Column1" + Me.clmnAnhFilePath.Name = "clmnAnhFilePath" + Me.clmnAnhFilePath.ReadOnly = True + Me.clmnAnhFilePath.Visible = False + ' + 'clmnAnhFileName + ' + Me.clmnAnhFileName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnAnhFileName.HeaderText = "Datei" + Me.clmnAnhFileName.Name = "clmnAnhFileName" + Me.clmnAnhFileName.ReadOnly = True + ' 'Button1 ' Me.Button1.BackColor = System.Drawing.Color.SteelBlue Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.Button1.ForeColor = System.Drawing.Color.White - Me.Button1.Location = New System.Drawing.Point(316, 118) + Me.Button1.Location = New System.Drawing.Point(442, 118) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(82, 42) Me.Button1.TabIndex = 15 @@ -697,30 +713,27 @@ Partial Class frmAvisoWeiterleiten Me.rtbVermerk.Location = New System.Drawing.Point(60, 16) Me.rtbVermerk.MaxLength = 500 Me.rtbVermerk.Name = "rtbVermerk" - Me.rtbVermerk.Size = New System.Drawing.Size(339, 71) + Me.rtbVermerk.Size = New System.Drawing.Size(465, 71) Me.rtbVermerk.TabIndex = 0 Me.rtbVermerk.Text = "" ' - 'clmnAnhFilePath + 'btnVERIMEX ' - Me.clmnAnhFilePath.HeaderText = "Column1" - Me.clmnAnhFilePath.Name = "clmnAnhFilePath" - Me.clmnAnhFilePath.ReadOnly = True - Me.clmnAnhFilePath.Visible = False - ' - 'clmnAnhFileName - ' - Me.clmnAnhFileName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.clmnAnhFileName.HeaderText = "Datei" - Me.clmnAnhFileName.Name = "clmnAnhFileName" - Me.clmnAnhFileName.ReadOnly = True + Me.btnVERIMEX.FlatStyle = System.Windows.Forms.FlatStyle.Popup + Me.btnVERIMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + Me.btnVERIMEX.Location = New System.Drawing.Point(405, 3) + Me.btnVERIMEX.Name = "btnVERIMEX" + Me.btnVERIMEX.Size = New System.Drawing.Size(120, 43) + Me.btnVERIMEX.TabIndex = 9 + Me.btnVERIMEX.Text = "VERIMEX" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Istanbul)" + Me.btnVERIMEX.UseVisualStyleBackColor = True ' 'frmAvisoWeiterleiten ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(733, 636) + Me.ClientSize = New System.Drawing.Size(854, 636) Me.Controls.Add(Me.Panel4) Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.pnl) @@ -808,4 +821,5 @@ Partial Class frmAvisoWeiterleiten Friend WithEvents dgvAnmhaenge As DataGridView Friend WithEvents clmnAnhFilePath As DataGridViewTextBoxColumn Friend WithEvents clmnAnhFileName As DataGridViewTextBoxColumn + Friend WithEvents btnVERIMEX As Button End Class diff --git a/Aviso/frmAvisoWeiterleiten.vb b/Aviso/frmAvisoWeiterleiten.vb index f098563..1601566 100644 --- a/Aviso/frmAvisoWeiterleiten.vb +++ b/Aviso/frmAvisoWeiterleiten.vb @@ -198,7 +198,7 @@ Public Class frmAvisoWeiterleiten ' initButtons(sender) 'End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnVERAG.Click, btnIMEX.Click, btnUNIPED.Click, btnFrontoffice.Click, btnVERIMEX.Click 'flpAbteilung.Controls.Clear() flpTeams.Controls.Clear() ' flpNiederlassung.Controls.Clear() @@ -210,6 +210,7 @@ Public Class frmAvisoWeiterleiten addBtn(flpFirma, "N", "SBG", "VERAG Salzburg") addBtn(flpFirma, "N", "WAI", "VERAG Waidhaus") addBtn(flpFirma, "N", "NKD", "VERAG Nickelsdorf") + addBtn(flpFirma, "N", "NEU", "VERAG Neuhaus") addBtn(flpFirma, "A", "FISK", "VERAG Fiskal") @@ -233,6 +234,8 @@ Public Class frmAvisoWeiterleiten ElseIf sender Is btnFrontoffice Then addBtn(flpFirma, "F", "FRONTOFFICE", "FRONT-OFFICE", True) + ElseIf sender Is btnVERIMEX Then + addBtn(flpFirma, "F", "VERIMEX", "VERIMEX", True) End If diff --git a/Aviso/frmEintragAviso.designer.vb b/Aviso/frmEintragAviso.designer.vb index 0ebb2df..5597d4b 100644 --- a/Aviso/frmEintragAviso.designer.vb +++ b/Aviso/frmEintragAviso.designer.vb @@ -75,6 +75,7 @@ Partial Class frmEintragAviso Me.cboGrenzstelle = New System.Windows.Forms.ComboBox() Me.Label15 = New System.Windows.Forms.Label() Me.grpAviso = New System.Windows.Forms.GroupBox() + Me.lblErr_KdNr = New System.Windows.Forms.Label() Me.Button5 = New System.Windows.Forms.Button() Me.lblErrVorraussuchtlEintreffen = New System.Windows.Forms.Label() Me.txtAvisiererAuftragsNr = New System.Windows.Forms.TextBox() @@ -142,7 +143,8 @@ Partial Class frmEintragAviso Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.clmnPfad = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.lblErr_KdNr = New System.Windows.Forms.Label() + Me.cbxWarenort = New System.Windows.Forms.CheckBox() + Me.pnl = New System.Windows.Forms.Panel() Me.panAdmin.SuspendLayout() Me.grpAviso.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -151,6 +153,7 @@ Partial Class frmEintragAviso Me.grpAktVerzollung.SuspendLayout() Me.pnlSBG.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnl.SuspendLayout() Me.SuspendLayout() ' 'btnOK @@ -196,7 +199,7 @@ Partial Class frmEintragAviso Me.txtInfo.Name = "txtInfo" Me.txtInfo.ScrollBars = System.Windows.Forms.ScrollBars.Vertical Me.txtInfo.Size = New System.Drawing.Size(388, 75) - Me.txtInfo.TabIndex = 48 + Me.txtInfo.TabIndex = 49 ' 'Label3 ' @@ -205,13 +208,13 @@ Partial Class frmEintragAviso Me.Label3.Location = New System.Drawing.Point(6, 399) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(25, 13) - Me.Label3.TabIndex = 47 + Me.Label3.TabIndex = 48 Me.Label3.Text = "Info" ' 'Label4 ' Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(6, 195) + Me.Label4.Location = New System.Drawing.Point(6, 199) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(46, 13) Me.Label4.TabIndex = 24 @@ -220,7 +223,7 @@ Partial Class frmEintragAviso 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(6, 234) + Me.Label5.Location = New System.Drawing.Point(6, 238) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(47, 13) Me.Label5.TabIndex = 30 @@ -232,7 +235,7 @@ Partial Class frmEintragAviso Me.Label6.Location = New System.Drawing.Point(6, 125) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(48, 13) - Me.Label6.TabIndex = 12 + Me.Label6.TabIndex = 13 Me.Label6.Text = "LKW-Nr:" ' 'txtÄnderungen @@ -277,7 +280,7 @@ Partial Class frmEintragAviso Me.txtLKW_Nr.MaxLength = 30 Me.txtLKW_Nr.Name = "txtLKW_Nr" Me.txtLKW_Nr.Size = New System.Drawing.Size(170, 26) - Me.txtLKW_Nr.TabIndex = 17 + Me.txtLKW_Nr.TabIndex = 18 ' 'lblStatus ' @@ -577,7 +580,7 @@ Partial Class frmEintragAviso Me.Label11.Location = New System.Drawing.Point(229, 125) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(59, 13) - Me.Label11.TabIndex = 15 + Me.Label11.TabIndex = 16 Me.Label11.Text = "Grenzstelle" ' 'dtpAvisoEingangDatum @@ -615,7 +618,7 @@ Partial Class frmEintragAviso Me.optOhneAviso.Location = New System.Drawing.Point(9, 75) Me.optOhneAviso.Name = "optOhneAviso" Me.optOhneAviso.Size = New System.Drawing.Size(210, 30) - Me.optOhneAviso.TabIndex = 8 + Me.optOhneAviso.TabIndex = 9 Me.optOhneAviso.TabStop = True Me.optOhneAviso.Text = "Ankunft OHNE Aviso " & Global.Microsoft.VisualBasic.ChrW(10) & "--> LKW wird direkt auf Ankunft gesetzt" Me.optOhneAviso.UseVisualStyleBackColor = True @@ -671,7 +674,7 @@ Partial Class frmEintragAviso Me.Label12.Location = New System.Drawing.Point(6, 491) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(372, 32) - Me.Label12.TabIndex = 51 + Me.Label12.TabIndex = 52 Me.Label12.Text = "Achtung: im Feld Info nur allgemeine Infos erfassen. " & Global.Microsoft.VisualBasic.ChrW(10) & "Ab Status ANKUNFT kann dies" & "es Infofeld nicht mehr geändert werden!" ' @@ -679,11 +682,11 @@ Partial Class frmEintragAviso ' Me.cbxHandling.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.cbxHandling.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) - Me.cbxHandling.Location = New System.Drawing.Point(272, 326) + Me.cbxHandling.Location = New System.Drawing.Point(272, 330) Me.cbxHandling.Name = "cbxHandling" Me.cbxHandling.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) Me.cbxHandling.Size = New System.Drawing.Size(123, 24) - Me.cbxHandling.TabIndex = 44 + Me.cbxHandling.TabIndex = 45 Me.cbxHandling.Text = "Handling" Me.cbxHandling.UseVisualStyleBackColor = False ' @@ -695,7 +698,7 @@ Partial Class frmEintragAviso Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cboGrenzstelle.FormattingEnabled = True Me.cboGrenzstelle.Items.AddRange(New Object() {"", "SUB", "SBG", "WAI", "NKD", "SFD", "NEU", "???"}) - Me.cboGrenzstelle.Location = New System.Drawing.Point(232, 141) + Me.cboGrenzstelle.Location = New System.Drawing.Point(232, 139) Me.cboGrenzstelle.Name = "cboGrenzstelle" Me.cboGrenzstelle.Size = New System.Drawing.Size(74, 28) Me.cboGrenzstelle.TabIndex = 20 @@ -721,8 +724,6 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.kdAvisierer) Me.grpAviso.Controls.Add(Me.kdFrächter) Me.grpAviso.Controls.Add(Me.txtLKW_Nr) - Me.grpAviso.Controls.Add(Me.lblZA) - Me.grpAviso.Controls.Add(Me.txtBestimmungszollstelle) Me.grpAviso.Controls.Add(Me.Button4) Me.grpAviso.Controls.Add(Me.sbLkwNationalitaet) Me.grpAviso.Controls.Add(Me.Label18) @@ -767,6 +768,7 @@ Partial Class frmEintragAviso Me.grpAviso.Controls.Add(Me.Label22) Me.grpAviso.Controls.Add(Me.Label24) Me.grpAviso.Controls.Add(Me.datVoraussichtlichesEintreffen) + Me.grpAviso.Controls.Add(Me.pnl) Me.grpAviso.Location = New System.Drawing.Point(12, 45) Me.grpAviso.Name = "grpAviso" Me.grpAviso.Size = New System.Drawing.Size(403, 520) @@ -774,6 +776,17 @@ Partial Class frmEintragAviso Me.grpAviso.TabStop = False Me.grpAviso.Text = "Aviso" ' + 'lblErr_KdNr + ' + Me.lblErr_KdNr.AutoSize = True + Me.lblErr_KdNr.ForeColor = System.Drawing.Color.Red + Me.lblErr_KdNr.Location = New System.Drawing.Point(130, 238) + Me.lblErr_KdNr.Name = "lblErr_KdNr" + Me.lblErr_KdNr.Size = New System.Drawing.Size(136, 13) + Me.lblErr_KdNr.TabIndex = 32 + Me.lblErr_KdNr.Text = "Kunden-Nummer eingeben!" + Me.lblErr_KdNr.Visible = False + ' 'Button5 ' Me.Button5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) @@ -794,26 +807,26 @@ Partial Class frmEintragAviso Me.lblErrVorraussuchtlEintreffen.Location = New System.Drawing.Point(147, 69) Me.lblErrVorraussuchtlEintreffen.Name = "lblErrVorraussuchtlEintreffen" Me.lblErrVorraussuchtlEintreffen.Size = New System.Drawing.Size(244, 13) - Me.lblErrVorraussuchtlEintreffen.TabIndex = 52 + Me.lblErrVorraussuchtlEintreffen.TabIndex = 8 Me.lblErrVorraussuchtlEintreffen.Text = "Datum kann icht kleiner als Erfassungsdatum sein!" Me.lblErrVorraussuchtlEintreffen.Visible = False ' 'txtAvisiererAuftragsNr ' Me.txtAvisiererAuftragsNr.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.txtAvisiererAuftragsNr.Location = New System.Drawing.Point(9, 366) + Me.txtAvisiererAuftragsNr.Location = New System.Drawing.Point(9, 370) Me.txtAvisiererAuftragsNr.MaxLength = 30 Me.txtAvisiererAuftragsNr.Name = "txtAvisiererAuftragsNr" Me.txtAvisiererAuftragsNr.Size = New System.Drawing.Size(388, 20) - Me.txtAvisiererAuftragsNr.TabIndex = 46 + Me.txtAvisiererAuftragsNr.TabIndex = 47 ' 'Label23 ' Me.Label23.AutoSize = True - Me.Label23.Location = New System.Drawing.Point(6, 352) + Me.Label23.Location = New System.Drawing.Point(6, 356) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(106, 13) - Me.Label23.TabIndex = 45 + Me.Label23.TabIndex = 46 Me.Label23.Text = "Avisierer-AuftragsNr.:" ' 'kdAuftraggeber @@ -834,12 +847,12 @@ Partial Class frmEintragAviso Me.kdAuftraggeber.KdNr = "-1" Me.kdAuftraggeber.kdNrField = Nothing Me.kdAuftraggeber.KdNrNullInt = Nothing - Me.kdAuftraggeber.Location = New System.Drawing.Point(9, 289) + Me.kdAuftraggeber.Location = New System.Drawing.Point(9, 293) Me.kdAuftraggeber.Name = "kdAuftraggeber" Me.kdAuftraggeber.nurAktive = False Me.kdAuftraggeber.searchActive = True Me.kdAuftraggeber.Size = New System.Drawing.Size(343, 20) - Me.kdAuftraggeber.TabIndex = 40 + Me.kdAuftraggeber.TabIndex = 41 Me.kdAuftraggeber.TIMER_SEARCH = True Me.kdAuftraggeber.usrcntl = Nothing Me.kdAuftraggeber.Visible = False @@ -862,12 +875,12 @@ Partial Class frmEintragAviso Me.kdAvisierer.KdNr = "-1" Me.kdAvisierer.kdNrField = Nothing Me.kdAvisierer.KdNrNullInt = Nothing - Me.kdAvisierer.Location = New System.Drawing.Point(9, 250) + Me.kdAvisierer.Location = New System.Drawing.Point(9, 254) Me.kdAvisierer.Name = "kdAvisierer" Me.kdAvisierer.nurAktive = False Me.kdAvisierer.searchActive = True Me.kdAvisierer.Size = New System.Drawing.Size(343, 20) - Me.kdAvisierer.TabIndex = 34 + Me.kdAvisierer.TabIndex = 35 Me.kdAvisierer.TIMER_SEARCH = True Me.kdAvisierer.usrcntl = Nothing ' @@ -889,7 +902,7 @@ Partial Class frmEintragAviso Me.kdFrächter.KdNr = "-1" Me.kdFrächter.kdNrField = Nothing Me.kdFrächter.KdNrNullInt = Nothing - Me.kdFrächter.Location = New System.Drawing.Point(9, 211) + Me.kdFrächter.Location = New System.Drawing.Point(9, 215) Me.kdFrächter.Name = "kdFrächter" Me.kdFrächter.nurAktive = False Me.kdFrächter.searchActive = True @@ -901,12 +914,11 @@ Partial Class frmEintragAviso 'lblZA ' Me.lblZA.AutoSize = True - Me.lblZA.Location = New System.Drawing.Point(6, 175) + Me.lblZA.Location = New System.Drawing.Point(6, 5) Me.lblZA.Name = "lblZA" Me.lblZA.Size = New System.Drawing.Size(44, 13) - Me.lblZA.TabIndex = 22 + Me.lblZA.TabIndex = 0 Me.lblZA.Text = "Zollamt:" - Me.lblZA.Visible = False ' 'txtBestimmungszollstelle ' @@ -922,18 +934,17 @@ Partial Class frmEintragAviso Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing Me.txtBestimmungszollstelle.key_visible = False Me.txtBestimmungszollstelle.KEYPARAM = Nothing - Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(58, 172) + Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(52, 2) Me.txtBestimmungszollstelle.MaxLength = 50 Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" Me.txtBestimmungszollstelle.searchActive = True - Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(294, 20) + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(239, 20) Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing Me.txtBestimmungszollstelle.SQL_SELECT = Nothing Me.txtBestimmungszollstelle.SQL_WHERE = Nothing Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing - Me.txtBestimmungszollstelle.TabIndex = 23 + Me.txtBestimmungszollstelle.TabIndex = 1 Me.txtBestimmungszollstelle.usrcntl = Nothing - Me.txtBestimmungszollstelle.Visible = False ' 'Button4 ' @@ -941,7 +952,7 @@ Partial Class frmEintragAviso Me.Button4.FlatAppearance.BorderSize = 0 Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Image = Global.AVISO.My.Resources.Resources.person_add - Me.Button4.Location = New System.Drawing.Point(377, 207) + Me.Button4.Location = New System.Drawing.Point(377, 211) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(25, 25) Me.Button4.TabIndex = 29 @@ -975,7 +986,7 @@ Partial Class frmEintragAviso Me.sbLkwNationalitaet.SQL_SELECT = Nothing Me.sbLkwNationalitaet.SQL_WHERE = Nothing Me.sbLkwNationalitaet.SQL_WhereParamList = Nothing - Me.sbLkwNationalitaet.TabIndex = 18 + Me.sbLkwNationalitaet.TabIndex = 19 Me.sbLkwNationalitaet.usrcntl = Nothing ' 'Label18 @@ -984,17 +995,17 @@ Partial Class frmEintragAviso Me.Label18.Location = New System.Drawing.Point(176, 125) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(27, 13) - Me.Label18.TabIndex = 14 + Me.Label18.TabIndex = 15 Me.Label18.Text = "Nat." ' 'txtFahrerHandy ' Me.txtFahrerHandy.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.txtFahrerHandy.Location = New System.Drawing.Point(24, 328) + Me.txtFahrerHandy.Location = New System.Drawing.Point(24, 332) Me.txtFahrerHandy.MaxLength = 30 Me.txtFahrerHandy.Name = "txtFahrerHandy" Me.txtFahrerHandy.Size = New System.Drawing.Size(234, 20) - Me.txtFahrerHandy.TabIndex = 43 + Me.txtFahrerHandy.TabIndex = 44 ' 'Button2 ' @@ -1002,10 +1013,10 @@ Partial Class frmEintragAviso Me.Button2.FlatAppearance.BorderSize = 0 Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button2.Image = Global.AVISO.My.Resources.Resources.person_add - Me.Button2.Location = New System.Drawing.Point(377, 247) + Me.Button2.Location = New System.Drawing.Point(377, 251) Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(25, 24) - Me.Button2.TabIndex = 36 + Me.Button2.TabIndex = 37 Me.Button2.TabStop = False Me.Button2.Tag = "Kunde hinzufügen" Me.Button2.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -1016,7 +1027,7 @@ Partial Class frmEintragAviso ' Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.handy Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(5, 328) + Me.pic.Location = New System.Drawing.Point(5, 332) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(20, 20) Me.pic.TabIndex = 40 @@ -1025,16 +1036,16 @@ Partial Class frmEintragAviso 'Label16 ' Me.Label16.AutoSize = True - Me.Label16.Location = New System.Drawing.Point(6, 314) + Me.Label16.Location = New System.Drawing.Point(6, 318) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(116, 13) - Me.Label16.TabIndex = 42 + Me.Label16.TabIndex = 43 Me.Label16.Text = "Fahrer Handy-Nummer:" ' 'cbxFrächterUnbekannt ' Me.cbxFrächterUnbekannt.AutoSize = True - Me.cbxFrächterUnbekannt.Location = New System.Drawing.Point(122, 194) + Me.cbxFrächterUnbekannt.Location = New System.Drawing.Point(122, 198) Me.cbxFrächterUnbekannt.Name = "cbxFrächterUnbekannt" Me.cbxFrächterUnbekannt.Size = New System.Drawing.Size(104, 17) Me.cbxFrächterUnbekannt.TabIndex = 25 @@ -1049,10 +1060,10 @@ Partial Class frmEintragAviso Me.btnAuftraggeber.FlatAppearance.BorderSize = 0 Me.btnAuftraggeber.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAuftraggeber.Image = CType(resources.GetObject("btnAuftraggeber.Image"), System.Drawing.Image) - Me.btnAuftraggeber.Location = New System.Drawing.Point(352, 285) + Me.btnAuftraggeber.Location = New System.Drawing.Point(352, 289) Me.btnAuftraggeber.Name = "btnAuftraggeber" Me.btnAuftraggeber.Size = New System.Drawing.Size(25, 25) - Me.btnAuftraggeber.TabIndex = 41 + Me.btnAuftraggeber.TabIndex = 42 Me.btnAuftraggeber.TabStop = False Me.btnAuftraggeber.Tag = "Kunde hinzufügen" Me.btnAuftraggeber.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -1070,7 +1081,7 @@ Partial Class frmEintragAviso Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 50 + Me.UsrCntlTestsystem1.TabIndex = 51 ' 'btnAvisiererKd ' @@ -1079,10 +1090,10 @@ Partial Class frmEintragAviso Me.btnAvisiererKd.FlatAppearance.BorderSize = 0 Me.btnAvisiererKd.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnAvisiererKd.Image = CType(resources.GetObject("btnAvisiererKd.Image"), System.Drawing.Image) - Me.btnAvisiererKd.Location = New System.Drawing.Point(352, 246) + Me.btnAvisiererKd.Location = New System.Drawing.Point(352, 250) Me.btnAvisiererKd.Name = "btnAvisiererKd" Me.btnAvisiererKd.Size = New System.Drawing.Size(25, 25) - Me.btnAvisiererKd.TabIndex = 35 + Me.btnAvisiererKd.TabIndex = 36 Me.btnAvisiererKd.TabStop = False Me.btnAvisiererKd.Tag = "Kunde hinzufügen" Me.btnAvisiererKd.TextAlign = System.Drawing.ContentAlignment.BottomCenter @@ -1096,7 +1107,7 @@ Partial Class frmEintragAviso Me.btnFraechterKd.FlatAppearance.BorderSize = 0 Me.btnFraechterKd.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnFraechterKd.Image = CType(resources.GetObject("btnFraechterKd.Image"), System.Drawing.Image) - Me.btnFraechterKd.Location = New System.Drawing.Point(352, 207) + Me.btnFraechterKd.Location = New System.Drawing.Point(352, 211) Me.btnFraechterKd.Name = "btnFraechterKd" Me.btnFraechterKd.Size = New System.Drawing.Size(25, 25) Me.btnFraechterKd.TabIndex = 28 @@ -1113,7 +1124,7 @@ Partial Class frmEintragAviso Me.lblErrImex.Location = New System.Drawing.Point(236, 109) Me.lblErrImex.Name = "lblErrImex" Me.lblErrImex.Size = New System.Drawing.Size(119, 13) - Me.lblErrImex.TabIndex = 10 + Me.lblErrImex.TabIndex = 11 Me.lblErrImex.Text = "Import/Export angeben!" Me.lblErrImex.Visible = False ' @@ -1128,7 +1139,7 @@ Partial Class frmEintragAviso Me.cboImEx.Location = New System.Drawing.Point(312, 139) Me.cboImEx.Name = "cboImEx" Me.cboImEx.Size = New System.Drawing.Size(79, 28) - Me.cboImEx.TabIndex = 19 + Me.cboImEx.TabIndex = 21 Me.cboImEx.Visible = False ' 'Label1 @@ -1138,7 +1149,7 @@ Partial Class frmEintragAviso Me.Label1.Location = New System.Drawing.Point(309, 125) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(35, 13) - Me.Label1.TabIndex = 16 + Me.Label1.TabIndex = 17 Me.Label1.Text = "Im/Ex" Me.Label1.Visible = False ' @@ -1157,10 +1168,10 @@ Partial Class frmEintragAviso ' Me.lblErr_Avisierer.AutoSize = True Me.lblErr_Avisierer.ForeColor = System.Drawing.Color.Red - Me.lblErr_Avisierer.Location = New System.Drawing.Point(194, 234) + Me.lblErr_Avisierer.Location = New System.Drawing.Point(194, 238) Me.lblErr_Avisierer.Name = "lblErr_Avisierer" Me.lblErr_Avisierer.Size = New System.Drawing.Size(97, 13) - Me.lblErr_Avisierer.TabIndex = 32 + Me.lblErr_Avisierer.TabIndex = 33 Me.lblErr_Avisierer.Text = "Avisierer eingeben!" Me.lblErr_Avisierer.Visible = False ' @@ -1168,7 +1179,7 @@ Partial Class frmEintragAviso ' Me.lblErr_Frächter.AutoSize = True Me.lblErr_Frächter.ForeColor = System.Drawing.Color.Red - Me.lblErr_Frächter.Location = New System.Drawing.Point(92, 234) + Me.lblErr_Frächter.Location = New System.Drawing.Point(92, 238) Me.lblErr_Frächter.Name = "lblErr_Frächter" Me.lblErr_Frächter.Size = New System.Drawing.Size(96, 13) Me.lblErr_Frächter.TabIndex = 31 @@ -1182,7 +1193,7 @@ Partial Class frmEintragAviso Me.lblErr_LKW.Location = New System.Drawing.Point(75, 125) Me.lblErr_LKW.Name = "lblErr_LKW" Me.lblErr_LKW.Size = New System.Drawing.Size(95, 13) - Me.lblErr_LKW.TabIndex = 13 + Me.lblErr_LKW.TabIndex = 14 Me.lblErr_LKW.Text = "LKW-Nr eingeben!" Me.lblErr_LKW.Visible = False ' @@ -1193,7 +1204,7 @@ Partial Class frmEintragAviso Me.lblErr_Grenzstelle.Location = New System.Drawing.Point(157, 109) Me.lblErr_Grenzstelle.Name = "lblErr_Grenzstelle" Me.lblErr_Grenzstelle.Size = New System.Drawing.Size(109, 13) - Me.lblErr_Grenzstelle.TabIndex = 9 + Me.lblErr_Grenzstelle.TabIndex = 10 Me.lblErr_Grenzstelle.Text = "Grenzstelle eingeben!" Me.lblErr_Grenzstelle.Visible = False ' @@ -1205,7 +1216,7 @@ Partial Class frmEintragAviso Me.lblErrFmZollKdNr.Location = New System.Drawing.Point(176, 431) Me.lblErrFmZollKdNr.Name = "lblErrFmZollKdNr" Me.lblErrFmZollKdNr.Size = New System.Drawing.Size(156, 26) - Me.lblErrFmZollKdNr.TabIndex = 49 + Me.lblErrFmZollKdNr.TabIndex = 50 Me.lblErrFmZollKdNr.Text = "Wenn möglich bitte die FM-Zoll " & Global.Microsoft.VisualBasic.ChrW(10) & "Zuordnung mit KdNr eintragen!" Me.lblErrFmZollKdNr.Visible = False ' @@ -1214,10 +1225,10 @@ Partial Class frmEintragAviso Me.Button1.FlatAppearance.BorderSize = 0 Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button1.Image = CType(resources.GetObject("Button1.Image"), System.Drawing.Image) - Me.Button1.Location = New System.Drawing.Point(360, 151) + Me.Button1.Location = New System.Drawing.Point(360, 149) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(37, 20) - Me.Button1.TabIndex = 21 + Me.Button1.TabIndex = 22 Me.Button1.UseVisualStyleBackColor = True Me.Button1.Visible = False ' @@ -1229,7 +1240,7 @@ Partial Class frmEintragAviso Me.btnAbsSrch.Location = New System.Drawing.Point(360, 112) Me.btnAbsSrch.Name = "btnAbsSrch" Me.btnAbsSrch.Size = New System.Drawing.Size(37, 20) - Me.btnAbsSrch.TabIndex = 11 + Me.btnAbsSrch.TabIndex = 12 Me.btnAbsSrch.UseVisualStyleBackColor = True Me.btnAbsSrch.Visible = False ' @@ -1239,20 +1250,20 @@ Partial Class frmEintragAviso Me.lblAtrAvis.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtrAvis.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAtrAvis.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.lblAtrAvis.Location = New System.Drawing.Point(296, 274) + Me.lblAtrAvis.Location = New System.Drawing.Point(296, 278) Me.lblAtrAvis.Name = "lblAtrAvis" Me.lblAtrAvis.Size = New System.Drawing.Size(56, 13) - Me.lblAtrAvis.TabIndex = 39 + Me.lblAtrAvis.TabIndex = 40 Me.lblAtrAvis.Text = "= Avisierer" Me.lblAtrAvis.Visible = False ' 'lblAtr ' Me.lblAtr.AutoSize = True - Me.lblAtr.Location = New System.Drawing.Point(6, 274) + Me.lblAtr.Location = New System.Drawing.Point(6, 278) Me.lblAtr.Name = "lblAtr" Me.lblAtr.Size = New System.Drawing.Size(71, 13) - Me.lblAtr.TabIndex = 37 + Me.lblAtr.TabIndex = 38 Me.lblAtr.Text = "Auftraggeber:" Me.lblAtr.Visible = False ' @@ -1262,19 +1273,19 @@ Partial Class frmEintragAviso Me.Label17.Cursor = System.Windows.Forms.Cursors.Hand Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label17.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label17.Location = New System.Drawing.Point(297, 234) + Me.Label17.Location = New System.Drawing.Point(297, 238) Me.Label17.Name = "Label17" Me.Label17.Size = New System.Drawing.Size(55, 13) - Me.Label17.TabIndex = 33 + Me.Label17.TabIndex = 34 Me.Label17.Text = "= Frächter" ' 'cbxAuftraggeberfurAlleSendungen ' Me.cbxAuftraggeberfurAlleSendungen.AutoSize = True - Me.cbxAuftraggeberfurAlleSendungen.Location = New System.Drawing.Point(122, 272) + Me.cbxAuftraggeberfurAlleSendungen.Location = New System.Drawing.Point(122, 276) Me.cbxAuftraggeberfurAlleSendungen.Name = "cbxAuftraggeberfurAlleSendungen" Me.cbxAuftraggeberfurAlleSendungen.Size = New System.Drawing.Size(194, 17) - Me.cbxAuftraggeberfurAlleSendungen.TabIndex = 38 + Me.cbxAuftraggeberfurAlleSendungen.TabIndex = 39 Me.cbxAuftraggeberfurAlleSendungen.Text = "= Auftraggeber (für alle Sendungen)" Me.cbxAuftraggeberfurAlleSendungen.UseVisualStyleBackColor = True ' @@ -1284,7 +1295,7 @@ Partial Class frmEintragAviso Me.Label22.Cursor = System.Windows.Forms.Cursors.Hand Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label22.Location = New System.Drawing.Point(296, 195) + Me.Label22.Location = New System.Drawing.Point(296, 199) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(56, 13) Me.Label22.TabIndex = 26 @@ -1680,16 +1691,28 @@ Partial Class frmEintragAviso Me.clmnPfad.ReadOnly = True Me.clmnPfad.Visible = False ' - 'lblErr_KdNr + 'cbxWarenort ' - Me.lblErr_KdNr.AutoSize = True - Me.lblErr_KdNr.ForeColor = System.Drawing.Color.Red - Me.lblErr_KdNr.Location = New System.Drawing.Point(130, 234) - Me.lblErr_KdNr.Name = "lblErr_KdNr" - Me.lblErr_KdNr.Size = New System.Drawing.Size(136, 13) - Me.lblErr_KdNr.TabIndex = 53 - Me.lblErr_KdNr.Text = "Kunden-Nummer eingeben!" - Me.lblErr_KdNr.Visible = False + Me.cbxWarenort.AutoSize = True + Me.cbxWarenort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.cbxWarenort.Location = New System.Drawing.Point(300, 4) + Me.cbxWarenort.Name = "cbxWarenort" + Me.cbxWarenort.Size = New System.Drawing.Size(70, 17) + Me.cbxWarenort.TabIndex = 2 + Me.cbxWarenort.Text = "Warenort" + Me.cbxWarenort.UseVisualStyleBackColor = True + ' + 'pnl + ' + Me.pnl.BackColor = System.Drawing.Color.PapayaWhip + Me.pnl.Controls.Add(Me.cbxWarenort) + Me.pnl.Controls.Add(Me.txtBestimmungszollstelle) + Me.pnl.Controls.Add(Me.lblZA) + Me.pnl.Location = New System.Drawing.Point(0, 170) + Me.pnl.Name = "pnl" + Me.pnl.Size = New System.Drawing.Size(402, 24) + Me.pnl.TabIndex = 23 + Me.pnl.Visible = False ' 'frmEintragAviso ' @@ -1741,6 +1764,8 @@ Partial Class frmEintragAviso Me.pnlSBG.ResumeLayout(False) Me.pnlSBG.PerformLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnl.ResumeLayout(False) + Me.pnl.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1865,4 +1890,6 @@ Partial Class frmEintragAviso Friend WithEvents columnName As DataGridViewTextBoxColumn Friend WithEvents clmnPfad As DataGridViewTextBoxColumn Friend WithEvents lblErr_KdNr As Label + Friend WithEvents cbxWarenort As CheckBox + Friend WithEvents pnl As Panel End Class diff --git a/Aviso/frmEintragAviso.resx b/Aviso/frmEintragAviso.resx index fbb6608..8d6761d 100644 --- a/Aviso/frmEintragAviso.resx +++ b/Aviso/frmEintragAviso.resx @@ -216,6 +216,12 @@ True + + True + + + True + AAABAAEAgIAAAAEAIAAoCAEAFgAAACgAAACAAAAAAAEAAAEAIAAAAAAAAAgBABMLAAATCwAAAAAAAAAA diff --git a/Aviso/frmEintragAviso.vb b/Aviso/frmEintragAviso.vb index f2af1d3..eeb7c2b 100644 --- a/Aviso/frmEintragAviso.vb +++ b/Aviso/frmEintragAviso.vb @@ -80,10 +80,10 @@ Public Class frmEintragAviso Private Sub frmEintragAviso_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then - MsgBox("Keine Berechtigung!") - Me.Close() - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Me.Close() + 'End If Me.CenterToParent() @@ -115,8 +115,9 @@ Public Class frmEintragAviso cboImEx.Visible = True txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) - txtBestimmungszollstelle.Visible = True - lblZA.Visible = True + 'txtBestimmungszollstelle.Visible = True + 'lblZA.Visible = True + pnl.Visible = True Case "UNISPED" Label1.Visible = True cboImEx.Visible = True @@ -150,6 +151,11 @@ Public Class frmEintragAviso lblSndFremd.Visible = True cboImEx.Visible = True Label1.Visible = True + Case "AMB" + txtSndFremd.Visible = True + lblSndFremd.Visible = True + cboImEx.Visible = True + Label1.Visible = True End Select Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "FRONTOFFICE" @@ -384,12 +390,13 @@ Public Class frmEintragAviso - ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then - txtBestimmungszollstelle.SET_VALUE(If(myAviso.Zollstelle, "")) - ' End If + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then + txtBestimmungszollstelle.SET_VALUE(If(myAviso.Zollstelle, "")) + cbxWarenort.Checked = myAviso.Warenort + ' End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then cbxAktenzettelDrucken.Checked = AktenzetteldruckenVisible UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle1.SET_VALUE(If(myAviso.Durchgangszollstelle1, "")) UsrCntlEintragAvisoAtilla.sbDurchgangszollstelle2.SET_VALUE(If(myAviso.Durchgangszollstelle2, "")) @@ -870,6 +877,7 @@ Public Class frmEintragAviso 'If myAviso.FIRMA = "IMEX" Then myAviso.Zollstelle = SDL.cProgramFunctions.isLeerNothing(txtBestimmungszollstelle._value) + myAviso.Warenort = If(pnl.Visible, cbxWarenort.Checked, False) 'End If If myAviso.FIRMA = "ATILLA" Then @@ -912,6 +920,9 @@ Public Class frmEintragAviso End If End If + If myAviso.Warenort Then + AvisoStatusFunctions.insertVermerkAllg(tmpId, "ATB-Nr. folgt", 80) + End If Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Case "ATILLA" @@ -934,7 +945,7 @@ Public Class frmEintragAviso Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try - Case "IMEX", "UNISPED", "AMBAR", "FRONTOFFICE" + Case "IMEX", "UNISPED", "AMBAR", "FRONTOFFICE", "VERIMEX" Dim anzahlSendungen = ADMIN.getValueTxtBySql("SELECT count(*) FROM tblSendungen WHERE tblSnd_AvisoID=" & tmpId, "AVISO") ' bei Neuanlage=0 'Die Sendungen eintragen: @@ -954,8 +965,9 @@ Public Class frmEintragAviso Dim abfArt As Object = DBNull.Value getFilialeAndAbfertNrIMEX(cnt, filiale_tmp, abfnr_tmp, fremd, abfArt) + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then filiale_tmp = 0 'IIf(filiale_tmp > 0, ADMIN.getMaxPosNrIncrement(filiale_tmp, Now.Year), 0) - 'AvisoDAL.insertSendungEmpty(tmpId, cnt, filiale_tmp, abfnr_tmp, 0) ' INSERT + 'AvisoDAL.insertSendungEmpty(tmpId, scnt, filiale_tmp, abfnr_tmp, 0) ' INSERT Dim tblSnd_AuftraggeberKdNr As Object = Nothing Dim tblSnd_Auftraggeber As Object = Nothing If cbxAuftraggeberfurAlleSendungen.Checked Then @@ -1471,7 +1483,7 @@ Public Class frmEintragAviso Label20.Text = lnlSendungText.Text End Sub - Private Sub dtpAvisoEingangZeit_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAuftraggeber.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, txtBestimmungszollstelle.PreviewKeyDown + Private Sub dtpAvisoEingangZeit_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAuftraggeber.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, dtpAvisoEingangZeit.PreviewKeyDown, kdFrächter.PreviewKeyDown, kdAvisierer.PreviewKeyDown, txtBestimmungszollstelle.PreviewKeyDown, cbxWarenort.PreviewKeyDown If e.KeyCode = Keys.Return Then e.IsInputKey = True : Me.DialogResult = DialogResult.None If sender Is kdAvisierer Then kdAvisierer.FireReturn() : e.IsInputKey = True : Me.DialogResult = DialogResult.None @@ -1545,17 +1557,18 @@ Public Class frmEintragAviso Private Sub cboGrenzstelle_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboGrenzstelle.SelectedIndexChanged + pnl.Visible = False ' cboImEx.Visible = (cboGrenzstelle.Text = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED") Label1.Visible = (cboGrenzstelle.Text = "WAI" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED") Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "VERAG", "FRONTOFFICE", "UNISPED" + Case "VERAG", "FRONTOFFICE", "UNISPED", "IMEX" If cboGrenzstelle.Text = "???" Then txtBestimmungszollstelle.initSearchBox(Me.FindForm, "[basncd_dstnr] ,[basncd_dstnr] +' - ' + [basncd_name] +' (' +[basncd_alpha]+')' as displayPARAM,[basncd_dstnr] as Nr,[basncd_name] as Dienststelle,[basncd_alpha] as Land FROM basncd", {" [basncd_dstnr]", "basncd_name"}, " [basncd_gbdat] >= getdate() ", " basncd_alpha,[basncd_name]", "basncd_dstnr", "displayPARAM", "ATLAS", , 400, 200, {"displayPARAM", "basncd_dstnr"}) - txtBestimmungszollstelle.Visible = True - lblZA.Visible = True - + 'txtBestimmungszollstelle.Visible = True + 'lblZA.Visible = True + pnl.Visible = True End If End Select End Sub diff --git a/Aviso/frmEintragTV.vb b/Aviso/frmEintragTV.vb index 0111713..bb8c66d 100644 --- a/Aviso/frmEintragTV.vb +++ b/Aviso/frmEintragTV.vb @@ -34,7 +34,7 @@ Public Class frmEintragTV Else Me.Text = "Änderung Text für TV-Anzeige" 'ausgewählter Datensatz wird geladen - myAvisoTV = AvisoTVDAL.LesenAvisoTV(cGlobal.Aktive_ID, "") + myAvisoTV = AvisoTVDAL.LesenAvisoTV(cGlobal.Aktive_ID, "", "", "") 'Werte(zuweisen) txtZeile1.Text = myAvisoTV.FixeZeile1 diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 75ce445..517734c 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -71,6 +71,15 @@ Partial Class frmHauptfenster Me.IMEXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UNISPEDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FRONTOFFICEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.VERIMEXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.StandortWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SUBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SBGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.WAIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.NKDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.NEUToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AMBToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.NacherfassungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VollständigesUpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UpdateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -408,7 +417,7 @@ Partial Class frmHauptfenster 'mnuProgramm ' Me.mnuProgramm.BackColor = System.Drawing.Color.Transparent - Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) + Me.mnuProgramm.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFirmen, Me.NeuesPasswortToolStripMenuItem, Me.OptionenToolStripMenuItem, Me.StandorteToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator4, Me.FirmaWechselnToolStripMenuItem, Me.StandortWechselnToolStripMenuItem, Me.NacherfassungToolStripMenuItem, Me.VollständigesUpdateToolStripMenuItem, Me.UpdateToolStripMenuItem, Me.LogoutToolStripMenuItem}) Me.mnuProgramm.ForeColor = System.Drawing.Color.Black Me.mnuProgramm.Name = "mnuProgramm" Me.mnuProgramm.Size = New System.Drawing.Size(78, 20) @@ -540,7 +549,7 @@ Partial Class frmHauptfenster ' 'FirmaWechselnToolStripMenuItem ' - Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem}) + Me.FirmaWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) Me.FirmaWechselnToolStripMenuItem.Name = "FirmaWechselnToolStripMenuItem" Me.FirmaWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.FirmaWechselnToolStripMenuItem.Text = "Firma wechseln" @@ -548,33 +557,90 @@ Partial Class frmHauptfenster 'VERAGToolStripMenuItem ' Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" - Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.VERAGToolStripMenuItem.Text = "VERAG" ' 'ATILLAToolStripMenuItem ' Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" - Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATILLAToolStripMenuItem.Text = "ATILLA" ' 'IMEXToolStripMenuItem ' Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" - Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.IMEXToolStripMenuItem.Text = "IMEX" ' 'UNISPEDToolStripMenuItem ' Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" - Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.UNISPEDToolStripMenuItem.Text = "UNISPED" ' 'AMBARToolStripMenuItem ' Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" - Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(121, 22) + Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.AMBARToolStripMenuItem.Text = "AMBAR" ' + 'FRONTOFFICEToolStripMenuItem + ' + Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" + Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FRONTOFFICEToolStripMenuItem.Text = "FRONTOFFICE" + ' + 'VERIMEXToolStripMenuItem + ' + Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" + Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" + ' + 'StandortWechselnToolStripMenuItem + ' + Me.StandortWechselnToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.SUBToolStripMenuItem, Me.SBGToolStripMenuItem, Me.WAIToolStripMenuItem, Me.NKDToolStripMenuItem, Me.NEUToolStripMenuItem, Me.AMBToolStripMenuItem}) + Me.StandortWechselnToolStripMenuItem.Name = "StandortWechselnToolStripMenuItem" + Me.StandortWechselnToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StandortWechselnToolStripMenuItem.Text = "Standort wechseln" + Me.StandortWechselnToolStripMenuItem.Visible = False + ' + 'SUBToolStripMenuItem + ' + Me.SUBToolStripMenuItem.Name = "SUBToolStripMenuItem" + Me.SUBToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SUBToolStripMenuItem.Text = "SUB" + ' + 'SBGToolStripMenuItem + ' + Me.SBGToolStripMenuItem.Name = "SBGToolStripMenuItem" + Me.SBGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SBGToolStripMenuItem.Text = "SBG" + ' + 'WAIToolStripMenuItem + ' + Me.WAIToolStripMenuItem.Name = "WAIToolStripMenuItem" + Me.WAIToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.WAIToolStripMenuItem.Text = "WAI" + ' + 'NKDToolStripMenuItem + ' + Me.NKDToolStripMenuItem.Name = "NKDToolStripMenuItem" + Me.NKDToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.NKDToolStripMenuItem.Text = "NKD" + ' + 'NEUToolStripMenuItem + ' + Me.NEUToolStripMenuItem.Name = "NEUToolStripMenuItem" + Me.NEUToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.NEUToolStripMenuItem.Text = "NEU" + ' + 'AMBToolStripMenuItem + ' + Me.AMBToolStripMenuItem.Name = "AMBToolStripMenuItem" + Me.AMBToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AMBToolStripMenuItem.Text = "AMB" + Me.AMBToolStripMenuItem.Visible = False + ' 'NacherfassungToolStripMenuItem ' Me.NacherfassungToolStripMenuItem.Name = "NacherfassungToolStripMenuItem" @@ -3119,4 +3185,13 @@ Partial Class frmHauptfenster Friend WithEvents btnMAVerzeichnis As Button Friend WithEvents Label22 As Label Friend WithEvents Button12 As Button + Friend WithEvents FRONTOFFICEToolStripMenuItem As ToolStripMenuItem + Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem + Friend WithEvents StandortWechselnToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SUBToolStripMenuItem As ToolStripMenuItem + Friend WithEvents SBGToolStripMenuItem As ToolStripMenuItem + Friend WithEvents WAIToolStripMenuItem As ToolStripMenuItem + Friend WithEvents NKDToolStripMenuItem As ToolStripMenuItem + Friend WithEvents NEUToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AMBToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index d7bcdb5..bda52f6 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -192,6 +192,7 @@ Public Class frmHauptfenster cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD")) cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SFD", "SFD")) cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEU", "NEU")) + cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMB", "AMB")) cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???")) cboGrenzstelle.changeItem("") @@ -211,6 +212,7 @@ Public Class frmHauptfenster cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NKD", "NKD")) cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("SFD", "SFD")) cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("NEU", "NEU")) + cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("AMB", "AMB")) cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???")) cboMy_Grenzstelle.changeItem("") @@ -219,6 +221,9 @@ Public Class frmHauptfenster cboMyAvisoAnzeige.fillWithSQL("SELECT team_id, team_bezeichnung FROM tblTeams WHERE team_firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", False, "ADMIN", True, False) cboMyAvisoAnzeige.changeItem("Benutzer") + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERAG" Then + StandortWechselnToolStripMenuItem.Visible = True + End If 'MyComboBox2.Items.Clear() 'MyComboBox2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Benutzer", "Benutzer")) @@ -265,8 +270,9 @@ Public Class frmHauptfenster Case Else : lblAkte.Text = zeilen & " Akte vom Arbeitsplatz übernommen" End Select - If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung <> "QS" Then - cboGrenzstelle._value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung + If Not (VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_abteilung = "QS" And VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "SUB") Then + ' cboGrenzstelle._value = VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung + cboGrenzstelle._value = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG End If End Select @@ -288,14 +294,16 @@ Public Class frmHauptfenster AdministrationToolStripMenuItem.Visible = True lblMitarbeiter.Text += " (Admin)" Button3.Visible = True + + End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("eAVISO", "AVISO") Then Button12.Visible = True Label22.Visible = True - Label22.Text = "XX" + initEAviso() End If If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("MESSENGER", "AVISO") Then picAVISOMessenger.Visible = True End If - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("FAKTURIERUNG", "SDL") Then btnFakturierung.Visible = True End If @@ -331,11 +339,11 @@ Public Class frmHauptfenster 'btnGenerelleGestellungen.Visible = False btnSpedBuch.Visible = False btnDienstplan.Visible = True - btnNeu.Enabled = False - SplitContainer2.Visible = False + 'btnNeu.Enabled = False + ' SplitContainer2.Visible = False btnDrucken.Visible = False 'SplitContainer2.Panel2Collapsed = True - splitMain.Panel2Collapsed = True + ' splitMain.Panel2Collapsed = True End If If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("KUNDEN", "AVISO") Then @@ -453,6 +461,12 @@ Public Class frmHauptfenster End Sub + Sub initEAviso() + Label22.Text = VERAGSQL.getValueTxtBySql("SELECT count(*) FROM [tblNCTS_TR] where ncts_AVISO_einarbeitet=0 AND ncts_Partnersystem='ATEZ'", "FMZOLL") '"XX" + If Label22.Text = "0" Then Label22.Text = "" + Label22.Visible = Label22.Text <> "" + Label22.BringToFront() + End Sub Public Sub setAktDetails(id, showSendungsdetails) Details_anzeigen(id) ', showSendungsdetails) End Sub @@ -1865,7 +1879,6 @@ Public Class frmHauptfenster sped.Show() Me.Cursor = Cursors.Default End If - End Sub Private Declare Function ShowWindow Lib "user32" _ @@ -1972,6 +1985,7 @@ Public Class frmHauptfenster If Not Grid_aktiv Then Exit Sub Details_aktiv = False + initEAviso() If Aviso_anzeigenBool Then Aviso_anzeigen("", False) ': meineAviso_anzeigen() @@ -2463,6 +2477,13 @@ Public Class frmHauptfenster End Function Private Sub Button3_Click_1(sender As Object, e As EventArgs) Handles Button3.Click + + Dim cRKSV_DE As New VERAG_PROG_ALLGEMEIN.cRKSV_DE + + cRKSV_DE.SignRKSV_DE() + + + Exit Sub 'Me.Cursor = Cursors.WaitCursor Dim firma = "" @@ -3041,7 +3062,9 @@ Public Class frmHauptfenster End Sub Private Sub BerechtigungenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BerechtigungenNeuLadenToolStripMenuItem.Click - VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER() + showMeNew() + 'VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_BER() + 'cADMIN.checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA) End Sub Private Sub LeereRechnungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LeereRechnungToolStripMenuItem.Click @@ -3303,60 +3326,60 @@ Public Class frmHauptfenster SDL.FormularManagerNEU.OPEN_FORM(SDL.FormularManagerArten.AT_Vollmacht_EV) End Sub - Private Sub TESTToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TESTToolStripMenuItem.Click - 'VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({"C:\Users\DEVELOPER1\Desktop\Reiter.pdf"}) - ' VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder("C:\Users\DEVELOPER1\Desktop\20191017092932604.pdf", 489919001, 1234) + 'Private Sub TESTToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TESTToolStripMenuItem.Click + ' 'VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({"C:\Users\DEVELOPER1\Desktop\Reiter.pdf"}) + ' ' VERAG_PROG_ALLGEMEIN.cTherefore.saveFileTo_ImportFolder("C:\Users\DEVELOPER1\Desktop\20191017092932604.pdf", 489919001, 1234) - TryPDF() - End Sub + ' TryPDF() + 'End Sub - Shared Sub TryPDF() - ' Spire.License.LicenseProvider.SetLicenseKey("0xMEMAEABRiC6jPC4G3HMNAremyuZ15w8z1KmLKr9LnNmK8HaKpB6Q2+qrwh1uG0h5ui52KoJSRMg1suH9cs+IW+GtPapLk/UMMWbBlil6FmO/3TvpVJeLs3UetAz3YYCThbpPViCAY/6vBZrGePq9jMpST0Ln3PgEAVK6Obm4NELOjk9GNUdQGXgdCQ7ry9QIXR5DPYOSi2gSkQ+WihEx9K1hS5bl6VYOmIeAg109mcPIzdlja8O8z8wvIrqBwdivQXCN88B0NzEoBr7EiKl3mQEIcm1W8B3ppWmYPeZt3xfkR9H+xdVVfRnK8AEEgfB+/YEA9K2hQZpTPhaz3cHq31hHqeS2/NgQxaTx0/QghmPaLnoxqR2v2dDRe2oOxfXqmeHTI5e9cl8nWcgYl2fRhaDSvYYOs7GeO8tmiOlgMCdg+JO3EMQByyQ+AACEKRuTB8TI7OIU9POPs6dWaEZyu3YuWSDk4rGnCmdpJ3gHCJ7Qy9qoBtv+psnJAe/ylQCbqdvejSAKKtUonSpolK2zhqFljWqsWclgxk4NdvOd4tphER9c7H5sr2cn/SZgCXRftpk+G6zT/JPcY7LH5OP4kgQR9pH3g7O67C0YPCE7+20gLsTNaPfv7/mGoIMzTbUoteJN5D9jTLipYtfh8eLaEsLWL1rJ+sqr+MQvoYDNeWq6oG8bjkTyFe2GQkOZlBZEmpmR7W2QliMC7uSfbuJe6XHpM3dgROIluQHJQDAKge+LlYOd+QU5QPsI754noJZttSNKthzPxI9rP/FN+otlvvG8nddbx8v+PZAJ6KovIvexH7lWITw/Xrak4wzzaXCoeC5wUM2M5Y/4PL8tbKM+qIrH0kMZPHAdGIM4wJ8PA1UoEqB9Hgml6ggzk69WA1zY88W0y03js/7a/tWgwa+sEK9YK+cJXy54FpsLRFqkpSA0mOcJa3ukST9wnCOzVdN+Z4K4mCUzR++VJPVNkAA+KxEHrOOWG5kaUwUAk0sVRB8j8pjB83InevzxZJGX0+F+agjZJHQpzPdF1blS9WQqrW9p80fco3YI63i9+K78Q5TIuSlHOlPTLvuC1dxglzD3WkLsxnBd9woA5zQLVMdfYTfGntOuAEiBYqyVIMo35J/ese8SxczTqKOCcxBdLYCtE4S23yik6gL1YifmvjboavpRl6BPEf9M8iLe2xLRiJ+63rXTnexITUUYsq2XqCOj2YDdDnQywjMfnQ74WRQfD1vrGu7xcCTDCDkfql8uF2f8w00kqCS9UgpnsEuw5FoElVrgPNLvOlDSgqLdHOG0yiL9wwzPxtUZBiq6vNxkEkc+w0ZaQr012bHQoDyR/uMKPoLgmANaCb7qnsWLeoo+IrhfjwpUW6dXnIo7ENAFS0U6kjwGMrWDJU2JaH3M+8Iz//HLDO3Yr3eWC+wtt/I3Ii48Ra6CgPYTOfeRL3L+NkEBYfCVdxpQ==") + 'Shared Sub TryPDF() + ' ' Spire.License.LicenseProvider.SetLicenseKey("0xMEMAEABRiC6jPC4G3HMNAremyuZ15w8z1KmLKr9LnNmK8HaKpB6Q2+qrwh1uG0h5ui52KoJSRMg1suH9cs+IW+GtPapLk/UMMWbBlil6FmO/3TvpVJeLs3UetAz3YYCThbpPViCAY/6vBZrGePq9jMpST0Ln3PgEAVK6Obm4NELOjk9GNUdQGXgdCQ7ry9QIXR5DPYOSi2gSkQ+WihEx9K1hS5bl6VYOmIeAg109mcPIzdlja8O8z8wvIrqBwdivQXCN88B0NzEoBr7EiKl3mQEIcm1W8B3ppWmYPeZt3xfkR9H+xdVVfRnK8AEEgfB+/YEA9K2hQZpTPhaz3cHq31hHqeS2/NgQxaTx0/QghmPaLnoxqR2v2dDRe2oOxfXqmeHTI5e9cl8nWcgYl2fRhaDSvYYOs7GeO8tmiOlgMCdg+JO3EMQByyQ+AACEKRuTB8TI7OIU9POPs6dWaEZyu3YuWSDk4rGnCmdpJ3gHCJ7Qy9qoBtv+psnJAe/ylQCbqdvejSAKKtUonSpolK2zhqFljWqsWclgxk4NdvOd4tphER9c7H5sr2cn/SZgCXRftpk+G6zT/JPcY7LH5OP4kgQR9pH3g7O67C0YPCE7+20gLsTNaPfv7/mGoIMzTbUoteJN5D9jTLipYtfh8eLaEsLWL1rJ+sqr+MQvoYDNeWq6oG8bjkTyFe2GQkOZlBZEmpmR7W2QliMC7uSfbuJe6XHpM3dgROIluQHJQDAKge+LlYOd+QU5QPsI754noJZttSNKthzPxI9rP/FN+otlvvG8nddbx8v+PZAJ6KovIvexH7lWITw/Xrak4wzzaXCoeC5wUM2M5Y/4PL8tbKM+qIrH0kMZPHAdGIM4wJ8PA1UoEqB9Hgml6ggzk69WA1zY88W0y03js/7a/tWgwa+sEK9YK+cJXy54FpsLRFqkpSA0mOcJa3ukST9wnCOzVdN+Z4K4mCUzR++VJPVNkAA+KxEHrOOWG5kaUwUAk0sVRB8j8pjB83InevzxZJGX0+F+agjZJHQpzPdF1blS9WQqrW9p80fco3YI63i9+K78Q5TIuSlHOlPTLvuC1dxglzD3WkLsxnBd9woA5zQLVMdfYTfGntOuAEiBYqyVIMo35J/ese8SxczTqKOCcxBdLYCtE4S23yik6gL1YifmvjboavpRl6BPEf9M8iLe2xLRiJ+63rXTnexITUUYsq2XqCOj2YDdDnQywjMfnQ74WRQfD1vrGu7xcCTDCDkfql8uF2f8w00kqCS9UgpnsEuw5FoElVrgPNLvOlDSgqLdHOG0yiL9wwzPxtUZBiq6vNxkEkc+w0ZaQr012bHQoDyR/uMKPoLgmANaCb7qnsWLeoo+IrhfjwpUW6dXnIo7ENAFS0U6kjwGMrWDJU2JaH3M+8Iz//HLDO3Yr3eWC+wtt/I3Ii48Ra6CgPYTOfeRL3L+NkEBYfCVdxpQ==") - Dim tmpFile = "C:\Users\DEVELOPER1\Desktop\Base\" & "27 AVN 83.pdf" - 'Test file: 16 AST 87 AVIS.PDF' - Dim oldPdf As New Spire.Pdf.PdfDocument() - oldPdf.LoadFromFile(tmpFile) - For i As Integer = 0 To oldPdf.Pages.Count - 1 - extractFirstPage(tmpFile, i) - Next i - End Sub + ' Dim tmpFile = "C:\Users\DEVELOPER1\Desktop\Base\" & "27 AVN 83.pdf" + ' 'Test file: 16 AST 87 AVIS.PDF' + ' Dim oldPdf As New Spire.Pdf.PdfDocument() + ' oldPdf.LoadFromFile(tmpFile) + ' For i As Integer = 0 To oldPdf.Pages.Count - 1 + ' extractFirstPage(tmpFile, i) + ' Next i + 'End Sub - Shared Sub extractFirstPage(ByRef TmpFile, i) - Dim oldPdf As New Spire.Pdf.PdfDocument() - oldPdf.LoadFromFile(TmpFile) + 'Shared Sub extractFirstPage(ByRef TmpFile, i) + ' Dim oldPdf As New Spire.Pdf.PdfDocument() + ' oldPdf.LoadFromFile(TmpFile) - Dim SplitPdf As New Spire.Pdf.PdfDocument() - Dim page1 As Spire.Pdf.PdfPageBase - page1 = SplitPdf.Pages.Add(oldPdf.Pages(0).Size, New Spire.Pdf.Graphics.PdfMargins(0)) - oldPdf.Pages(0).CreateTemplate().Draw(page1, New PointF(0, 0)) - Dim result As String = String.Format("C:\Users\DEVELOPER1\Desktop\Base\" & "output2\SplitOutput{0}.pdf", i) - SplitPdf.SaveToFile(result, Spire.Pdf.FileFormat.PDF) + ' Dim SplitPdf As New Spire.Pdf.PdfDocument() + ' Dim page1 As Spire.Pdf.PdfPageBase + ' page1 = SplitPdf.Pages.Add(oldPdf.Pages(0).Size, New Spire.Pdf.Graphics.PdfMargins(0)) + ' oldPdf.Pages(0).CreateTemplate().Draw(page1, New PointF(0, 0)) + ' Dim result As String = String.Format("C:\Users\DEVELOPER1\Desktop\Base\" & "output2\SplitOutput{0}.pdf", i) + ' SplitPdf.SaveToFile(result, Spire.Pdf.FileFormat.PDF) - Dim pdfNew As New Spire.Pdf.PdfDocument() - Dim page As Spire.Pdf.PdfPageBase + ' Dim pdfNew As New Spire.Pdf.PdfDocument() + ' Dim page As Spire.Pdf.PdfPageBase - For j As Integer = 1 To oldPdf.Pages.Count - 1 - Dim pageOLD As Spire.Pdf.PdfPageBase = oldPdf.Pages(j) - If pageOLD.Rotation = Spire.Pdf.PdfPageRotateAngle.RotateAngle90 Then - page = pdfNew.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Spire.Pdf.Graphics.PdfMargins(0)) - ElseIf pageOLD.Rotation = Spire.Pdf.PdfPageRotateAngle.RotateAngle270 Then - page = pdfNew.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Spire.Pdf.Graphics.PdfMargins(0)) - Else - page = pdfNew.Pages.Add(pageOLD.Size, New Spire.Pdf.Graphics.PdfMargins(0)) - End If - oldPdf.Pages(j).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0)) + ' For j As Integer = 1 To oldPdf.Pages.Count - 1 + ' Dim pageOLD As Spire.Pdf.PdfPageBase = oldPdf.Pages(j) + ' If pageOLD.Rotation = Spire.Pdf.PdfPageRotateAngle.RotateAngle90 Then + ' page = pdfNew.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Spire.Pdf.Graphics.PdfMargins(0)) + ' ElseIf pageOLD.Rotation = Spire.Pdf.PdfPageRotateAngle.RotateAngle270 Then + ' page = pdfNew.Pages.Add(New SizeF(pageOLD.Size.Height, pageOLD.Size.Width), New Spire.Pdf.Graphics.PdfMargins(0)) + ' Else + ' page = pdfNew.Pages.Add(pageOLD.Size, New Spire.Pdf.Graphics.PdfMargins(0)) + ' End If + ' oldPdf.Pages(j).CreateTemplate().Draw(page, New System.Drawing.PointF(0, 0)) - Next + ' Next - pdfNew.SaveToFile("C:\Users\DEVELOPER1\Desktop\Base\PFDtmp" & i & ".pdf") + ' pdfNew.SaveToFile("C:\Users\DEVELOPER1\Desktop\Base\PFDtmp" & i & ".pdf") - pdfNew.Dispose() - System.IO.File.Delete(TmpFile) - TmpFile = "C:\Users\DEVELOPER1\Desktop\Base\PFDtmp" & i & ".pdf" + ' pdfNew.Dispose() + ' System.IO.File.Delete(TmpFile) + ' TmpFile = "C:\Users\DEVELOPER1\Desktop\Base\PFDtmp" & i & ".pdf" - End Sub + 'End Sub Private Sub cboTeams_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboTeams.SelectedIndexChanged If Grid_aktiv Then @@ -3485,7 +3508,31 @@ Public Class frmHauptfenster Me.Cursor = Cursors.Default End Sub + Private Sub FRONTOFFICEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FRONTOFFICEToolStripMenuItem.Click + If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "FRONTOFFICE")) Then + showMeNew() + Else + MsgBox("Keine Berechtigung!") + End If + End Sub + Private Sub VERIMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERIMEXToolStripMenuItem.Click + If CBool((New cADMIN).checkLogin(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_username, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_pwd, "VERIMEX")) Then + showMeNew() + Else + MsgBox("Keine Berechtigung!") + End If + End Sub + + Private Sub SUBToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SUBToolStripMenuItem.Click, SBGToolStripMenuItem.Click, WAIToolStripMenuItem.Click, NKDToolStripMenuItem.Click, NEUToolStripMenuItem.Click, AMBToolStripMenuItem.Click + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("STANDORT_WECHSELN", "AVISO") Then + VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = sender.text + VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung = sender.text 'Nochmal, sonst wird es durch MA geändert + showMeNew() + Else + MsgBox("Keine Berechtigung!") + End If + End Sub End Class Public Class AvisoStatusFunctions @@ -3592,6 +3639,21 @@ Public Class AvisoStatusFunctions SendAnkunftEmail(Aviso) End If + + 'Ticket Drucken, wenn parameter + If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("TICKET_ANKUNFT") Then + Dim rpt As New rptQRAviso(Aviso) + Dim printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True) + If printer <> "" Then + SDL.cProgramFunctions.printRpt(rpt, printer, True) + Else + SDL.cProgramFunctions.showRpt(rpt, "AVISO", False) + End If + + End If + + + 'Wenn Atilla, dann Eintrag anzeigen, um zu korrigieren und Aktendeckel auszudrucken If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then 'And VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True Then Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm() @@ -3808,10 +3870,10 @@ Public Class AvisoStatusFunctions End Function Public Function setVorbereitet(AvisoID) As Boolean - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then - MsgBox("Keine Berechtigung!") - Return False - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Return False + 'End If 'falls keine Auswahl bzw. kein Datensatz, dann nichts machen If AvisoID <= 0 Then @@ -4037,21 +4099,35 @@ Public Class AvisoStatusFunctions Next End If - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "VERAG", "ATILLA" + vermerkVorgeschreiben(AvisoID) + 'Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + ' Case "VERAG", "ATILLA" - Dim frmInsertVermerkFach As New frmInsertVermerkFach(Aviso.AvisoID) - frmInsertVermerkFach.ShowDialog() + ' Dim frmInsertVermerkFach As New frmInsertVermerkFach(Aviso.AvisoID) + ' frmInsertVermerkFach.ShowDialog() - 'Case "IMEX" - ' Dim frmInsertVermerkFach As New frmInsertVermerkFachIMEX(Aviso.AvisoID) - ' frmInsertVermerkFach.ShowDialog() - End Select + ' 'Case "IMEX" + ' ' Dim frmInsertVermerkFach As New frmInsertVermerkFachIMEX(Aviso.AvisoID) + ' ' frmInsertVermerkFach.ShowDialog() + 'End Select Return (tmpid > 0) End Function + + Sub vermerkVorgeschreiben(AvisoID) + Dim VermerkeDAL As New cVermerkeDAL + Dim myVermerk As New cVermerk + myVermerk.AvisoID = AvisoID + myVermerk.Datum = Now + myVermerk.Mitarbeiter = cGlobal.AktiverMitarbeiter.Mitarbeiter : myVermerk.MitarbeiterId = cGlobal.AktiverMitarbeiter.MitarbeiterID + myVermerk.Hinweis_Vermerk = "Akt vorgeschrieben" : myVermerk.VermerkCodeId = 35 + VermerkeDAL.SpeichernVermerk(myVermerk) + + End Sub + + Public Function setErfasst(AvisoID) As Boolean If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then MsgBox("Keine Berechtigung!") @@ -4555,10 +4631,10 @@ Public Class AvisoStatusFunctions End Sub Public Function AktUebernehmen(AvisoID, Optional askSendungenUebernehmen = False, Optional checkStatus = True, Optional nurLeereSendungenUebernehmen = False) As Boolean - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then - MsgBox("Keine Berechtigung!") - Return False - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Return False + 'End If 'falls keine Auswahl bzw. kein Datensatz, dann nichts machen If AvisoID <= 0 Then @@ -4685,10 +4761,10 @@ Public Class AvisoStatusFunctions Public Function AktUebernehmen_Zuruecksetzen(AvisoID) As Boolean Try - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then - MsgBox("Keine Berechtigung!") - Return False - End If + 'If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("VERIMEX", "AVISO") Then + ' MsgBox("Keine Berechtigung!") + ' Return False + 'End If 'falls keine Auswahl bzw. kein Datensatz, dann nichts machen If AvisoID <= 0 Then @@ -4700,7 +4776,7 @@ Public Class AvisoStatusFunctions Dim Aviso As New cAviso Aviso = AvisoDAL.LesenAviso(AvisoID, "") If Aviso Is Nothing Then Return False - If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereichts abgeschlossen.", vbInformation) : Return False + If Aviso.Abgeschlossen Then MsgBox("Der Akt wurde bereits abgeschlossen.", vbInformation) : Return False @@ -5445,7 +5521,7 @@ Public Class AvisoStatusFunctions End Sub - Shared Sub insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "") + Shared Sub insertSendungsVermerk(SendungID As Integer, AvisoID As Integer, Text As String, VermerkCodeId As Integer, Optional Beschreibung As String = "", Optional VorauskasseId As Object = Nothing) 'Daten zuweisen und speichern Dim myVermerk As New cVermerk myVermerk.VermerkID = 0 @@ -5456,6 +5532,7 @@ Public Class AvisoStatusFunctions myVermerk.Hinweis_Vermerk = Text myVermerk.VermerkCodeId = VermerkCodeId myVermerk.SendungID = SendungID + If VorauskasseId IsNot Nothing AndAlso VorauskasseId IsNot DBNull.Value Then myVermerk.VorauskasseId = VorauskasseId myVermerk.VermerkArt = "S" Dim VermerkeDAL As New cVermerkeDAL diff --git a/Aviso/frmLogin.designer.vb b/Aviso/frmLogin.designer.vb index 03e5e03..a740bcc 100644 --- a/Aviso/frmLogin.designer.vb +++ b/Aviso/frmLogin.designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmLogin Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmLogin 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLogin)) @@ -29,8 +29,8 @@ Partial Class frmLogin Me.btnOK = New System.Windows.Forms.Button() Me.txtSachbear = New System.Windows.Forms.TextBox() Me.Panel1 = New System.Windows.Forms.Panel() - Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.lblTESTSYSTEM = New System.Windows.Forms.Label() + Me.FlatButton1 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Panel2 = New System.Windows.Forms.Panel() Me.FlatButton2 = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -38,6 +38,10 @@ Partial Class frmLogin Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ATILLAToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.IMEXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FRONTOFFICEToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UNISPEDToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AMBARToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.VERIMEXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TESTSYSTEMToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PRODUKTIVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TESTSYSTEMToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() @@ -75,7 +79,7 @@ Partial Class frmLogin 'txtKennwort ' Me.txtKennwort.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtKennwort.Location = New System.Drawing.Point(112, 111) + Me.txtKennwort.Location = New System.Drawing.Point(108, 111) Me.txtKennwort.MaxLength = 20 Me.txtKennwort.Name = "txtKennwort" Me.txtKennwort.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42) @@ -86,7 +90,7 @@ Partial Class frmLogin ' Me.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btnOK.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.btnOK.Location = New System.Drawing.Point(112, 148) + Me.btnOK.Location = New System.Drawing.Point(108, 148) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(100, 29) Me.btnOK.TabIndex = 7 @@ -96,7 +100,7 @@ Partial Class frmLogin 'txtSachbear ' Me.txtSachbear.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSachbear.Location = New System.Drawing.Point(112, 81) + Me.txtSachbear.Location = New System.Drawing.Point(108, 81) Me.txtSachbear.MaxLength = 20 Me.txtSachbear.Name = "txtSachbear" Me.txtSachbear.Size = New System.Drawing.Size(100, 20) @@ -119,35 +123,36 @@ Partial Class frmLogin Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(306, 218) + Me.Panel1.Size = New System.Drawing.Size(306, 222) Me.Panel1.TabIndex = 0 ' - 'FlatButton1 - ' - Me.FlatButton1.allowBorder = False - Me.FlatButton1.Cursor = System.Windows.Forms.Cursors.Hand - Me.FlatButton1.FlatAppearance.BorderSize = 0 - Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.FlatButton1.ForeColor = System.Drawing.Color.Black - Me.FlatButton1.Image = CType(resources.GetObject("FlatButton1.Image"), System.Drawing.Image) - Me.FlatButton1.Location = New System.Drawing.Point(267, -1) - Me.FlatButton1.Name = "FlatButton1" - Me.FlatButton1.Size = New System.Drawing.Size(38, 35) - Me.FlatButton1.TabIndex = 0 - Me.FlatButton1.UseVisualStyleBackColor = True - ' 'lblTESTSYSTEM ' Me.lblTESTSYSTEM.AutoSize = True Me.lblTESTSYSTEM.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblTESTSYSTEM.ForeColor = System.Drawing.Color.Red - Me.lblTESTSYSTEM.Location = New System.Drawing.Point(87, 58) + Me.lblTESTSYSTEM.Location = New System.Drawing.Point(83, 58) Me.lblTESTSYSTEM.Name = "lblTESTSYSTEM" Me.lblTESTSYSTEM.Size = New System.Drawing.Size(145, 20) Me.lblTESTSYSTEM.TabIndex = 1 Me.lblTESTSYSTEM.Text = "! TESTSYSTEM !" Me.lblTESTSYSTEM.Visible = False ' + 'FlatButton1 + ' + Me.FlatButton1.allowBorder = False + Me.FlatButton1.BackgroundImage = Global.AVISO.My.Resources.Resources.del + Me.FlatButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.FlatButton1.Cursor = System.Windows.Forms.Cursors.Hand + Me.FlatButton1.FlatAppearance.BorderSize = 0 + Me.FlatButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.FlatButton1.ForeColor = System.Drawing.Color.Black + Me.FlatButton1.Location = New System.Drawing.Point(273, 4) + Me.FlatButton1.Name = "FlatButton1" + Me.FlatButton1.Size = New System.Drawing.Size(32, 19) + Me.FlatButton1.TabIndex = 0 + Me.FlatButton1.UseVisualStyleBackColor = True + ' 'Panel2 ' Me.Panel2.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -155,7 +160,7 @@ Partial Class frmLogin Me.Panel2.Controls.Add(Me.lblVersion) Me.Panel2.Controls.Add(Me.Label3) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel2.Location = New System.Drawing.Point(0, 194) + Me.Panel2.Location = New System.Drawing.Point(0, 198) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(304, 22) Me.Panel2.TabIndex = 8 @@ -184,7 +189,7 @@ Partial Class frmLogin ' 'ToolStripMenuItem2 ' - Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem}) + Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.VERAGToolStripMenuItem, Me.ATILLAToolStripMenuItem, Me.IMEXToolStripMenuItem, Me.FRONTOFFICEToolStripMenuItem, Me.UNISPEDToolStripMenuItem, Me.AMBARToolStripMenuItem, Me.VERIMEXToolStripMenuItem}) Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" Me.ToolStripMenuItem2.Size = New System.Drawing.Size(143, 22) Me.ToolStripMenuItem2.Text = "FIRMA" @@ -192,27 +197,52 @@ Partial Class frmLogin 'VERAGToolStripMenuItem ' Me.VERAGToolStripMenuItem.Name = "VERAGToolStripMenuItem" - Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(111, 22) + Me.VERAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.VERAGToolStripMenuItem.Text = "VERAG" ' 'ATILLAToolStripMenuItem ' Me.ATILLAToolStripMenuItem.Name = "ATILLAToolStripMenuItem" - Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(111, 22) + Me.ATILLAToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATILLAToolStripMenuItem.Text = "ATILLA" ' 'IMEXToolStripMenuItem ' Me.IMEXToolStripMenuItem.Name = "IMEXToolStripMenuItem" - Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(111, 22) + Me.IMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.IMEXToolStripMenuItem.Text = "IMEX" ' + 'FRONTOFFICEToolStripMenuItem + ' + Me.FRONTOFFICEToolStripMenuItem.Name = "FRONTOFFICEToolStripMenuItem" + Me.FRONTOFFICEToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.FRONTOFFICEToolStripMenuItem.Text = "FRONT-OFFICE" + ' + 'UNISPEDToolStripMenuItem + ' + Me.UNISPEDToolStripMenuItem.Name = "UNISPEDToolStripMenuItem" + Me.UNISPEDToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UNISPEDToolStripMenuItem.Text = "UNISPED" + ' + 'AMBARToolStripMenuItem + ' + Me.AMBARToolStripMenuItem.Name = "AMBARToolStripMenuItem" + Me.AMBARToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.AMBARToolStripMenuItem.Text = "AMBAR" + ' + 'VERIMEXToolStripMenuItem + ' + Me.VERIMEXToolStripMenuItem.Name = "VERIMEXToolStripMenuItem" + Me.VERIMEXToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VERIMEXToolStripMenuItem.Text = "VERIMEX" + ' 'TESTSYSTEMToolStripMenuItem ' Me.TESTSYSTEMToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PRODUKTIVToolStripMenuItem, Me.TESTSYSTEMToolStripMenuItem1}) Me.TESTSYSTEMToolStripMenuItem.Name = "TESTSYSTEMToolStripMenuItem" Me.TESTSYSTEMToolStripMenuItem.Size = New System.Drawing.Size(143, 22) Me.TESTSYSTEMToolStripMenuItem.Text = "TESTSYSTEM" + Me.TESTSYSTEMToolStripMenuItem.Visible = False ' 'PRODUKTIVToolStripMenuItem ' @@ -257,7 +287,7 @@ Partial Class frmLogin ' Me.lblAlertTxt.AutoSize = True Me.lblAlertTxt.ForeColor = System.Drawing.Color.Red - Me.lblAlertTxt.Location = New System.Drawing.Point(72, 132) + Me.lblAlertTxt.Location = New System.Drawing.Point(68, 132) Me.lblAlertTxt.Name = "lblAlertTxt" Me.lblAlertTxt.Size = New System.Drawing.Size(192, 13) Me.lblAlertTxt.TabIndex = 6 @@ -268,7 +298,7 @@ Partial Class frmLogin ' Me.Label5.AutoSize = True Me.Label5.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label5.Location = New System.Drawing.Point(54, 84) + Me.Label5.Location = New System.Drawing.Point(50, 84) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(52, 13) Me.Label5.TabIndex = 2 @@ -278,7 +308,7 @@ Partial Class frmLogin ' Me.Label6.AutoSize = True Me.Label6.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Label6.Location = New System.Drawing.Point(54, 114) + Me.Label6.Location = New System.Drawing.Point(50, 114) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(53, 13) Me.Label6.TabIndex = 4 @@ -314,7 +344,7 @@ Partial Class frmLogin Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.ClientSize = New System.Drawing.Size(306, 218) + Me.ClientSize = New System.Drawing.Size(306, 222) Me.Controls.Add(Me.Panel1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.KeyPreview = True @@ -362,4 +392,8 @@ Partial Class frmLogin Friend WithEvents TESTSYSTEMToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem Friend WithEvents UpdateToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem Friend WithEvents IMEXToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents FRONTOFFICEToolStripMenuItem As ToolStripMenuItem + Friend WithEvents UNISPEDToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AMBARToolStripMenuItem As ToolStripMenuItem + Friend WithEvents VERIMEXToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmLogin.resx b/Aviso/frmLogin.resx index d181468..fc24504 100644 --- a/Aviso/frmLogin.resx +++ b/Aviso/frmLogin.resx @@ -117,24 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHaSURBVEhLvdW7SlhBFIVh701EGyGKpEjAywv4Aham - iIXaio1dELXwFVRs7ARBQbHSwi5lijTBWhAvfSKExJBKEEWP/8iM7JmzziWKFh/k7Fl7FhgZG7Ise1Vy - 6JwPvG9S8+eSQ4fCTrxVZ88hhxQNYgvHdUvJNfq9bXUe5AYs9OEbMq9WKZkmbPidHZVxog+Cb7COa79Y - q5SzHizjD8KOLI0+CJ2ZhZQsZdaLXZ9J5UqjDwLhR1IkV8r3Ii79ufLF5h//ERBYSRZSD6VwvyB7uIXK - OXe4sPdHZQGhOqVryUz5iwl7d1RkEawqdZepefADs+iw90YlKcJVpUVO8VHdmRukWHxK6Qwa1X25gcLy - vrmszFd8QuE7LIcpLljwF1aZV/uWHAZc0I9N/PMXVvmJ0mdQDh0W2+DK1MVlSp9BOWShC0uwb+P/KCzN - DQi+g3tB1EXWoZhZsjT6cAit4sovlZlGnRep294flTnJgnKEKbT7fFXpub0/KnMITCYL1m+MiZ2iUvd3 - 9cBmo8WA0LhZCn5hDtHbaHZU6QmGbC5asgjaUvd/MaJyFplQegP36gyjxWaihRThUPpZnStkXel3fFDn - uUGKxTG0qrMi5EfRrM5yg5cmhy8na7gHtvbLF9T64qAAAAAASUVORK5CYII= - - 595, 17 + iVBORw0KGgoAAAANSUhEUgAACToAAAGSCAYAAADJzuyaAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m diff --git a/Aviso/frmLogin.vb b/Aviso/frmLogin.vb index d28a4a5..a58eab6 100644 --- a/Aviso/frmLogin.vb +++ b/Aviso/frmLogin.vb @@ -30,19 +30,22 @@ Public Class frmLogin txtSachbear.Text = "ADMIN" txtKennwort.Text = "verag#2" End If + e.Handled = True End If If e.Modifiers = Keys.Control And e.KeyCode = Keys.A Then Panel2.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor lblVersion.ForeColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor Label3.ForeColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_ForeColor + Select Case firma Case "VERAG" : firma = "ATILLA" Case "ATILLA" : firma = "IMEX" Case "IMEX" : firma = "UNISPED" Case "UNISPED" : firma = "AMBAR" Case "AMBAR" : firma = "FRONTOFFICE" - Case "FRONTOFFICE" : firma = "VERAG" + Case "FRONTOFFICE" : firma = "VERIMEX" + Case "VERIMEX" : firma = "VERAG" End Select ' firma = If(firma = "VERAG", "ATILLA", If(firma = "ATILLA", "IMEX", "VERAG")) @@ -51,6 +54,7 @@ Public Class frmLogin txtSachbear.Text = "ADMIN" txtKennwort.Text = "verag#2" End If + e.Handled = True End If End Sub @@ -66,7 +70,6 @@ Public Class frmLogin VERAG_PROG_ALLGEMEIN.cAllgemein.PROGNAME = "AVISO_NEW" VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID = 16 VERAG_PROG_ALLGEMEIN.cAllgemein.PROGVERSION = Application.ProductVersion - If File.Exists(pfadDatei) Then Dim fs As New FileStream(pfadDatei, FileMode.Open, FileAccess.Read) Dim strmReader As New StreamReader(fs) @@ -180,7 +183,10 @@ Public Class frmLogin picLogin.Image = My.Resources.ambar_simple Case "FRONTOFFICE" picLogin.Size = New Size(picLogin.Width, 71) - picLogin.Image = My.Resources.frontofficesub + picLogin.Image = My.Resources.FrontOfficeSUB + Case "VERIMEX" + picLogin.Size = New Size(picLogin.Width, 71) + picLogin.Image = My.Resources.verimex End Select 'DEV FMZOLL @@ -377,6 +383,11 @@ Public Class frmLogin txtKennwort.Text = "verag#2" ' If MsgBox("AUTO-LOGIN?", vbYesNoCancel) = vbYes Then btnOK.PerformClick() End If + + + ' Spire.License.LicenseProvider.SetLicenseKey("PFIX3V0pG5DaAQCBLK1gLRCjwhu+wX1JsEcX0hyXZty9sbe8Zm5XIrWr214umg/g22Jy0+5BJQ6QgRhLl0eUqVMyCAHswvrA+jVz8s20VTNEOTWhzwpLBqoRG6IFh3EGNawUS7a+fW5OVPLApUd3Y+IcKYZihow7+5lKPN6+seKWy5uFjwRFNSBOTAjUGsfEw9sukXvtcnLh2Vo5ttKbPSLb1EeCdgaNd8nWa+RKQk0Rlg4R/7M9BBTURZXCVAoA4kfbNyPnksggPvYPbpVqPqtT9LbjycBLSB/Uwf16fZlVDuDrCJCij2ZI3ebSwM1sumBtXj4WhXk+Mwxj7acdb9saqmOsmyAcd11MZ2NfRAhv2L8S7RLSGr4OYR9/9Fnk9aN9q7T8D51jUfJgV82ZIZMvCpI2RTtsRaOyMandpfpFE96k1kjlVRuWm8JGKUHZV0bETyaBTqpiwn4ShoqdlYlyvIjfjWX/TbWCuy2uSugCC9BLW0P0ND/G2z2kbHQCEiQCRn92TrlvTpQg9veACDn1Lb3savBYyW3VQMuHgybLpq3x9LIV5nrTli87kzqvTuZmUZanhgx0M4BFi2CsWlf28yRpQo2l1HDLjScgzxvXOk3/N9wOlS2gbfeN74iHU0vb1heHfa5ahmRwtgg7C6iYu0WD1u5p/hO3Ja5tkNBxicJO5TJXq3W5U65lCsQDOQbiZCeTJzjYP0SGypIo701hqqVG9hW/Sd2siqb4w/W1H9xKTxDCL+EwCHduLZuNze1gyyxKR5nGCsIhaXBaRCaQ8Z1OHlU25h+yeHwFF1yMKzdbX6VKG+5GjZ3yvSjwqGgFfDPLVr2QxJpLqpAwcdmG7w6xwVoOP81C8Sv60U2UaDLw7I0U1GfMhkqOr0tRtFQRa2iDgPnrZWhiNPPjDYtPyHt5ZwdIoAKaNRpI1f+u6rDJRmyAr4jizBRxHIlsSM86MXRbEvBLkDEyDQPLC3ntaPi5kRn7vObrlDGR7aZEKy+8PkU8qrVw7wgqxQtbc+isO8x6yoe/yTydhFiY1HlUbjPlAM9s+SSV4D2L9oHmYCtO1wdo3Gl0Dj6Mp3hioi9Cyd4+bp/A28ukhQXjtNUhUhNgzcyfP/Fg1at6lj0NPYWvOibJr0I/Fi38AeBM+kXNnuMblXnlawtTjnjGvi/fA9tHz6EI44ChhIrd8a3Kjx2bGcFlVENXe3YDu1W5ZbDOcoERW8qxZLBKqYIMiwQ61ZAq69PXKSZZk+1mi8oyCNS9xpBZndWLKTKG6XqM1FkZew1bTD4GLZRdC4x72iqSmVIu3ZU8rSk7rxGQUNWKIi7gIJhXEnmeWt322KDCxBWDZcrxKKGc8ZIDRL3EmW13/7ow4WowlCUW+lvhlkbwsXDPwqtO+IQJ3UisJFnF2jnFqaLoKELNJx6hfg2iyYR2+gJgiKWLKOzS56Id7o3iY4ou1TZauqSK9A836t36UxXtjYWSk9aoDDhZwlqRbwXok9pds5dC") + + End Sub @@ -515,4 +526,25 @@ Public Class frmLogin Private Sub Panel1_Paint(sender As Object, e As PaintEventArgs) Handles Panel1.Paint End Sub + + Private Sub FRONTOFFICEToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FRONTOFFICEToolStripMenuItem.Click + firma = "FRONTOFFICE" + initstart() + End Sub + + Private Sub UNISPEDToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles UNISPEDToolStripMenuItem.Click + firma = "UNISPED" + initstart() + End Sub + + Private Sub AMBARToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AMBARToolStripMenuItem.Click + firma = "AMBAR" + initstart() + End Sub + + Private Sub VERIMEXToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERIMEXToolStripMenuItem.Click + firma = "VERIMEX" + initstart() + End Sub + End Class \ No newline at end of file diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 5010605..93bb6e5 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -64,6 +64,10 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem11 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem18 = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem12 = New System.Windows.Forms.ToolStripMenuItem() Me.TabPage1 = New System.Windows.Forms.TabPage() Me.pnlKundenZolltarif = New System.Windows.Forms.Panel() @@ -297,10 +301,10 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip2 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem14 = New System.Windows.Forms.ToolStripMenuItem() Me.NurÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem18 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() + Me.picKdAtrNr_Avisierer = New System.Windows.Forms.PictureBox() + Me.picKdAtrNr_Auftraggeber = New System.Windows.Forms.PictureBox() + Me.picKdAtrNr_Empfänger = New System.Windows.Forms.PictureBox() + Me.picKdAtrNr_Fraechter = New System.Windows.Forms.PictureBox() Me.cntlFrachtfuehrer_Sonst = New AVISO.usrcntlCheckBox() Me.cntlAbsender_Sonst = New AVISO.usrcntlCheckBox() Me.cntlEmpfaenger_Sonst = New AVISO.usrcntlCheckBox() @@ -377,6 +381,10 @@ Partial Class frmSendungsdetailsNEU Me.ctxtWeitereFormulare.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.ContextMenuStrip2.SuspendLayout() + CType(Me.picKdAtrNr_Avisierer, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picKdAtrNr_Auftraggeber, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picKdAtrNr_Empfänger, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picKdAtrNr_Fraechter, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -718,7 +726,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem8.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem8.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem8.Name = "ToolStripMenuItem8" - Me.ToolStripMenuItem8.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem8.Size = New System.Drawing.Size(94, 22) Me.ToolStripMenuItem8.Text = "T1" ' 'ToolStripMenuItem9 @@ -726,7 +734,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem9.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem9.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem9.Name = "ToolStripMenuItem9" - Me.ToolStripMenuItem9.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem9.Size = New System.Drawing.Size(94, 22) Me.ToolStripMenuItem9.Text = "T2" ' 'ToolStripMenuItem10 @@ -734,7 +742,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem10.Enabled = False Me.ToolStripMenuItem10.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(180, 22) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(94, 22) Me.ToolStripMenuItem10.Text = "Ü-T" Me.ToolStripMenuItem10.Visible = False ' @@ -759,6 +767,41 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem11.Text = " AES" Me.ToolStripMenuItem11.ToolTipText = "Neue Zollanmeldung" ' + 'ToolStripMenuItem17 + ' + Me.ToolStripMenuItem17.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem20, Me.ToolStripMenuItem18, Me.ToolStripMenuItem19}) + Me.ToolStripMenuItem17.Image = Global.AVISO.My.Resources.Resources.plus + Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" + Me.ToolStripMenuItem17.Padding = New System.Windows.Forms.Padding(8, 0, 8, 0) + Me.ToolStripMenuItem17.Size = New System.Drawing.Size(97, 20) + Me.ToolStripMenuItem17.Text = " TELOTEC" + Me.ToolStripMenuItem17.ToolTipText = "Neue Zollanmeldung" + ' + 'ToolStripMenuItem20 + ' + Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus + Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem20.Text = "EZA" + ' + 'ToolStripMenuItem18 + ' + Me.ToolStripMenuItem18.Enabled = False + Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus + Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem18.Text = "T1" + ' + 'ToolStripMenuItem19 + ' + Me.ToolStripMenuItem19.Enabled = False + Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) + Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus + Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(95, 22) + Me.ToolStripMenuItem19.Text = "T2" + ' 'ToolStripMenuItem12 ' Me.ToolStripMenuItem12.Image = Global.AVISO.My.Resources.Resources.android_note @@ -1736,6 +1779,10 @@ Partial Class frmSendungsdetailsNEU Me.Panel6.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) + Me.Panel6.Controls.Add(Me.picKdAtrNr_Fraechter) + Me.Panel6.Controls.Add(Me.picKdAtrNr_Empfänger) + Me.Panel6.Controls.Add(Me.picKdAtrNr_Auftraggeber) + Me.Panel6.Controls.Add(Me.picKdAtrNr_Avisierer) Me.Panel6.Controls.Add(Me.pnlEAviso) Me.Panel6.Controls.Add(Me.txtDyRef) Me.Panel6.Controls.Add(Me.picDy) @@ -2078,9 +2125,9 @@ Partial Class frmSendungsdetailsNEU Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!) Me.Label21.Location = New System.Drawing.Point(407, 3) Me.Label21.Name = "Label21" - Me.Label21.Size = New System.Drawing.Size(81, 13) + Me.Label21.Size = New System.Drawing.Size(78, 13) Me.Label21.TabIndex = 2 - Me.Label21.Text = "Kd.-AuftragsNr.:" + Me.Label21.Text = "Kd-AuftragsNr.:" ' 'FlatButton4 ' @@ -2288,6 +2335,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAvisierer.searchActive = True Me.txtAvisierer.Size = New System.Drawing.Size(245, 20) Me.txtAvisierer.TabIndex = 13 + Me.txtAvisierer.TIMER_SEARCH = True Me.txtAvisierer.usrcntl = Nothing ' 'txtAuftraggeber @@ -2316,6 +2364,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAuftraggeber.searchActive = True Me.txtAuftraggeber.Size = New System.Drawing.Size(245, 20) Me.txtAuftraggeber.TabIndex = 27 + Me.txtAuftraggeber.TIMER_SEARCH = True Me.txtAuftraggeber.usrcntl = Nothing ' 'Panel13 @@ -2481,6 +2530,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFrachtfuehrer.searchActive = True Me.txtFrachtfuehrer.Size = New System.Drawing.Size(245, 20) Me.txtFrachtfuehrer.TabIndex = 71 + Me.txtFrachtfuehrer.TIMER_SEARCH = True Me.txtFrachtfuehrer.usrcntl = Nothing ' 'Label40 @@ -2628,6 +2678,7 @@ Partial Class frmSendungsdetailsNEU Me.txtAbsender.searchActive = True Me.txtAbsender.Size = New System.Drawing.Size(245, 20) Me.txtAbsender.TabIndex = 59 + Me.txtAbsender.TIMER_SEARCH = True Me.txtAbsender.usrcntl = Nothing ' 'txtEmpfaenger @@ -2655,6 +2706,7 @@ Partial Class frmSendungsdetailsNEU Me.txtEmpfaenger.searchActive = True Me.txtEmpfaenger.Size = New System.Drawing.Size(245, 20) Me.txtEmpfaenger.TabIndex = 43 + Me.txtEmpfaenger.TIMER_SEARCH = True Me.txtEmpfaenger.usrcntl = Nothing ' 'Label28 @@ -3132,6 +3184,7 @@ Partial Class frmSendungsdetailsNEU Me.txtFremdEmpf.searchActive = True Me.txtFremdEmpf.Size = New System.Drawing.Size(175, 26) Me.txtFremdEmpf.TabIndex = 3 + Me.txtFremdEmpf.TIMER_SEARCH = True Me.txtFremdEmpf.usrcntl = Nothing ' 'Label11 @@ -3852,40 +3905,49 @@ Partial Class frmSendungsdetailsNEU Me.NurÖffnenToolStripMenuItem.Size = New System.Drawing.Size(247, 22) Me.NurÖffnenToolStripMenuItem.Text = "nur öffnen" ' - 'ToolStripMenuItem17 + 'picKdAtrNr_Avisierer ' - Me.ToolStripMenuItem17.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem20, Me.ToolStripMenuItem18, Me.ToolStripMenuItem19}) - Me.ToolStripMenuItem17.Image = Global.AVISO.My.Resources.Resources.plus - Me.ToolStripMenuItem17.Name = "ToolStripMenuItem17" - Me.ToolStripMenuItem17.Padding = New System.Windows.Forms.Padding(8, 0, 8, 0) - Me.ToolStripMenuItem17.Size = New System.Drawing.Size(97, 20) - Me.ToolStripMenuItem17.Text = " TELOTEC" - Me.ToolStripMenuItem17.ToolTipText = "Neue Zollanmeldung" + Me.picKdAtrNr_Avisierer.BackgroundImage = Global.AVISO.My.Resources.Resources.info + Me.picKdAtrNr_Avisierer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picKdAtrNr_Avisierer.Location = New System.Drawing.Point(483, 9) + Me.picKdAtrNr_Avisierer.Name = "picKdAtrNr_Avisierer" + Me.picKdAtrNr_Avisierer.Size = New System.Drawing.Size(17, 12) + Me.picKdAtrNr_Avisierer.TabIndex = 91 + Me.picKdAtrNr_Avisierer.TabStop = False + Me.picKdAtrNr_Avisierer.Visible = False ' - 'ToolStripMenuItem18 + 'picKdAtrNr_Auftraggeber ' - Me.ToolStripMenuItem18.Enabled = False - Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus - Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(180, 22) - Me.ToolStripMenuItem18.Text = "T1" + Me.picKdAtrNr_Auftraggeber.BackgroundImage = Global.AVISO.My.Resources.Resources.info + Me.picKdAtrNr_Auftraggeber.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picKdAtrNr_Auftraggeber.Location = New System.Drawing.Point(483, 46) + Me.picKdAtrNr_Auftraggeber.Name = "picKdAtrNr_Auftraggeber" + Me.picKdAtrNr_Auftraggeber.Size = New System.Drawing.Size(17, 12) + Me.picKdAtrNr_Auftraggeber.TabIndex = 92 + Me.picKdAtrNr_Auftraggeber.TabStop = False + Me.picKdAtrNr_Auftraggeber.Visible = False ' - 'ToolStripMenuItem19 + 'picKdAtrNr_Empfänger ' - Me.ToolStripMenuItem19.Enabled = False - Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus - Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(180, 22) - Me.ToolStripMenuItem19.Text = "T2" + Me.picKdAtrNr_Empfänger.BackgroundImage = Global.AVISO.My.Resources.Resources.info + Me.picKdAtrNr_Empfänger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picKdAtrNr_Empfänger.Location = New System.Drawing.Point(483, 83) + Me.picKdAtrNr_Empfänger.Name = "picKdAtrNr_Empfänger" + Me.picKdAtrNr_Empfänger.Size = New System.Drawing.Size(17, 12) + Me.picKdAtrNr_Empfänger.TabIndex = 93 + Me.picKdAtrNr_Empfänger.TabStop = False + Me.picKdAtrNr_Empfänger.Visible = False ' - 'ToolStripMenuItem20 + 'picKdAtrNr_Fraechter ' - Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus - Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(180, 22) - Me.ToolStripMenuItem20.Text = "EZA" + Me.picKdAtrNr_Fraechter.BackgroundImage = Global.AVISO.My.Resources.Resources.info + Me.picKdAtrNr_Fraechter.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picKdAtrNr_Fraechter.Location = New System.Drawing.Point(483, 157) + Me.picKdAtrNr_Fraechter.Name = "picKdAtrNr_Fraechter" + Me.picKdAtrNr_Fraechter.Size = New System.Drawing.Size(17, 12) + Me.picKdAtrNr_Fraechter.TabIndex = 94 + Me.picKdAtrNr_Fraechter.TabStop = False + Me.picKdAtrNr_Fraechter.Visible = False ' 'cntlFrachtfuehrer_Sonst ' @@ -4276,6 +4338,10 @@ Partial Class frmSendungsdetailsNEU Me.ctxtWeitereFormulare.ResumeLayout(False) Me.ContextMenuStrip1.ResumeLayout(False) Me.ContextMenuStrip2.ResumeLayout(False) + CType(Me.picKdAtrNr_Avisierer, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picKdAtrNr_Auftraggeber, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picKdAtrNr_Empfänger, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picKdAtrNr_Fraechter, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -4577,4 +4643,8 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents ToolStripMenuItem18 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem19 As ToolStripMenuItem Friend WithEvents ToolStripMenuItem20 As ToolStripMenuItem + Friend WithEvents picKdAtrNr_Fraechter As PictureBox + Friend WithEvents picKdAtrNr_Empfänger As PictureBox + Friend WithEvents picKdAtrNr_Auftraggeber As PictureBox + Friend WithEvents picKdAtrNr_Avisierer As PictureBox End Class diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index d7bb0ec..3646ec7 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -216,339 +216,368 @@ Public Class frmSendungsdetailsNEU Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load + Try - Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor - Panel15.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor - pnlFremd.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor - cbxFremdspedition.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor + Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor + Panel15.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor + pnlFremd.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor + cbxFremdspedition.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor - AVISO = AvisoDAL.LesenAviso(AvisoId, "") + AVISO = AvisoDAL.LesenAviso(AvisoId, "") - txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200) + txtWarenwertWaehrung.initSearchBox(Me.FindForm, " [Code] ,[Description] as Land FROM tbl_DY_ZollDE_I0400_Waehrungsliste", {"Code", "Description"}, " (StartDate is null OR StartDate< GETDATE()) AND (EndDate is null OR EndDate> GETDATE()) ", "Code", "Code", "Code", "FMZOLL", , 150, 200) - If AVISO.Grenzstelle.Replace("???", "") = "" Then - lblGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") - Else - Select Case AVISO.Grenzstelle - Case "SUB" : lblGrenze.Text = "DE007701 Suben" - Case "WAI" : lblGrenze.Text = "DE008904 Waidhaus" - Case "SBG" : lblGrenze.Text = "DE007458 Bad Reichenhall" - Case "NKD" : lblGrenze.Text = "AT320300 Nickelsdorf" - Case "SFD" : lblGrenze.Text = "AT700400 Spielfeld" - End Select + If AVISO.Grenzstelle.Replace("???", "") = "" Then + lblGrenze.Text = SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") + Else + Select Case AVISO.Grenzstelle + Case "SUB" : lblGrenze.Text = "DE007701 Suben" + Case "WAI" : lblGrenze.Text = "DE008904 Waidhaus" + Case "SBG" : lblGrenze.Text = "DE007458 Bad Reichenhall" + Case "NKD" : lblGrenze.Text = "AT320300 Nickelsdorf" + Case "SFD" : lblGrenze.Text = "AT700400 Spielfeld" + End Select - End If + End If - If AVISO.Abgeschlossen Then - Label8.Visible = True - End If - lblZollsysErr.Text = "" - LinkLabel1.TabStop = False - LinkLabel2.TabStop = False - ' cbxFremdspedition.TabStop = False - LinkLabel3.TabStop = False - Label26.TabStop = False - Panel8.TabStop = False - ' RadioButton.TabStop = False - ' RadioButton1.TabStop = False - ' RadioButton2.TabStop = False - lklAuftraggeber.TabStop = False - ' txtEmpfaengerBonitaet.TabStop = False - ' txtEmpfaengerAnsprechpartner.TabStop = False + If AVISO.Abgeschlossen Then + Label8.Visible = True + End If + lblZollsysErr.Text = "" + LinkLabel1.TabStop = False + LinkLabel2.TabStop = False + ' cbxFremdspedition.TabStop = False + LinkLabel3.TabStop = False + Label26.TabStop = False + Panel8.TabStop = False + ' RadioButton.TabStop = False + ' RadioButton1.TabStop = False + ' RadioButton2.TabStop = False + lklAuftraggeber.TabStop = False + ' txtEmpfaengerBonitaet.TabStop = False + ' txtEmpfaengerAnsprechpartner.TabStop = False - 'TODO: Diese Codezeile lädt Daten in die Tabelle "AVISO_newDataSet.tblSendungen". Sie können sie bei Bedarf verschieben oder entfernen. - If AvisoId <= 0 Then MsgBox("Fehler") : Me.Close() : Exit Sub - ' Me.TblSendungenTableAdapter.Fill(Me.AVISO_newDataSet.tblSendungen, AvisoId) + 'TODO: Diese Codezeile lädt Daten in die Tabelle "AVISO_newDataSet.tblSendungen". Sie können sie bei Bedarf verschieben oder entfernen. + If AvisoId <= 0 Then MsgBox("Fehler") : Me.Close() : Exit Sub + ' Me.TblSendungenTableAdapter.Fill(Me.AVISO_newDataSet.tblSendungen, AvisoId) - VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId) 'LÄDT alle SENDUNGSDATEN + VERAG_PROG_ALLGEMEIN.cSendungen.LOAD_LIST(SENDUNG_LIST, CURRENT_INDEX, AvisoId) 'LÄDT alle SENDUNGSDATEN - Dim sbWhere = "" - Dim QSwhere = "" + Dim sbWhere = "" + Dim QSwhere = "" - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "IMEX" + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "IMEX" - btnAufschub_VERAG.Text = "IMEX" - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) - cboZollsystem.SelectedIndex = 1 + btnAufschub_VERAG.Text = "IMEX" + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) + cboZollsystem.SelectedIndex = 1 - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) - cboZollsystem2.SelectedIndex = 1 - sbWhere = " And Mandant = 'IMEX' " - QSwhere = " AND mit_firma IN ('IMEX','BEIDE') " + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) + cboZollsystem2.SelectedIndex = 1 + sbWhere = " And Mandant = 'IMEX' " + QSwhere = " AND mit_firma IN ('IMEX','BEIDE') " ' Label10.Visible = False 'rtbAnmerkungDispoliste.Visible = False - Case "ATILLA" : sbWhere = " AND Niederlassung = 'SUA' " - Case "UNISPED" - txtDyRef.Visible = True - picDy.Visible = True - If AVISO IsNot Nothing Then txtDyRef.Text = If(AVISO.DakosyRef, "") - Case Else + Case "ATILLA" : sbWhere = " AND Niederlassung = 'SUA' " + Case "UNISPED" + txtDyRef.Visible = True + picDy.Visible = True + If AVISO IsNot Nothing Then txtDyRef.Text = If(AVISO.DakosyRef, "") + Case Else - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATLAS", "A")) - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EZOLL", "E")) - cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) - cboZollsystem.SelectedIndex = 0 + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATLAS", "A")) + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EZOLL", "E")) + cboZollsystem.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) + cboZollsystem.SelectedIndex = 0 - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATLAS", "A")) - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EZOLL", "E")) - cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) - cboZollsystem2.SelectedIndex = 0 - sbWhere = " AND Mandant <> 'IMEX' " - QSwhere = " AND mit_firma <> 'IMEX' " - End Select + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATLAS", "A")) + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("EZOLL", "E")) + cboZollsystem2.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("DAKOSY", "D")) + cboZollsystem2.SelectedIndex = 0 + sbWhere = " AND Mandant <> 'IMEX' " + QSwhere = " AND mit_firma <> 'IMEX' " + End Select - cboSachbearbeiter.fillWithSQL("SELECT ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & sbWhere & " ORDER BY Name ", False, "FMZOLL", True) + cboSachbearbeiter.fillWithSQL("SELECT ID,/*cast(ID as nvarchar(3)) +' ' + Name as*/ Name FROM Personal WHERE [Status]<>'L' " & sbWhere & " ORDER BY Name ", False, "FMZOLL", True) - cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", 0)) - cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Absender", 1)) - cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Empfänger", 2)) - ' cboZolltarif.changeItem("0") + cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftraggeber", 0)) + cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Absender", 1)) + cboZolltarif.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Empfänger", 2)) + ' cboZolltarif.changeItem("0") - usrcntl_NCTS = New usrCntlSND_NCTSGestellungsadresse - usrcntl_FISKAL = New usrCntlSND_NCTSFiskalEndempf - 'usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZollanmeldungen", Me) Then - TabControl1.TabPages.Remove(tbZollabfertigung) - End If + usrcntl_NCTS = New usrCntlSND_NCTSGestellungsadresse + usrcntl_FISKAL = New usrCntlSND_NCTSFiskalEndempf + 'usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ZOLL_DakosyZollanmeldungen", Me) Then + TabControl1.TabPages.Remove(tbZollabfertigung) + End If - If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Vorauskasse", Me) Then - btnImportaviso.Visible = True - btnVorauszahlung.Visible = True - ' ToolStripMenuItem13.Enabled = True - End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Vorauskasse", Me) Then + btnImportaviso.Visible = True + btnVorauszahlung.Visible = True + ' ToolStripMenuItem13.Enabled = True + End If - cboFiliale._allowFreiText = Nothing - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER - Case "FRONTOFFICE" - cboFiliale._allowFreiText = Nothing - Case Else - Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA - Case "VERAG" : cboFiliale._allowedValuesFreiText = {"4803", "4809", "4805", "4806", "4811", "5003", "5303", "5103", "4839"} - Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"} - Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"} - Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"} - Case "ATILLA" : cboFiliale._allowedValuesFreiText = Nothing - End Select - End Select + cboFiliale._allowFreiText = Nothing + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER + Case "FRONTOFFICE" + cboFiliale._allowFreiText = Nothing + Case Else + Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA + Case "VERAG" : cboFiliale._allowedValuesFreiText = {"4803", "4809", "4805", "4806", "4811", "5003", "5303", "5103", "4839"} + Case "IMEX" : cboFiliale._allowedValuesFreiText = {"5501"} + Case "UNISPED" : cboFiliale._allowedValuesFreiText = {"5601"} + Case "AMBAR" : cboFiliale._allowedValuesFreiText = {"5701"} + Case "ATILLA" : cboFiliale._allowedValuesFreiText = Nothing + End Select + End Select - Select Case SENDUNG_LIST(CURRENT_INDEX).FilialenNr - Case 4803, 4809 - cboNiederlassung.Text = "SUB" - If Not VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then ToolStripMenuItem9.Enabled = False - Case 4801 - cboNiederlassung.Text = "SUW" - Case 5003 - cboNiederlassung.Text = "SBG" 'ANDERER SERVER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - Case 5103 - cboNiederlassung.Text = "WAI" - Case 5303 - cboNiederlassung.Text = "SUB" - If Not VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then ToolStripMenuItem9.Enabled = False - End Select + Select Case SENDUNG_LIST(CURRENT_INDEX).FilialenNr + Case 4803, 4809 + cboNiederlassung.Text = "SUB" + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then ToolStripMenuItem9.Enabled = False + Case 4801 + cboNiederlassung.Text = "SUW" + Case 5003 + cboNiederlassung.Text = "SBG" 'ANDERER SERVER!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + Case 5103 + cboNiederlassung.Text = "WAI" + Case 5303 + cboNiederlassung.Text = "SUB" + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME = "ADMIN" Then ToolStripMenuItem9.Enabled = False + End Select - 'bsSendungen. + 'bsSendungen. - ' DsSendungen. - Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height - Me.Top = 0 - ' initKdBoxEmpfaenger() + ' DsSendungen. + Me.Height = Screen.FromRectangle(Me.Bounds).WorkingArea.Size.Height + Me.Top = 0 + ' initKdBoxEmpfaenger() - Dim trd As Threading.Thread - trd = New Threading.Thread(AddressOf initDrucker) - trd.IsBackground = True - trd.Start() + Dim trd As Threading.Thread + trd = New Threading.Thread(AddressOf initDrucker) + trd.IsBackground = True + trd.Start() - 'initDrucker() + 'initDrucker() - txtAvisierer.initKdBox(Me, txtAvisiererKdNr) - txtFrachtfuehrer.initKdBox(Me, txtFrachtfuehrerKdNr) + txtAvisierer.initKdBox(Me, txtAvisiererKdNr) + txtFrachtfuehrer.initKdBox(Me, txtFrachtfuehrerKdNr) - AddHandler txtAvisierer.PropertyChanged, Sub() - btnAvisierer.BackgroundImage = IIf(txtAvisierer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = txtAvisierer.KdNr + AddHandler txtAvisierer.PropertyChanged, Sub() + btnAvisierer.BackgroundImage = IIf(txtAvisierer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = txtAvisierer.KdNr + settoopTip(picKdAtrNr_Avisierer, txtAvisierer) - txtKdAuftragsNrAvisierer.BackColor = Color.White - If txtAvisierer.KdData_KUNDE_ERW IsNot Nothing AndAlso txtAvisierer.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then - txtKdAuftragsNrAvisierer.BackColor = Color.FromArgb(255, 255, 128) - If txtKdAuftragsNrAvisierer.Text = "" Then txtKdAuftragsNrAvisierer.Text = If(txtAvisierer.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") - End If - - initWarnKd_AndKdInfo(txtAvisierer, picWarnAvisierer) - - End Sub - - AddHandler txtFrachtfuehrer.PropertyChanged, Sub() - btnFrachtfuehrer.BackgroundImage = IIf(txtFrachtfuehrer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = txtFrachtfuehrer.KdNr - - txtKdAuftragsNrFrachtfuehrer.BackColor = Color.White - If txtFrachtfuehrer.KdData_KUNDE_ERW IsNot Nothing AndAlso txtFrachtfuehrer.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then - txtKdAuftragsNrFrachtfuehrer.BackColor = Color.FromArgb(255, 255, 128) - If txtKdAuftragsNrFrachtfuehrer.Text = "" Then txtKdAuftragsNrFrachtfuehrer.Text = If(txtFrachtfuehrer.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") + txtKdAuftragsNrAvisierer.BackColor = Color.White + If txtAvisierer.KdData_KUNDE_ERW IsNot Nothing AndAlso txtAvisierer.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then + txtKdAuftragsNrAvisierer.BackColor = Color.FromArgb(255, 255, 128) + If txtKdAuftragsNrAvisierer.Text = "" Then txtKdAuftragsNrAvisierer.Text = If(txtAvisierer.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") End If - initWarnKd_AndKdInfo(txtFrachtfuehrer, picWarnFrachtfuehrer) + initWarnKd_AndKdInfo(txtAvisierer, picWarnAvisierer) + End Sub + AddHandler txtFrachtfuehrer.PropertyChanged, Sub() + btnFrachtfuehrer.BackgroundImage = IIf(txtFrachtfuehrer.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = txtFrachtfuehrer.KdNr - txtEmpfaenger.initKdBox(Me, txtEmpfaengerKdNr) - AddHandler txtEmpfaenger.PropertyChanged, Sub() - FlatButton1.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + settoopTip(picKdAtrNr_Fraechter, txtFrachtfuehrer) + + txtKdAuftragsNrFrachtfuehrer.BackColor = Color.White + If txtFrachtfuehrer.KdData_KUNDE_ERW IsNot Nothing AndAlso txtFrachtfuehrer.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then + txtKdAuftragsNrFrachtfuehrer.BackColor = Color.FromArgb(255, 255, 128) + If txtKdAuftragsNrFrachtfuehrer.Text = "" Then txtKdAuftragsNrFrachtfuehrer.Text = If(txtFrachtfuehrer.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") + End If + + initWarnKd_AndKdInfo(txtFrachtfuehrer, picWarnFrachtfuehrer) + End Sub + + + txtEmpfaenger.initKdBox(Me, txtEmpfaengerKdNr) + AddHandler txtEmpfaenger.PropertyChanged, Sub() + FlatButton1.BackgroundImage = IIf(txtEmpfaenger.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr + ' If RadioButton2.Checked Then initKundenzolltarifChecked(txtEmpfaenger) + If cboZolltarif._value = 2 Then initKundenzolltarifChecked(txtEmpfaenger) + + settoopTip(picKdAtrNr_Empfänger, txtEmpfaenger) + + txtKdAuftragsNrEmpfaenger.BackColor = Color.White + If txtEmpfaenger.KdData_KUNDE_ERW IsNot Nothing AndAlso txtEmpfaenger.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then + txtKdAuftragsNrEmpfaenger.BackColor = Color.FromArgb(255, 255, 128) + If txtKdAuftragsNrEmpfaenger.Text = "" Then txtKdAuftragsNrEmpfaenger.Text = If(txtEmpfaenger.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") + End If + + initWarnKd_AndKdInfo(txtEmpfaenger, picWarnEmpfaenger) + End Sub + AddHandler txtAbsender.PropertyChanged, Sub() + FlatButton4.BackgroundImage = IIf(txtAbsender.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender = txtAbsender.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr = txtAbsender.KdNr + ' If RadioButton1.Checked Then initKundenzolltarifChecked(txtAbsender) + If cboZolltarif._value = 1 Then initKundenzolltarifChecked(txtAbsender) + + + initWarnKd_AndKdInfo(txtAbsender, picWarnAbsender) + End Sub + + + AddHandler txtAuftraggeber.PropertyChanged, Sub() + Try + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber = txtAuftraggeber.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr = txtAuftraggeber.KdNr + FlatButton3.BackgroundImage = IIf(txtAuftraggeber.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) + If txtAuftraggeber.KdData_ADRESSEN IsNot Nothing Then + ' txtEmpfaengerAnsprechpartner.Text = IIf(txtAuftraggeber.KdData_ADRESSEN.Ansprechpartner IsNot Nothing, txtAuftraggeber.KdData_ADRESSEN.Ansprechpartner, "") + ' txtEmpfaengerBonitaet.Text = IIf(txtAuftraggeber.KdData_KUNDE.Bonität IsNot Nothing, txtAuftraggeber.KdData_KUNDE.Bonität, "") + + Else + ' txtEmpfaengerAnsprechpartner.Text = "" + ' txtEmpfaengerBonitaet.Text = "" + End If + ' lblAtrAufschubEustTxt.Visible = False + lblAtrAufschubEust.Visible = False + + settoopTip(picKdAtrNr_Auftraggeber, txtAuftraggeber) + + ' If txtAuftraggeber.KdData_KUNDE IsNot Nothing Then + ' If txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt IsNot Nothing And txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt <> "" Then + 'lblAtrAufschubEust.Text = txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt + + btnAufschub_Atr.Text = SendungOptions.getAufschubKto(txtAuftraggeber.KdNr_value, "EUST") + If btnAufschub_Atr.Text = "" Then btnAufschub_Atr.Text = "Aufschub" + ' lblAtrAufschubEustTxt.Visible = True + ' lblAtrAufschubEust.Visible = True + ' btnAufschub_Atr.PerformClick() + ' End If + + ' End If + + txtKdAuftragsNr.BackColor = Color.White + If txtAuftraggeber.KdData_KUNDE_ERW IsNot Nothing AndAlso txtAuftraggeber.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then + txtKdAuftragsNr.BackColor = Color.FromArgb(255, 255, 128) + If txtKdAuftragsNr.Text = "" Then txtKdAuftragsNr.Text = If(txtAuftraggeber.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") + End If + + + 'If RadioButton.Checked Then initKundenzolltarifChecked(txtAuftraggeber) + If cboZolltarif._value = 0 Then initKundenzolltarifChecked(txtAuftraggeber) + Catch ex As Exception + MsgBox(ex.Message & vbNewLine & ex.StackTrace) + End Try + + initWarnKd_AndKdInfo(txtAuftraggeber, picWarnAuftraggeber) + + + + End Sub + AddHandler txtEmpfaenger.TextChanged, Sub() + ' If txtEmpfaenger.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger") = txtEmpfaenger.Text SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = txtEmpfaenger.KdNr - ' If RadioButton2.Checked Then initKundenzolltarifChecked(txtEmpfaenger) - If cboZolltarif._value = 2 Then initKundenzolltarifChecked(txtEmpfaenger) + SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = -1 - txtKdAuftragsNrEmpfaenger.BackColor = Color.White - If txtEmpfaenger.KdData_KUNDE_ERW IsNot Nothing AndAlso txtEmpfaenger.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then - txtKdAuftragsNrEmpfaenger.BackColor = Color.FromArgb(255, 255, 128) - If txtKdAuftragsNrEmpfaenger.Text = "" Then txtKdAuftragsNrEmpfaenger.Text = If(txtEmpfaenger.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") - End If + ' lblEmpfAufschubEustTxt.Visible = False + lblEmpfAufschubEust.Visible = False + ' If txtEmpfaenger.KdData_KUNDE IsNot Nothing Then + ' If txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt IsNot Nothing And txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt <> "" Then + 'lblEmpfAufschubEust.Text = txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt + ' btnAufschub_Empf.Text = txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt + btnAufschub_Empf.Text = SendungOptions.getAufschubKto(txtEmpfaenger.KdNr_value, "EUST") + If btnAufschub_Empf.Text = "" Then btnAufschub_Empf.Text = "Aufschub" + ' lblEmpfAufschubEustTxt.Visible = True + ' lblEmpfAufschubEust.Visible = True + ' btnAufschub_Atr.PerformClick() + ' End If + ' End If + + ' picWarnEmpfaenger.Visible = False initWarnKd_AndKdInfo(txtEmpfaenger, picWarnEmpfaenger) - End Sub - AddHandler txtAbsender.PropertyChanged, Sub() - FlatButton4.BackgroundImage = IIf(txtAbsender.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender = txtAbsender.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr = txtAbsender.KdNr - ' If RadioButton1.Checked Then initKundenzolltarifChecked(txtAbsender) - If cboZolltarif._value = 1 Then initKundenzolltarifChecked(txtAbsender) + End Sub + AddHandler txtAbsender.TextChanged, Sub() + ' If txtAbsender.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender") = txtAbsender.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender = txtAbsender.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr = -1 + ' picWarnAbsender.Visible = False initWarnKd_AndKdInfo(txtAbsender, picWarnAbsender) End Sub - - - AddHandler txtAuftraggeber.PropertyChanged, Sub() - Try - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber = txtAuftraggeber.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr = txtAuftraggeber.KdNr - FlatButton3.BackgroundImage = IIf(txtAuftraggeber.KdNr > 0, My.Resources.person, My.Resources.personInaktiv) - If txtAuftraggeber.KdData_ADRESSEN IsNot Nothing Then - ' txtEmpfaengerAnsprechpartner.Text = IIf(txtAuftraggeber.KdData_ADRESSEN.Ansprechpartner IsNot Nothing, txtAuftraggeber.KdData_ADRESSEN.Ansprechpartner, "") - ' txtEmpfaengerBonitaet.Text = IIf(txtAuftraggeber.KdData_KUNDE.Bonität IsNot Nothing, txtAuftraggeber.KdData_KUNDE.Bonität, "") - - Else - ' txtEmpfaengerAnsprechpartner.Text = "" - ' txtEmpfaengerBonitaet.Text = "" - End If - ' lblAtrAufschubEustTxt.Visible = False - lblAtrAufschubEust.Visible = False - - ' If txtAuftraggeber.KdData_KUNDE IsNot Nothing Then - ' If txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt IsNot Nothing And txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt <> "" Then - 'lblAtrAufschubEust.Text = txtAuftraggeber.KdData_KUNDE.Aufschubkonto_EUSt - - btnAufschub_Atr.Text = SendungOptions.getAufschubKto(txtAuftraggeber.KdNr_value, "EUST") - If btnAufschub_Atr.Text = "" Then btnAufschub_Atr.Text = "Aufschub" - ' lblAtrAufschubEustTxt.Visible = True - ' lblAtrAufschubEust.Visible = True - ' btnAufschub_Atr.PerformClick() - ' End If - - ' End If - - txtKdAuftragsNr.BackColor = Color.White - If txtAuftraggeber.KdData_KUNDE_ERW IsNot Nothing AndAlso txtAuftraggeber.KdData_KUNDE_ERW.kde_VerwendetAuftragsNr Then - txtKdAuftragsNr.BackColor = Color.FromArgb(255, 255, 128) - If txtKdAuftragsNr.Text = "" Then txtKdAuftragsNr.Text = If(txtAuftraggeber.KdData_KUNDE_ERW.kde_FixeAuftragsNr, "") - End If - - - 'If RadioButton.Checked Then initKundenzolltarifChecked(txtAuftraggeber) - If cboZolltarif._value = 0 Then initKundenzolltarifChecked(txtAuftraggeber) - Catch ex As Exception - MsgBox(ex.Message & vbNewLine & ex.StackTrace) - End Try + AddHandler txtAuftraggeber.TextChanged, Sub() + ' If txtAuftraggeber.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber") = txtAuftraggeber.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber = txtAuftraggeber.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr = -1 initWarnKd_AndKdInfo(txtAuftraggeber, picWarnAuftraggeber) - - End Sub - AddHandler txtEmpfaenger.TextChanged, Sub() - ' If txtEmpfaenger.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger") = txtEmpfaenger.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Empfaenger = txtEmpfaenger.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_EmpfaengerKdNr = -1 - - ' lblEmpfAufschubEustTxt.Visible = False - lblEmpfAufschubEust.Visible = False - ' If txtEmpfaenger.KdData_KUNDE IsNot Nothing Then - ' If txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt IsNot Nothing And txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt <> "" Then - 'lblEmpfAufschubEust.Text = txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt - ' btnAufschub_Empf.Text = txtEmpfaenger.KdData_KUNDE.Aufschubkonto_EUSt - btnAufschub_Empf.Text = SendungOptions.getAufschubKto(txtEmpfaenger.KdNr_value, "EUST") - If btnAufschub_Empf.Text = "" Then btnAufschub_Empf.Text = "Aufschub" - - ' lblEmpfAufschubEustTxt.Visible = True - ' lblEmpfAufschubEust.Visible = True - ' btnAufschub_Atr.PerformClick() - ' End If - ' End If - - ' picWarnEmpfaenger.Visible = False - initWarnKd_AndKdInfo(txtEmpfaenger, picWarnEmpfaenger) - - End Sub - AddHandler txtAbsender.TextChanged, Sub() - ' If txtAbsender.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender") = txtAbsender.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Absender = txtAbsender.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AbsenderKdNr = -1 - ' picWarnAbsender.Visible = False - initWarnKd_AndKdInfo(txtAbsender, picWarnAbsender) - End Sub - AddHandler txtAuftraggeber.TextChanged, Sub() - ' If txtAuftraggeber.KdNr < 0 Then SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber") = txtAuftraggeber.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Auftraggeber = txtAuftraggeber.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AuftraggeberKdNr = -1 - - initWarnKd_AndKdInfo(txtAuftraggeber, picWarnAuftraggeber) - - End Sub - AddHandler txtAvisierer.TextChanged, Sub() - 'picWarnAvisierer.Visible = False - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = -1 - initWarnKd_AndKdInfo(txtAvisierer, picWarnAvisierer) - End Sub - AddHandler txtFrachtfuehrer.TextChanged, Sub() - ' picWarnFrachtfuehrer.Visible = False - SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text - SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = -1 - initWarnKd_AndKdInfo(txtFrachtfuehrer, picWarnFrachtfuehrer) + AddHandler txtAvisierer.TextChanged, Sub() + 'picWarnAvisierer.Visible = False + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Avisierer = txtAvisierer.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_AvisiererKdNr = -1 + initWarnKd_AndKdInfo(txtAvisierer, picWarnAvisierer) End Sub - txtAuftraggeber.initKdBox(Me, txtAuftraggeberKdNr) - txtAbsender.initKdBox(Me, txtAbsenderKdNr) + AddHandler txtFrachtfuehrer.TextChanged, Sub() + ' picWarnFrachtfuehrer.Visible = False + SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer = txtFrachtfuehrer.Text + SENDUNG_LIST(CURRENT_INDEX).tblSnd_FrachtfuehrerKdNr = -1 + initWarnKd_AndKdInfo(txtFrachtfuehrer, picWarnFrachtfuehrer) + End Sub + txtAuftraggeber.initKdBox(Me, txtAuftraggeberKdNr) + txtAbsender.initKdBox(Me, txtAbsenderKdNr) - If SendungID > 0 Then - For Each i In SENDUNG_LIST - If i.tblSnd_SendungID = SendungID Then - CURRENT_INDEX = SENDUNG_LIST.IndexOf(i) : Exit For - End If - Next - ' Try : bsSendungen.Position = bsSendungen.Find("tblSnd_SendungID", SendungID) - ' Catch ex As Exception : End Try + If SendungID > 0 Then + For Each i In SENDUNG_LIST + If i.tblSnd_SendungID = SendungID Then + CURRENT_INDEX = SENDUNG_LIST.IndexOf(i) : Exit For + End If + Next + ' Try : bsSendungen.Position = bsSendungen.Find("tblSnd_SendungID", SendungID) + ' Catch ex As Exception : End Try - End If + End If - If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnNeueAbfertigungNrVergeben.Visible = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.AUTO_ABF_NR Then btnNeueAbfertigungNrVergeben.Visible = True - initDataBinding() + initDataBinding() + Catch ex As Exception + closeWithoutSave = True + MsgBox("Fehler beim Laden der Sendungsdaten." & ex.Message & ex.StackTrace) + Me.Close() + End Try End Sub + Sub settoopTip(pic As PictureBox, kdTXT As VERAG_PROG_ALLGEMEIN.KdSearchBox) + + If kdTXT.KdData_KUNDE_ERW IsNot Nothing AndAlso kdTXT.KdData_KUNDE_ERW.kde_InfoAuftragsNr AndAlso kdTXT.KdData_KUNDE_ERW.kde_InfoAuftragsNr <> "" Then + ToolTip.SetToolTip(pic, kdTXT.KdData_KUNDE_ERW.kde_InfoAuftragsNr) + pic.Visible = True + pic.Cursor = Cursors.Hand + pic.Tag = kdTXT.KdData_KUNDE_ERW.kde_InfoAuftragsNr + Else + ToolTip.SetToolTip(pic, "") + pic.Visible = False + pic.Cursor = Cursors.Default + pic.Tag = "" + End If + + End Sub Sub initWarnKd_AndKdInfo(kdSearch As VERAG_PROG_ALLGEMEIN.KdSearchBox, pic As PictureBox) Try @@ -615,7 +644,7 @@ Public Class frmSendungsdetailsNEU 'TabControl1.TabPages.Remove(tbZollabfertigung) End If - If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetails", Me) Then + If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetails", Me) And Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("frmSendungsdetailsNEU", Me) Then Me.Close() End If ' Button13.Location = New Point(Button13.Left, 0) @@ -771,6 +800,7 @@ Public Class frmSendungsdetailsNEU Case "UNISPED" : filiale_tmp = 5601 Case "AMBAR" : filiale_tmp = 5701 Case "FRONTOFFICE" : filiale_tmp = 0 '5801 + Case "VERIMEX" : filiale_tmp = 0 '6001 Case Else Select Case AVISO.Grenzstelle Case "SUB" : filiale_tmp = 4803 @@ -1074,31 +1104,32 @@ Public Class frmSendungsdetailsNEU txtFrachtfuehrer.Text = SENDUNG_LIST(CURRENT_INDEX).tblSnd_Frachtfuehrer 'IIf(SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer Is Nothing, "", SENDUNG_LIST(CURRENT_INDEX).tblSnd_frachtfuehrer) End If - 'Übergangsphase Aviso/Sendung - If txtAvisierer.Text = "" And txtAvisierer.Enabled And VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - If AVISO.Auftraggeber_KdNr > -1 Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr - End If - Else - txtAvisierer.KdNr_value = -1 - txtAvisiererKdNr.Text = "" - txtAvisierer.Text = AVISO.Auftraggeber - End If - End If + initFraechterAvisererFromAkt() + ''Übergangsphase Aviso/Sendung + 'If txtAvisierer.Text = "" And txtAvisierer.Enabled And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then + ' If AVISO.Auftraggeber_KdNr > -1 Then + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + ' txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr + ' End If + ' Else + ' txtAvisierer.KdNr_value = -1 + ' txtAvisiererKdNr.Text = "" + ' txtAvisierer.Text = AVISO.Auftraggeber + ' End If + 'End If - 'Übergangsphase Aviso/Sendung - If txtFrachtfuehrer.Text = "" And txtFrachtfuehrer.Enabled And VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - If AVISO.Frächter_KdNr > -1 Then - If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Frächter_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then - txtFrachtfuehrer.KdNr = AVISO.Frächter_KdNr - End If - Else - txtFrachtfuehrer.KdNr_value = -1 - txtFrachtfuehrerKdNr.Text = "" - txtFrachtfuehrer.Text = AVISO.Frächter - End If - End If + ''Übergangsphase Aviso/Sendung + 'If txtFrachtfuehrer.Text = "" And txtFrachtfuehrer.Enabled And VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + ' If AVISO.Frächter_KdNr > -1 Then + ' If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Frächter_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then + ' txtFrachtfuehrer.KdNr = AVISO.Frächter_KdNr + ' End If + ' Else + ' txtFrachtfuehrer.KdNr_value = -1 + ' txtFrachtfuehrerKdNr.Text = "" + ' txtFrachtfuehrer.Text = AVISO.Frächter + ' End If + 'End If pnlT1.Controls.Clear() @@ -1160,6 +1191,7 @@ Public Class frmSendungsdetailsNEU pnlEAviso.Visible = (SENDUNG_LIST(CURRENT_INDEX).VORSYSTEM IsNot Nothing) lblVorsystem.Text = If(SENDUNG_LIST(CURRENT_INDEX).VORSYSTEM, "") + lblVorsystem.Visible = pnlEAviso.Visible initRbtn() cboAbfertigungsart.Focus() @@ -1193,7 +1225,36 @@ Public Class frmSendungsdetailsNEU ' GEAENDERT = False End Sub + Sub initFraechterAvisererFromAkt() + 'Übergangsphase Aviso/Sendung + If txtAvisierer.Text = "" And txtAvisierer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then + If AVISO.Auftraggeber_KdNr > -1 Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Auftraggeber_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then + txtAvisierer.KdNr = AVISO.Auftraggeber_KdNr + End If + Else + txtAvisierer.KdNr_value = -1 + txtAvisiererKdNr.Text = "" + txtAvisierer.Text = AVISO.Auftraggeber + End If + End If + + + 'Übergangsphase Aviso/Sendung + If txtFrachtfuehrer.Text = "" And txtFrachtfuehrer.Enabled Then 'And (VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Or VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX") Then + If AVISO.Frächter_KdNr > -1 Then + If VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromKdNr(AVISO.Frächter_KdNr) = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale(cboFiliale._value) Then + txtFrachtfuehrer.KdNr = AVISO.Frächter_KdNr + End If + Else + + txtFrachtfuehrer.KdNr_value = -1 + txtFrachtfuehrerKdNr.Text = "" + txtFrachtfuehrer.Text = AVISO.Frächter + End If + End If + End Sub Sub initPosNr() 'Try @@ -1524,9 +1585,11 @@ Public Class frmSendungsdetailsNEU Sub initDrucker() - ' alle installierten Drucker ermitteln und - ' in in ein ArrayList-Objekt speichern - Dim sPrinters As New ArrayList + Try + + ' alle installierten Drucker ermitteln und + ' in in ein ArrayList-Objekt speichern + Dim sPrinters As New ArrayList For Each sPrinter As String In PrinterSettings.InstalledPrinters sPrinters.Add(sPrinter) Next @@ -1548,25 +1611,30 @@ Public Class frmSendungsdetailsNEU setCboSelected(oPS.PrinterName) - If False Then + If False Then - If sPrinters.Count > 0 Then - cboPrinter.SelectedIndex = 0 - For Each i In cboPrinter.Items - If i.ToString = oPS.PrinterName Then - cboPrinter.SelectedItem = i - Exit For - End If - Next + If sPrinters.Count > 0 Then + cboPrinter.SelectedIndex = 0 + For Each i In cboPrinter.Items + If i.ToString = oPS.PrinterName Then + cboPrinter.SelectedItem = i + Exit For + End If + Next + End If + + + ' For Each i In cboPrinter.Items + 'If i.ToString.ToUpper.Contains("TALLY") Then + 'cboPrinter.SelectedItem = i : Exit For + ' End If + ' Next End If - ' For Each i In cboPrinter.Items - 'If i.ToString.ToUpper.Contains("TALLY") Then - 'cboPrinter.SelectedItem = i : Exit For - ' End If - ' Next - End If + Catch ex As Exception + MsgBox("Fehler beim initialisieren der Drucker!" & ex.Message & ex.StackTrace) + End Try End Sub 'threadsicherer Aufruf @@ -2487,6 +2555,8 @@ Public Class frmSendungsdetailsNEU End If Case "UNISPED" If cboFiliale._value <> "5601" Then sperren = True + Case "VERIMEX" + If cboFiliale._value = "5601" Then sperren = True 'UNISPED darf VERIMEX nicht, sonst alle im CLUSTER Case "VERAG" If Not VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_IMEX", "AVISO") Then If cboFiliale._value = "5601" Or cboFiliale._value = "5501" Then sperren = True @@ -3609,9 +3679,9 @@ Public Class frmSendungsdetailsNEU For Each r As DataGridViewRow In dgvAnhang.SelectedRows files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("anh_docId").Value)) Next - - Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray) - doc.Save(outputFile, Spire.Pdf.FileFormat.PDF) + VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) + 'Dim doc As Spire.Pdf.PdfDocumentBase = Spire.Pdf.PdfDocument.MergeFiles(files.ToArray) + 'doc.Save(outputFile, Spire.Pdf.FileFormat.PDF) Process.Start(outputFile) ' VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.OPEN_PATH() Catch ex As Exception @@ -3729,6 +3799,9 @@ Public Class frmSendungsdetailsNEU Select Case cboFremdsped._value Case "IMEX" : cboFiliale.changeItem("5501") Case "UNISPED" : cboFiliale.changeItem("5601") + Case "AMBAR" : cboFiliale.changeItem("5701") + Case "VERIMEX" : cboFiliale.changeItem("") + Case "FRONTOFFICE" : cboFiliale.changeItem("") Case Else If VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "" Then cboFiliale.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE) @@ -3799,4 +3872,14 @@ Public Class frmSendungsdetailsNEU initdgvZollAnmeldungen() End Sub End Sub + + Private Sub picKdAtrNr_Avisierer_Click(sender As Object, e As EventArgs) Handles picKdAtrNr_Avisierer.Click, picKdAtrNr_Auftraggeber.Click, picKdAtrNr_Fraechter.Click, picKdAtrNr_Empfänger.Click + If sender.tag <> "" Then + MsgBox(sender.tag) + End If + End Sub + + Private Sub cboFiliale_Leave(sender As Object, e As EventArgs) Handles cboFiliale.Leave + initFraechterAvisererFromAkt() + End Sub End Class diff --git a/Aviso/usrcntlAktDetails.Designer.vb b/Aviso/usrcntlAktDetails.Designer.vb index fd75ca7..979d4ab 100644 --- a/Aviso/usrcntlAktDetails.Designer.vb +++ b/Aviso/usrcntlAktDetails.Designer.vb @@ -88,6 +88,11 @@ Partial Class usrcntlAktDetails Me.TabPage3 = New System.Windows.Forms.TabPage() Me.tbAnhang = New System.Windows.Forms.TabPage() Me.addVermerk = New System.Windows.Forms.Button() + Me.pnlMAInfo = New System.Windows.Forms.Panel() + Me.txtMAinfo_Vorgeschrieben = New System.Windows.Forms.TextBox() + Me.picMAinfo_Vorgeschrieben = New System.Windows.Forms.PictureBox() + Me.txtMAinfo_VorbereitetQs = New System.Windows.Forms.TextBox() + Me.picMAinfo_VorbereitetQs = New System.Windows.Forms.PictureBox() Me.Panel8 = New System.Windows.Forms.Panel() Me.lblBarZuKassierenSumme = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() @@ -138,6 +143,7 @@ Partial Class usrcntlAktDetails Me.HervorhebenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolUeberweisungsBeleg = New System.Windows.Forms.ToolStripMenuItem() Me.toolVkReminder = New System.Windows.Forms.ToolStripMenuItem() + Me.MitarbeiterAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.cntxtFormulare = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DispolisteTRToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DispolisteENToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -163,6 +169,9 @@ Partial Class usrcntlAktDetails Me.pnlVermerkeTop.SuspendLayout() Me.Panel1.SuspendLayout() Me.tbcntlVermerke.SuspendLayout() + Me.pnlMAInfo.SuspendLayout() + CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel8.SuspendLayout() Me.pnlAbgeschlossen.SuspendLayout() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() @@ -229,6 +238,7 @@ Partial Class usrcntlAktDetails Me.SplitContainer.Panel2.Controls.Add(Me.gridVermerke) Me.SplitContainer.Panel2.Controls.Add(Me.pnlVermerkeTop) Me.SplitContainer.Panel2.Controls.Add(Me.addVermerk) + Me.SplitContainer.Panel2.Controls.Add(Me.pnlMAInfo) Me.SplitContainer.Size = New System.Drawing.Size(575, 358) Me.SplitContainer.SplitterDistance = 167 Me.SplitContainer.TabIndex = 91 @@ -650,7 +660,7 @@ Partial Class usrcntlAktDetails Me.Panel4.Controls.Add(Me.btnKasse_LG) Me.Panel4.Location = New System.Drawing.Point(204, 27) Me.Panel4.Name = "Panel4" - Me.Panel4.Size = New System.Drawing.Size(265, 193) + Me.Panel4.Size = New System.Drawing.Size(265, 192) Me.Panel4.TabIndex = 102 Me.Panel4.Visible = False ' @@ -881,7 +891,7 @@ Partial Class usrcntlAktDetails Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.gridVermerke.ShowCellErrors = False Me.gridVermerke.ShowRowErrors = False - Me.gridVermerke.Size = New System.Drawing.Size(575, 157) + Me.gridVermerke.Size = New System.Drawing.Size(575, 129) Me.gridVermerke.TabIndex = 70 Me.gridVermerke.TabStop = False ' @@ -1020,6 +1030,74 @@ Partial Class usrcntlAktDetails Me.addVermerk.UseVisualStyleBackColor = True Me.addVermerk.Visible = False ' + 'pnlMAInfo + ' + Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_Vorgeschrieben) + Me.pnlMAInfo.Controls.Add(Me.picMAinfo_Vorgeschrieben) + Me.pnlMAInfo.Controls.Add(Me.txtMAinfo_VorbereitetQs) + Me.pnlMAInfo.Controls.Add(Me.picMAinfo_VorbereitetQs) + Me.pnlMAInfo.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlMAInfo.Location = New System.Drawing.Point(0, 159) + Me.pnlMAInfo.Name = "pnlMAInfo" + Me.pnlMAInfo.Size = New System.Drawing.Size(575, 28) + Me.pnlMAInfo.TabIndex = 106 + ' + 'txtMAinfo_Vorgeschrieben + ' + Me.txtMAinfo_Vorgeschrieben.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtMAinfo_Vorgeschrieben.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtMAinfo_Vorgeschrieben.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtMAinfo_Vorgeschrieben.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtMAinfo_Vorgeschrieben.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMAinfo_Vorgeschrieben.ForeColor = System.Drawing.Color.Black + Me.txtMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(280, 6) + Me.txtMAinfo_Vorgeschrieben.MaxLength = 0 + Me.txtMAinfo_Vorgeschrieben.Name = "txtMAinfo_Vorgeschrieben" + Me.txtMAinfo_Vorgeschrieben.ReadOnly = True + Me.txtMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(160, 16) + Me.txtMAinfo_Vorgeschrieben.TabIndex = 108 + Me.txtMAinfo_Vorgeschrieben.TabStop = False + Me.txtMAinfo_Vorgeschrieben.Text = "-" + ' + 'picMAinfo_Vorgeschrieben + ' + Me.picMAinfo_Vorgeschrieben.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorgeschrieben_InAktiv + Me.picMAinfo_Vorgeschrieben.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picMAinfo_Vorgeschrieben.Location = New System.Drawing.Point(243, 4) + Me.picMAinfo_Vorgeschrieben.Name = "picMAinfo_Vorgeschrieben" + Me.picMAinfo_Vorgeschrieben.Size = New System.Drawing.Size(26, 21) + Me.picMAinfo_Vorgeschrieben.TabIndex = 107 + Me.picMAinfo_Vorgeschrieben.TabStop = False + ' + 'txtMAinfo_VorbereitetQs + ' + Me.txtMAinfo_VorbereitetQs.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtMAinfo_VorbereitetQs.BackColor = System.Drawing.Color.WhiteSmoke + Me.txtMAinfo_VorbereitetQs.BorderStyle = System.Windows.Forms.BorderStyle.None + Me.txtMAinfo_VorbereitetQs.Cursor = System.Windows.Forms.Cursors.Hand + Me.txtMAinfo_VorbereitetQs.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMAinfo_VorbereitetQs.ForeColor = System.Drawing.Color.Black + Me.txtMAinfo_VorbereitetQs.Location = New System.Drawing.Point(79, 6) + Me.txtMAinfo_VorbereitetQs.MaxLength = 0 + Me.txtMAinfo_VorbereitetQs.Name = "txtMAinfo_VorbereitetQs" + Me.txtMAinfo_VorbereitetQs.ReadOnly = True + Me.txtMAinfo_VorbereitetQs.Size = New System.Drawing.Size(158, 16) + Me.txtMAinfo_VorbereitetQs.TabIndex = 106 + Me.txtMAinfo_VorbereitetQs.TabStop = False + Me.txtMAinfo_VorbereitetQs.Text = "-" + ' + 'picMAinfo_VorbereitetQs + ' + Me.picMAinfo_VorbereitetQs.BackgroundImage = Global.AVISO.My.Resources.Resources.statusBtn_vorbereitet_InAktiv + Me.picMAinfo_VorbereitetQs.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picMAinfo_VorbereitetQs.Location = New System.Drawing.Point(42, 4) + Me.picMAinfo_VorbereitetQs.Name = "picMAinfo_VorbereitetQs" + Me.picMAinfo_VorbereitetQs.Size = New System.Drawing.Size(26, 21) + Me.picMAinfo_VorbereitetQs.TabIndex = 0 + Me.picMAinfo_VorbereitetQs.TabStop = False + ' 'Panel8 ' Me.Panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -1653,12 +1731,13 @@ Partial Class usrcntlAktDetails ' 'conMenuVermerke ' - Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder}) + Me.conMenuVermerke.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.conVermerkLöschen, Me.HervorhebenToolStripMenuItem, Me.ToolUeberweisungsBeleg, Me.toolVkReminder, Me.MitarbeiterAnzeigenToolStripMenuItem}) Me.conMenuVermerke.Name = "conMenuVermerke" - Me.conMenuVermerke.Size = New System.Drawing.Size(244, 92) + Me.conMenuVermerke.Size = New System.Drawing.Size(244, 114) ' 'conVermerkLöschen ' + Me.conVermerkLöschen.Image = Global.AVISO.My.Resources.Resources.del Me.conVermerkLöschen.Name = "conVermerkLöschen" Me.conVermerkLöschen.Size = New System.Drawing.Size(243, 22) Me.conVermerkLöschen.Text = "Vermerk löschen" @@ -1685,6 +1764,13 @@ Partial Class usrcntlAktDetails Me.toolVkReminder.Text = "VK: Reminder geschickt" Me.toolVkReminder.Visible = False ' + 'MitarbeiterAnzeigenToolStripMenuItem + ' + Me.MitarbeiterAnzeigenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s + Me.MitarbeiterAnzeigenToolStripMenuItem.Name = "MitarbeiterAnzeigenToolStripMenuItem" + Me.MitarbeiterAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(243, 22) + Me.MitarbeiterAnzeigenToolStripMenuItem.Text = "Mitarbeiter anzeigen" + ' 'cntxtFormulare ' Me.cntxtFormulare.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DispolisteTRToolStripMenuItem, Me.DispolisteENToolStripMenuItem}) @@ -1826,6 +1912,10 @@ Partial Class usrcntlAktDetails Me.pnlVermerkeTop.PerformLayout() Me.Panel1.ResumeLayout(False) Me.tbcntlVermerke.ResumeLayout(False) + Me.pnlMAInfo.ResumeLayout(False) + Me.pnlMAInfo.PerformLayout() + CType(Me.picMAinfo_Vorgeschrieben, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.picMAinfo_VorbereitetQs, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel8.ResumeLayout(False) Me.Panel8.PerformLayout() Me.pnlAbgeschlossen.ResumeLayout(False) @@ -1966,4 +2056,10 @@ Partial Class usrcntlAktDetails Friend WithEvents ToolUeberweisungsBeleg As ToolStripMenuItem Friend WithEvents toolVkReminder As ToolStripMenuItem Friend WithEvents picArrowDown As PictureBox + Friend WithEvents pnlMAInfo As Panel + Friend WithEvents txtMAinfo_Vorgeschrieben As TextBox + Friend WithEvents picMAinfo_Vorgeschrieben As PictureBox + Friend WithEvents txtMAinfo_VorbereitetQs As TextBox + Friend WithEvents picMAinfo_VorbereitetQs As PictureBox + Friend WithEvents MitarbeiterAnzeigenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index a09c7f9..17d2973 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -344,6 +344,7 @@ Public Class usrcntlAktDetails .Columns("Hinweis_Vermerk").Visible = False 'Hinweis_Vermerk nicht anzeigen .Columns("tblSnd_Empfaenger").Visible = False 'tblSnd_Empfaengernicht anzeigen .Columns("Hervorheben").Visible = False 'tblSnd_Empfaengernicht anzeigen + .Columns("VorauskasseId").Visible = False 'tblSnd_Empfaengernicht anzeigen .Columns("Datum").Width = 125 '110 .Columns("Datum").HeaderText = "Datum" @@ -627,6 +628,10 @@ Public Class usrcntlAktDetails Private Sub Vermerke_anzeigen(Optional rowindex As Integer = -1) If Not loaded Then Exit Sub + + picArrowDown.Visible = False + + aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick) gridVermerke.Columns.Clear() lblInfoAviso.Visible = False @@ -634,7 +639,7 @@ Public Class usrcntlAktDetails ' If setAkive_AuswahlID() = -1 Then Exit Sub If AvisoID <= 0 Then Exit Sub - + pnlMAInfo.Visible = False Button18.Visible = False Select Case tbcntlVermerke.SelectedIndex Case 0, 1, 2 : Vermerke_anzeigen2(rowindex) @@ -690,7 +695,6 @@ Public Class usrcntlAktDetails End With End Select - ArrowDown_ShowHide() End Sub @@ -727,13 +731,58 @@ Public Class usrcntlAktDetails ' End If Case 2 + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + picMAinfo_VorbereitetQs.BackgroundImage = My.Resources.statusBtn_vorbereitet_InAktiv + txtMAinfo_VorbereitetQs.Text = "-" + txtMAinfo_VorbereitetQs.Tag = "" + + picMAinfo_Vorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_InAktiv + txtMAinfo_Vorgeschrieben.Text = "-" + txtMAinfo_Vorgeschrieben.Tag = "" + If dgvSendungen.SelectedRows.Count > 0 Then sendwhere = " AND VermerkArt='S' AND SendungID=" & dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value + + + '--------------------------------------------------------- + 'MA INFO + '--------------------------------------------------------- + 'Vorbereitet + pnlMAInfo.Visible = True + If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then + picMAinfo_VorbereitetQs.BackgroundImage = My.Resources.statusBtn_vorbereitet_Aktiv + txtMAinfo_VorbereitetQs.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_QS_MA").Value & "'", "ADMIN", "-") + txtMAinfo_VorbereitetQs.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_QS_MA").Value + End If + '--------------------------------------------------------- + 'Vorgeschrieben + pnlMAInfo.Visible = True + If dgvSendungen.SelectedRows(0).Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then + picMAinfo_Vorgeschrieben.BackgroundImage = My.Resources.statusBtn_vorgeschrieben_Aktiv + txtMAinfo_Vorgeschrieben.Text = SQL.DLookup("mit_username", "tblMitarbeiter", "mit_id='" & dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value & "'", "ADMIN", "-") + txtMAinfo_Vorgeschrieben.Tag = dgvSendungen.SelectedRows(0).Cells("tblSnd_VG_MA").Value + End If + '--------------------------------------------------------- Else sendwhere = " AND 1=0 " ' 1=0, damit keine Zeile angezeigt wird, wenn keine Sendung ausgewählt End If + If gridVermerke.Columns("tblSnd_PosUnterNr") IsNot Nothing Then gridVermerke.Columns("tblSnd_PosUnterNr").Visible = True + + 'If r.Cells("tblSnd_Vorbereitet").Value IsNot DBNull.Value Then + ' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorbereitet_Aktiv + ' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")" + 'Else + ' DirectCast(r.Cells("StatusVorbereitetQS"), DataGridViewImageCell).ToolTipText = "Status 'Vorbereitet-QS' eintragen" + 'End If + 'If r.Cells("tblSnd_Vorgeschrieben").Value IsNot DBNull.Value Then + ' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).Value = My.Resources.statusBtn_vorgeschrieben_Aktiv + ' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' entfernen" & vbNewLine & "(" & r.Cells("tblSnd_Vorgeschrieben").Value & ")" + 'Else + ' DirectCast(r.Cells("StatusVorgeschrieben"), DataGridViewImageCell).ToolTipText = "Status 'Vorgeschrieben' eintragen" + 'End If End Select End If @@ -742,7 +791,7 @@ Public Class usrcntlAktDetails Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben," & - " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter]" & + " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId" & " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & " WHERE AvisoID = " & AvisoID & " " & sendwhere & " " & @@ -847,6 +896,9 @@ Public Class usrcntlAktDetails Case "13" myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 14 + If gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then + myVermerk.VorauskasseId = gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value + End If Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() @@ -930,8 +982,20 @@ Public Class usrcntlAktDetails Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + Case "80" + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("folgt", "erhalten") + myVermerk.VermerkCodeId = 81 + Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) + VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) + init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() - + 'Ankunft + If vbYes = MsgBox("Soll der LKW auf Status 'ANKUNFT' gesetzt werden?", vbYesNoCancel) Then + If FUNC.setAnkunft(AvisoID) Then + frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) + End If + End If End Select loaded = False ' Dim tmpIndex = -1 @@ -1000,9 +1064,17 @@ Public Class usrcntlAktDetails optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." End If Case 13 - If Not existCodeInGridVermerke(14) And Not existCodeInGridVermerke(59) Then - optionCell.Value = "Vorauskasse erhalten" - optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." + If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then + + If Not existCodeInGridVermerke_VK(r.Cells("VorauskasseId").Value) Then + optionCell.Value = "Vorauskasse erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." + End If + Else + If Not existCodeInGridVermerke_VK_OLD(r.Cells("SendungID").Value) Then + optionCell.Value = "Vorauskasse erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." + End If End If Case 17 If Not existCodeInGridVermerke(18) Then @@ -1061,13 +1133,19 @@ Public Class usrcntlAktDetails optionCell.Value = "Absend.best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." End If + + Case 80 + If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + optionCell.Value = "ATB-Nr. erhalten" + optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen." + End If End Select End If Next - + ' ArrowDown_ShowHide() 'Anzeigeproblem, wenn Aviso minimiert wird! --> Jetzt bei Timer! Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) @@ -1084,7 +1162,7 @@ Public Class usrcntlAktDetails For Each r As DataGridViewRow In gridVermerke.Rows If r.Displayed Then showFirst = True If showFirst Then - If r.Cells("Hervorheben").Value = "1" AndAlso Not r.Displayed Then + If (r.Cells("Hervorheben").Value = "1" Or r.Cells("VermerkeOptions").Value <> "") AndAlso Not r.Displayed Then picArrowDown.Visible = True End If End If @@ -1119,6 +1197,34 @@ Public Class usrcntlAktDetails End Function + Function existCodeInGridVermerke_VK(VorauskasseId As Object) As Boolean + + For Each r As DataGridViewRow In gridVermerke.Rows + Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "") + Case 14, 59 + If DirectCast(r.Cells("VorauskasseId"), DataGridViewTextBoxCell).Value.ToString = CStr(VorauskasseId) Then + Return True + End If + End Select + Next + Return False + End Function + + + Function existCodeInGridVermerke_VK_OLD(SendungID As Object) As Boolean + + For Each r As DataGridViewRow In gridVermerke.Rows + Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "") + Case 14, 59 + If DirectCast(r.Cells("SendungID"), DataGridViewTextBoxCell).Value.ToString = CStr(SendungID) Then + Return True + End If + End Select + Next + Return False + End Function + + Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkLöschen.Click @@ -1720,6 +1826,8 @@ Public Class usrcntlAktDetails If initDGVSendungenRows() Then timerSendRows.Enabled = False End If + ArrowDown_ShowHide() + End Sub 'Private Sub timerSendRows_Tick(sender As Object, e As EventArgs) Handles timerSendRows.Tick @@ -2732,7 +2840,7 @@ Public Class usrcntlAktDetails Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click Dim rpt As New rptQRAviso(AVISO) - Dim printer = "" 'SDL.cProgramFunctions.getDruckernameBySearch("INFO", True) + Dim printer = SDL.cProgramFunctions.getDruckernameBySearch("INFO", True) If printer <> "" Then SDL.cProgramFunctions.printRpt(rpt, printer, True) Else @@ -2762,9 +2870,9 @@ Public Class usrcntlAktDetails Dim SendungID_Tmp = gridVermerke.SelectedRows(0).Cells("SendungID").Value If sender Is toolVkReminder Then - AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78) + AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Reminder geschickt", 78,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value) ElseIf sender Is ToolUeberweisungsBeleg Then - AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79) + AvisoStatusFunctions.insertSendungsVermerk(SendungID_Tmp, AvisoId_Tmp, "VK: Überweisungsbeleg erhalten.", 79,, gridVermerke.SelectedRows(0).Cells("VorauskasseId").Value) End If Vermerke_anzeigen(index) @@ -2774,5 +2882,24 @@ Public Class usrcntlAktDetails Private Sub gridVermerke_Scroll(sender As Object, e As ScrollEventArgs) Handles gridVermerke.Scroll ArrowDown_ShowHide() End Sub + + Private Sub txtMAinfo_VorbereitetQs_TextChanged(sender As Object, e As EventArgs) Handles txtMAinfo_VorbereitetQs.Click, txtMAinfo_Vorgeschrieben.Click + If sender.tag IsNot DBNull.Value AndAlso sender.tag IsNot Nothing Then + If IsNumeric(sender.tag) Then + Dim f As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(sender.tag) + f.Show() + End If + End If + End Sub + + Private Sub MitarbeiterAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles MitarbeiterAnzeigenToolStripMenuItem.Click + If gridVermerke.SelectedRows.Count = 0 Then Exit Sub + If gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value Is DBNull.Value Then Exit Sub + If Not IsNumeric(gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value) Then Exit Sub + + Dim MA As New VERAG_PROG_ALLGEMEIN.frmMitarbeitersuche(gridVermerke.SelectedRows(0).Cells("MitarbeiterId").Value) + MA.Show() + + End Sub End Class diff --git a/AvisoTV/frmAnzeige.Designer.vb b/AvisoTV/frmAnzeige.Designer.vb index 8d52a76..1b53d52 100644 --- a/AvisoTV/frmAnzeige.Designer.vb +++ b/AvisoTV/frmAnzeige.Designer.vb @@ -34,16 +34,17 @@ Partial Class frmAnzeige Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAnzeige)) + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAnzeige)) - Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.gridAnkunft = New System.Windows.Forms.DataGridView() Me.colFertig = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colLKWNr = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -100,13 +101,10 @@ Partial Class frmAnzeige Me.Button3 = New System.Windows.Forms.Button() Me.Label11 = New System.Windows.Forms.Label() Me.Panel2 = New System.Windows.Forms.Panel() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblBigInfo2 = New System.Windows.Forms.Label() + Me.lblBigInfo = New System.Windows.Forms.Label() Me.grpTestAnzeige = New System.Windows.Forms.Panel() + Me.cbxGridLKWOK = New System.Windows.Forms.CheckBox() Me.Label24 = New System.Windows.Forms.Label() Me.txtBreiteGridLKWOK = New System.Windows.Forms.TextBox() Me.Label23 = New System.Windows.Forms.Label() @@ -123,9 +121,15 @@ Partial Class frmAnzeige Me.Button2 = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() Me.gridFertig = New System.Windows.Forms.DataGridView() - Me.cbxGridLKWOK = New System.Windows.Forms.CheckBox() Me.DataGridViewTextBoxColumn7 = New System.Windows.Forms.DataGridViewImageColumn() Me.DataGridViewTextBoxColumn8 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn9 = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.gridAnkunft, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picConnectionProblem, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.picVERAG, System.ComponentModel.ISupportInitialize).BeginInit() @@ -175,7 +179,7 @@ Partial Class frmAnzeige Me.gridAnkunft.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.gridAnkunft.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[True] Me.gridAnkunft.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAnkunft.Size = New System.Drawing.Size(826, 494) + Me.gridAnkunft.Size = New System.Drawing.Size(826, 493) Me.gridAnkunft.TabIndex = 1 Me.gridAnkunft.TabStop = False ' @@ -265,7 +269,7 @@ Partial Class frmAnzeige Me.lblZeit.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.lblZeit.Font = New System.Drawing.Font("Arial", 32.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblZeit.ForeColor = System.Drawing.Color.White - Me.lblZeit.Location = New System.Drawing.Point(0, -1) + Me.lblZeit.Location = New System.Drawing.Point(0, 0) Me.lblZeit.Name = "lblZeit" Me.lblZeit.Size = New System.Drawing.Size(352, 108) Me.lblZeit.TabIndex = 0 @@ -274,7 +278,7 @@ Partial Class frmAnzeige ' 'lblZeile1 ' - Me.lblZeile1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Me.lblZeile1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblZeile1.BackColor = System.Drawing.Color.White Me.lblZeile1.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -289,7 +293,7 @@ Partial Class frmAnzeige ' 'lblZeile2 ' - Me.lblZeile2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Me.lblZeile2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblZeile2.BackColor = System.Drawing.Color.White Me.lblZeile2.Font = New System.Drawing.Font("Microsoft Sans Serif", 30.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -313,7 +317,7 @@ Partial Class frmAnzeige Me.lblSeite.Cursor = System.Windows.Forms.Cursors.Hand Me.lblSeite.Font = New System.Drawing.Font("Arial", 36.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblSeite.ForeColor = System.Drawing.Color.White - Me.lblSeite.Location = New System.Drawing.Point(1106, -1) + Me.lblSeite.Location = New System.Drawing.Point(1106, 0) Me.lblSeite.Name = "lblSeite" Me.lblSeite.Size = New System.Drawing.Size(146, 65) Me.lblSeite.TabIndex = 2 @@ -665,7 +669,7 @@ Partial Class frmAnzeige Me.lblAnzahl.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) Me.lblAnzahl.Font = New System.Drawing.Font("Arial", 28.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAnzahl.ForeColor = System.Drawing.Color.White - Me.lblAnzahl.Location = New System.Drawing.Point(1106, 60) + Me.lblAnzahl.Location = New System.Drawing.Point(1106, 61) Me.lblAnzahl.Name = "lblAnzahl" Me.lblAnzahl.Size = New System.Drawing.Size(146, 47) Me.lblAnzahl.TabIndex = 4 @@ -690,7 +694,7 @@ Partial Class frmAnzeige Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.picVERAG.BackColor = System.Drawing.Color.Transparent Me.picVERAG.Image = Global.AvisoTV.My.Resources.Resources.Verag_AG_Logopng - Me.picVERAG.Location = New System.Drawing.Point(359, 28) + Me.picVERAG.Location = New System.Drawing.Point(359, 29) Me.picVERAG.Name = "picVERAG" Me.picVERAG.Size = New System.Drawing.Size(741, 58) Me.picVERAG.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom @@ -775,89 +779,49 @@ Partial Class frmAnzeige ' Me.Panel2.BackColor = System.Drawing.Color.White Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.Panel2.Controls.Add(Me.lblZeile2) + Me.Panel2.Controls.Add(Me.lblBigInfo2) + Me.Panel2.Controls.Add(Me.lblBigInfo) Me.Panel2.Controls.Add(Me.lblZeile1) + Me.Panel2.Controls.Add(Me.lblZeile2) Me.Panel2.Controls.Add(Me.lblZeit) Me.Panel2.Controls.Add(Me.picVERAG) Me.Panel2.Controls.Add(Me.lblAnzahl) Me.Panel2.Controls.Add(Me.lblSeite) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel2.Location = New System.Drawing.Point(0, 515) + Me.Panel2.Location = New System.Drawing.Point(0, 514) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(1250, 109) + Me.Panel2.Size = New System.Drawing.Size(1250, 110) Me.Panel2.TabIndex = 3 ' - 'DataGridViewTextBoxColumn1 + 'lblBigInfo2 ' - DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter - DataGridViewCellStyle10.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.Black - Me.DataGridViewTextBoxColumn1.DefaultCellStyle = DataGridViewCellStyle10 - Me.DataGridViewTextBoxColumn1.HeaderText = "FERTIG/TAMAM" - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" - Me.DataGridViewTextBoxColumn1.ReadOnly = True - Me.DataGridViewTextBoxColumn1.Width = 140 + Me.lblBigInfo2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblBigInfo2.BackColor = System.Drawing.Color.Firebrick + Me.lblBigInfo2.Font = New System.Drawing.Font("Microsoft Sans Serif", 50.0!) + Me.lblBigInfo2.ForeColor = System.Drawing.Color.White + Me.lblBigInfo2.Location = New System.Drawing.Point(351, 54) + Me.lblBigInfo2.Name = "lblBigInfo2" + Me.lblBigInfo2.Size = New System.Drawing.Size(57, 52) + Me.lblBigInfo2.TabIndex = 37 + Me.lblBigInfo2.Text = "-" + Me.lblBigInfo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblBigInfo2.Visible = False ' - 'DataGridViewTextBoxColumn2 + 'lblBigInfo ' - DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter - DataGridViewCellStyle11.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Black - DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle11 - Me.DataGridViewTextBoxColumn2.HeaderText = "LKW-KENNZ. /PLAKA" - Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" - Me.DataGridViewTextBoxColumn2.ReadOnly = True - Me.DataGridViewTextBoxColumn2.Width = 400 - ' - 'DataGridViewTextBoxColumn3 - ' - DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter - DataGridViewCellStyle12.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black - Me.DataGridViewTextBoxColumn3.DefaultCellStyle = DataGridViewCellStyle12 - Me.DataGridViewTextBoxColumn3.HeaderText = "ANKUNFT/GELIS" - Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" - Me.DataGridViewTextBoxColumn3.ReadOnly = True - Me.DataGridViewTextBoxColumn3.Width = 300 - ' - 'DataGridViewTextBoxColumn4 - ' - DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter - DataGridViewCellStyle13.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle13.SelectionForeColor = System.Drawing.Color.Black - Me.DataGridViewTextBoxColumn4.DefaultCellStyle = DataGridViewCellStyle13 - Me.DataGridViewTextBoxColumn4.HeaderText = "DAUER/SÜRE" - Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" - Me.DataGridViewTextBoxColumn4.ReadOnly = True - Me.DataGridViewTextBoxColumn4.Width = 200 - ' - 'DataGridViewTextBoxColumn5 - ' - DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle14.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle14.SelectionForeColor = System.Drawing.Color.Black - Me.DataGridViewTextBoxColumn5.DefaultCellStyle = DataGridViewCellStyle14 - Me.DataGridViewTextBoxColumn5.HeaderText = "BEARBEITER/GÖREVLI" - Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" - Me.DataGridViewTextBoxColumn5.ReadOnly = True - Me.DataGridViewTextBoxColumn5.Width = 500 - ' - 'DataGridViewTextBoxColumn6 - ' - Me.DataGridViewTextBoxColumn6.HeaderText = "BÜRO" - Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" - Me.DataGridViewTextBoxColumn6.ReadOnly = True - Me.DataGridViewTextBoxColumn6.Visible = False + Me.lblBigInfo.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblBigInfo.BackColor = System.Drawing.Color.Firebrick + Me.lblBigInfo.Font = New System.Drawing.Font("Microsoft Sans Serif", 50.0!) + Me.lblBigInfo.ForeColor = System.Drawing.Color.White + Me.lblBigInfo.Location = New System.Drawing.Point(351, 2) + Me.lblBigInfo.Name = "lblBigInfo" + Me.lblBigInfo.Size = New System.Drawing.Size(57, 52) + Me.lblBigInfo.TabIndex = 36 + Me.lblBigInfo.Text = "-" + Me.lblBigInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.lblBigInfo.Visible = False ' 'grpTestAnzeige ' @@ -921,6 +885,16 @@ Partial Class frmAnzeige Me.grpTestAnzeige.TabIndex = 35 Me.grpTestAnzeige.Visible = False ' + 'cbxGridLKWOK + ' + Me.cbxGridLKWOK.AutoSize = True + Me.cbxGridLKWOK.Location = New System.Drawing.Point(17, 249) + Me.cbxGridLKWOK.Name = "cbxGridLKWOK" + Me.cbxGridLKWOK.Size = New System.Drawing.Size(119, 17) + Me.cbxGridLKWOK.TabIndex = 100 + Me.cbxGridLKWOK.Text = "LKW-Fertig sichtbar" + Me.cbxGridLKWOK.UseVisualStyleBackColor = True + ' 'Label24 ' Me.Label24.AutoSize = True @@ -1071,30 +1045,29 @@ Partial Class frmAnzeige ' Me.gridFertig.AllowUserToAddRows = False Me.gridFertig.AllowUserToDeleteRows = False - DataGridViewCellStyle15.BackColor = System.Drawing.Color.Empty - DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridFertig.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15 + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridFertig.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridFertig.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCellsExceptHeaders Me.gridFertig.BackgroundColor = System.Drawing.Color.MintCream Me.gridFertig.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.[Single] - DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle16.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle16.Font = New System.Drawing.Font("Tahoma", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridFertig.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle16 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle11.Font = New System.Drawing.Font("Tahoma", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridFertig.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.gridFertig.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.gridFertig.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn7, Me.DataGridViewTextBoxColumn8}) - DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle19.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - DataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.MintCream - DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridFertig.DefaultCellStyle = DataGridViewCellStyle19 + DataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + DataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.MintCream + DataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridFertig.DefaultCellStyle = DataGridViewCellStyle14 Me.gridFertig.Dock = System.Windows.Forms.DockStyle.Left Me.gridFertig.GridColor = System.Drawing.Color.MintCream Me.gridFertig.Location = New System.Drawing.Point(0, 21) @@ -1102,34 +1075,24 @@ Partial Class frmAnzeige Me.gridFertig.Name = "gridFertig" Me.gridFertig.ReadOnly = True Me.gridFertig.RowHeadersVisible = False - DataGridViewCellStyle20.BackColor = System.Drawing.Color.MintCream - DataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.White - DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridFertig.RowsDefaultCellStyle = DataGridViewCellStyle20 + DataGridViewCellStyle15.BackColor = System.Drawing.Color.MintCream + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.Color.White + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridFertig.RowsDefaultCellStyle = DataGridViewCellStyle15 Me.gridFertig.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[True] Me.gridFertig.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridFertig.Size = New System.Drawing.Size(424, 494) + Me.gridFertig.Size = New System.Drawing.Size(424, 493) Me.gridFertig.TabIndex = 36 Me.gridFertig.TabStop = False ' - 'cbxGridLKWOK - ' - Me.cbxGridLKWOK.AutoSize = True - Me.cbxGridLKWOK.Location = New System.Drawing.Point(17, 249) - Me.cbxGridLKWOK.Name = "cbxGridLKWOK" - Me.cbxGridLKWOK.Size = New System.Drawing.Size(119, 17) - Me.cbxGridLKWOK.TabIndex = 100 - Me.cbxGridLKWOK.Text = "LKW-Fertig sichtbar" - Me.cbxGridLKWOK.UseVisualStyleBackColor = True - ' 'DataGridViewTextBoxColumn7 ' - DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter - DataGridViewCellStyle17.BackColor = System.Drawing.Color.MintCream - DataGridViewCellStyle17.NullValue = CType(resources.GetObject("DataGridViewCellStyle17.NullValue"), Object) - DataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.MintCream - DataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.Black - Me.DataGridViewTextBoxColumn7.DefaultCellStyle = DataGridViewCellStyle17 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle12.BackColor = System.Drawing.Color.MintCream + DataGridViewCellStyle12.NullValue = CType(resources.GetObject("DataGridViewCellStyle12.NullValue"), Object) + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.MintCream + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn7.DefaultCellStyle = DataGridViewCellStyle12 Me.DataGridViewTextBoxColumn7.HeaderText = "" Me.DataGridViewTextBoxColumn7.Image = Global.AvisoTV.My.Resources.Resources.okRound Me.DataGridViewTextBoxColumn7.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom @@ -1142,17 +1105,103 @@ Partial Class frmAnzeige 'DataGridViewTextBoxColumn8 ' Me.DataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle18.BackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle18.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) - DataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.LightGreen - DataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.Black - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridViewTextBoxColumn8.DefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.Padding = New System.Windows.Forms.Padding(10, 0, 0, 0) + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.Color.Black + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridViewTextBoxColumn8.DefaultCellStyle = DataGridViewCellStyle13 Me.DataGridViewTextBoxColumn8.HeaderText = "LKW-KENNZ. /PLAKA" Me.DataGridViewTextBoxColumn8.Name = "DataGridViewTextBoxColumn8" Me.DataGridViewTextBoxColumn8.ReadOnly = True + Me.DataGridViewTextBoxColumn8.Visible = False + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle16.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn1.DefaultCellStyle = DataGridViewCellStyle16 + Me.DataGridViewTextBoxColumn1.HeaderText = "FERTIG/TAMAM" + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + Me.DataGridViewTextBoxColumn1.ReadOnly = True + ' + 'DataGridViewTextBoxColumn2 + ' + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle17.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.Color.Black + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.DataGridViewTextBoxColumn2.DefaultCellStyle = DataGridViewCellStyle17 + Me.DataGridViewTextBoxColumn2.HeaderText = "LKW-KENNZ. /PLAKA" + Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" + Me.DataGridViewTextBoxColumn2.ReadOnly = True + Me.DataGridViewTextBoxColumn2.Width = 400 + ' + 'DataGridViewTextBoxColumn3 + ' + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle18.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn3.DefaultCellStyle = DataGridViewCellStyle18 + Me.DataGridViewTextBoxColumn3.HeaderText = "ANKUNFT/GELIS" + Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" + Me.DataGridViewTextBoxColumn3.ReadOnly = True + Me.DataGridViewTextBoxColumn3.Width = 300 + ' + 'DataGridViewTextBoxColumn4 + ' + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter + DataGridViewCellStyle19.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 27.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn4.DefaultCellStyle = DataGridViewCellStyle19 + Me.DataGridViewTextBoxColumn4.HeaderText = "DAUER/SÜRE" + Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + Me.DataGridViewTextBoxColumn4.ReadOnly = True + Me.DataGridViewTextBoxColumn4.Width = 200 + ' + 'DataGridViewTextBoxColumn5 + ' + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle20.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn5.DefaultCellStyle = DataGridViewCellStyle20 + Me.DataGridViewTextBoxColumn5.HeaderText = "BEARBEITER/GÖREVLI" + Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" + Me.DataGridViewTextBoxColumn5.ReadOnly = True + Me.DataGridViewTextBoxColumn5.Width = 500 + ' + 'DataGridViewTextBoxColumn6 + ' + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.LightGreen + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black + Me.DataGridViewTextBoxColumn6.DefaultCellStyle = DataGridViewCellStyle21 + Me.DataGridViewTextBoxColumn6.HeaderText = "BÜRO" + Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" + Me.DataGridViewTextBoxColumn6.ReadOnly = True + Me.DataGridViewTextBoxColumn6.Visible = False + Me.DataGridViewTextBoxColumn6.Width = 500 + ' + 'DataGridViewTextBoxColumn9 + ' + Me.DataGridViewTextBoxColumn9.HeaderText = "ART" + Me.DataGridViewTextBoxColumn9.Name = "DataGridViewTextBoxColumn9" + Me.DataGridViewTextBoxColumn9.Visible = False ' 'frmAnzeige ' @@ -1266,4 +1315,7 @@ Partial Class frmAnzeige Friend WithEvents cbxGridLKWOK As CheckBox Friend WithEvents DataGridViewTextBoxColumn7 As DataGridViewImageColumn Friend WithEvents DataGridViewTextBoxColumn8 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn9 As DataGridViewTextBoxColumn + Friend WithEvents lblBigInfo As Label + Friend WithEvents lblBigInfo2 As Label End Class diff --git a/AvisoTV/frmAnzeige.resx b/AvisoTV/frmAnzeige.resx index 4bca586..4349613 100644 --- a/AvisoTV/frmAnzeige.resx +++ b/AvisoTV/frmAnzeige.resx @@ -145,7 +145,7 @@ True - + Qk32AgAAAAAAADYAAAAoAAAADgAAABAAAAABABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEgoTGw8bGw8bGw8bGw8bGw8bGw8bG diff --git a/AvisoTV/frmAnzeige.vb b/AvisoTV/frmAnzeige.vb index b91773d..ed2ba48 100644 --- a/AvisoTV/frmAnzeige.vb +++ b/AvisoTV/frmAnzeige.vb @@ -12,6 +12,7 @@ Imports AvisoTV.cUserSettings Public Class frmAnzeige Dim cptmp As Point Dim displayZeilen As Boolean = False + Dim displayZeilenBIG As Boolean = False Private AvisoDAL As New cAvisoDAL Private VermerkeDAL As New cVermerkeDAL Private locZeilen As Integer = -1 @@ -62,8 +63,11 @@ Public Class frmAnzeige ' Cursor.Position = Me.PointToScreen(New Point(Me.Width, Me.Height)) Me.CenterToScreen() + + 'TEST + StandortATILLA = False - + Me.Left = 0 Me.Top = 0 Me.Width = 1920 @@ -71,7 +75,7 @@ Public Class frmAnzeige Me.Text += " " & Application.ProductVersion - + 'Falls kein File vorhanden, dann werden alle angezeigt If Standort = "" Then @@ -97,7 +101,7 @@ Public Class frmAnzeige Panel1.BackColor = Color.FromArgb(0, 54, 128) lblZeit.BackColor = Color.FromArgb(0, 54, 128) - lblAnzahl.BackColor = Color.FromArgb(0, 54, 128) + lblAnzahl.BackColor = Color.FromArgb(0, 54, 128) lblSeite.BackColor = Color.FromArgb(0, 54, 128) Label11.ForeColor = Color.White lblZeit.ForeColor = Color.White @@ -280,7 +284,7 @@ Public Class frmAnzeige 'Max_Seiten = (Anzahl_alle Mod 8) + 1 - timerRemove.enabled = True + timerRemove.Enabled = True contrnamecnt = 0 Dim anz As Integer = 0 Try @@ -404,11 +408,11 @@ Public Class frmAnzeige anz += 1 Dim LKW_Nr As String = VarToStr(dr.Item("LKW_Nr")) gridFertig.Rows.Add(My.Resources.okRound, LKW_Nr) - End While End If dr.Close() End Using + Catch ex As Exception MsgBox("ERR: " & ex.Message & ex.StackTrace) End Try @@ -420,17 +424,60 @@ Public Class frmAnzeige lblSeite.Text = "0/0" End If + Dim Special = "" + Select Case Now.DayOfWeek + Case DayOfWeek.Monday : Special = "MO" + Case DayOfWeek.Tuesday : Special = "DI" + Case DayOfWeek.Wednesday : Special = "MI" + Case DayOfWeek.Thursday : Special = "DO" + Case DayOfWeek.Friday : Special = "FR" + Case DayOfWeek.Saturday : Special = "SA" + Case DayOfWeek.Sunday : Special = "SO" + End Select + + 'If Now.Day = 24 And Now.Month = 12 Then + ' Special = "CHRISTMAS" + 'End If + 'If Now.Day = 1 And Now.Month = 1 Then + ' Special = "NEWYEAR" + 'End If + 'Infotext auslesen Dim AvisoTVDAL As New cAvisoTVDAL - Dim AvisoTV As New cAvisoTV - AvisoTV = AvisoTVDAL.LesenAvisoTV(1, "") + Dim AvisoTV As cAvisoTV = AvisoTVDAL.LesenAvisoTV(-1, "", Standort, Special) + + Dim lblBigInfoVisible = False + lblBigInfo.Visible = False displayZeilen = False + displayZeilenBIG = False + Dim Panel2Height = 109 If Not IsNothing(AvisoTV) Then - ' MsgBox(lblZeile1.Text) - displayZeilen = True - lblZeile1.Text = AvisoTV.FixeZeile1.Trim - lblZeile2.Text = AvisoTV.FixeZeile2.Trim + Select Case AvisoTV.Art + Case "INFO" + Panel2Height = 109 + lblZeile1.Text = AvisoTV.FixeZeile1.Trim + lblZeile2.Text = AvisoTV.FixeZeile2.Trim + displayZeilen = True + Case "BIG" + Panel2Height = 310 + displayZeilenBIG = True + + lblBigInfoVisible = True + lblBigInfo2.Text = AvisoTV.FixeZeile2.Trim + lblBigInfo2.Padding = New Padding(0, 0, 0, 20) + lblBigInfo2.Dock = DockStyle.Top + lblBigInfo2.Height = 100 + lblBigInfoVisible = True + lblBigInfo.Text = AvisoTV.FixeZeile1.Trim + lblBigInfo.Padding = New Padding(0, 20, 0, 0) + lblBigInfo.Dock = DockStyle.Top + lblBigInfo.Height = 100 + + End Select End If + Panel2.Height = Panel2Height + lblBigInfo2.Visible = lblBigInfoVisible + lblBigInfo.Visible = lblBigInfoVisible lblZeit.Text = Format(Now, "dd.MM. HH:mm:ss") @@ -491,6 +538,9 @@ Public Class frmAnzeige End Sub Private Sub Timer1_Tick(sender As System.Object, e As System.EventArgs) Handles Timer1.Tick + + initZeilenWerte() + lblZeit.Text = Format(Now, "dd.MM. HH:mm:ss") lblZeit.Refresh() If DateDiff(DateInterval.Second, hMerkZeit, Now) > Sekunden Then 'aktualisieren alle xx Sekunden @@ -505,12 +555,23 @@ Public Class frmAnzeige ' MsgBox("now") If (lblZeile1.Text & lblZeile1.Text).Trim = String.Empty Then displayZeilen = False : 'wenn alles leer - If displayZeilen Then - lblZeile1.Visible = Not lblZeile1.Visible - lblZeile2.Visible = Not lblZeile2.Visible - Else + + If displayZeilenBIG Then + lblBigInfo.Visible = True + lblBigInfo2.Visible = True lblZeile1.Visible = False lblZeile2.Visible = False + Else + lblBigInfo.Visible = False + lblBigInfo2.Visible = False + + If displayZeilen Then + lblZeile1.Visible = Not lblZeile1.Visible + lblZeile2.Visible = Not lblZeile2.Visible + Else + lblZeile1.Visible = False + lblZeile2.Visible = False + End If End If End If @@ -634,6 +695,7 @@ Public Class frmAnzeige gridAnkunft.Columns(4).DefaultCellStyle.Font = Font5 gridFertig.Columns(1).DefaultCellStyle.Font = Font_LkwOK_LKWNr + gridFertig.Columns(1).Visible = True If StandortATILLA And gridAnkunft.Columns("clmnBuero") IsNot Nothing Then @@ -673,13 +735,8 @@ Public Class frmAnzeige End Sub Sub initZeilen() - ' MsgBox(gridAnkunft.Rows(0).Cells(0).Size.Height) - If gridAnkunft.RowCount > 0 Then - ZeilenStandard = CInt(gridAnkunft.Height / gridAnkunft.Rows(0).Cells(0).Size.Height) - 1 - Else - ZeilenStandard = 8 - End If - Max_Zeilen = ZeilenStandard + initZeilenWerte() + 'MsgBox(ZeilenStandard) Aktive_Seite = 0 Merk_Ankunftsdatum = LeerDatum @@ -687,6 +744,17 @@ Public Class frmAnzeige End Sub + Sub initZeilenWerte() + If gridAnkunft.RowCount > 0 Then + ZeilenStandard = CInt(gridAnkunft.Height / gridAnkunft.Rows(0).Cells(0).Size.Height) - 1 + Else + ZeilenStandard = 8 + End If + Max_Zeilen = ZeilenStandard + + End Sub + + Private Sub btnTestAnzeige_Click(sender As System.Object, e As System.EventArgs) Handles btnTestAnzeige.Click isloaded = False initSettings()