From ef3ede6132fad3650c4fd0a19c2008efeca8d8fa Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Tue, 26 May 2026 15:28:33 +0200 Subject: [PATCH] Ankunftsanzeige, Lieferantenrechnungen MDM --- .../usrCntlATLAS_AnkunftsAnzeige.Designer.vb | 27 +++++ .../usrCntlATLAS_AnkunftsAnzeige.vb | 37 ++++-- SDL/mdm/usrcntlFremdrechnungen.vb | 113 ++++++++++-------- 3 files changed, 114 insertions(+), 63 deletions(-) diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb index bfaf998d..32a88c05 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.Designer.vb @@ -45,6 +45,7 @@ Partial Class usrCntlATLAS_AnkunftsAnzeige Me.txtDyNiederlassung = New System.Windows.Forms.Label() Me.MenuStrip = New System.Windows.Forms.MenuStrip() Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.txtWO_ID = New VERAG_PROG_ALLGEMEIN.MyTextBox() CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer.Panel1.SuspendLayout() Me.SplitContainer.Panel2.SuspendLayout() @@ -74,6 +75,7 @@ Partial Class usrCntlATLAS_AnkunftsAnzeige 'SplitContainer.Panel2 ' Me.SplitContainer.Panel2.BackColor = System.Drawing.Color.White + Me.SplitContainer.Panel2.Controls.Add(Me.txtWO_ID) Me.SplitContainer.Panel2.Controls.Add(Me.txtWarenort) Me.SplitContainer.Panel2.Controls.Add(Me.Label3) Me.SplitContainer.Panel2.Controls.Add(Me.txtMRN) @@ -343,6 +345,30 @@ Partial Class usrCntlATLAS_AnkunftsAnzeige Me.OptionenToolStripMenuItem.Size = New System.Drawing.Size(69, 20) Me.OptionenToolStripMenuItem.Text = "Optionen" ' + 'txtWO_ID + ' + Me.txtWO_ID._DateTimeOnly = False + Me.txtWO_ID._numbersOnly = False + Me.txtWO_ID._numbersOnlyKommastellen = "" + Me.txtWO_ID._numbersOnlyTrennzeichen = True + Me.txtWO_ID._Prozent = False + Me.txtWO_ID._ShortDateNew = False + Me.txtWO_ID._ShortDateOnly = False + Me.txtWO_ID._TimeOnly = False + Me.txtWO_ID._TimeOnly_Seconds = False + Me.txtWO_ID._value = "" + Me.txtWO_ID._Waehrung = False + Me.txtWO_ID._WaehrungZeichen = True + Me.txtWO_ID.Enabled = False + Me.txtWO_ID.ForeColor = System.Drawing.Color.Black + Me.txtWO_ID.Location = New System.Drawing.Point(447, 94) + Me.txtWO_ID.MaxLineLength = -1 + Me.txtWO_ID.MaxLines_Warning = "" + Me.txtWO_ID.MaxLines_Warning_Label = Nothing + Me.txtWO_ID.Name = "txtWO_ID" + Me.txtWO_ID.Size = New System.Drawing.Size(42, 20) + Me.txtWO_ID.TabIndex = 18 + ' 'usrCntlATLAS_AnkunftsAnzeige ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -389,4 +415,5 @@ Partial Class usrCntlATLAS_AnkunftsAnzeige Friend WithEvents Label2 As Label Friend WithEvents txtWarenort As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents Label3 As Label + Friend WithEvents txtWO_ID As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb index f3bfda99..7a4cafb3 100644 --- a/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb +++ b/SDL/ZOLLSYSTEM/DAKOSY/ATLAS/Verwahrung/usrCntlATLAS_AnkunftsAnzeige.vb @@ -261,19 +261,31 @@ Public Class usrCntlATLAS_AnkunftsAnzeige Dim firmaId As Integer = -1 Dim LKW_ID As String = "" + 'Select Case Standort + ' Case "Verag GmbH" + ' firmaId = 2 + ' Case "Verag AG" + ' firmaId = 1 + ' Case "Unisped GmbH" + ' firmaId = 21 + ' Case "AMBAR GmbH" + ' firmaId = 24 + ' Case "Verag CS" + ' firmaId = 11 + ' Case "IMEX" + ' firmaId = 20 + 'End Select + Select Case Standort - Case "Verag GmbH" - firmaId = 2 - Case "Verag AG" - firmaId = 1 - Case "Unisped GmbH" - firmaId = 21 - Case "AMBAR GmbH" - firmaId = 24 - Case "Verag CS" - firmaId = 11 - Case "IMEX" - firmaId = 20 + Case Sicherheiten_Standort.VERAG_GMBH : firmaId = 2 + Case Sicherheiten_Standort.AMBAR : firmaId = 24 + Case Sicherheiten_Standort.ATILLA : firmaId = 7 + Case Sicherheiten_Standort.VERAG_AG : firmaId = 1 + Case Sicherheiten_Standort.IMEX : firmaId = 20 + Case Sicherheiten_Standort.VERAG_CS : firmaId = 11 + Case Sicherheiten_Standort.UNISPED : firmaId = 21 + Case Sicherheiten_Standort.ZOLLERN : firmaId = 90 + Case Else End Select With OPEN_DUMMY @@ -378,6 +390,7 @@ Public Class usrCntlATLAS_AnkunftsAnzeige If valueREF <> "" Then Dim DAKOSY_REF As New cDakosy_Stammreferenzen(valueREF) If DAKOSY_REF IsNot Nothing Then + txtWO_ID.Text = DAKOSY_REF.dySr_WarenortID.ToString If DAKOSY_REF.dySr_WarenortID > 0 Then txtWarenort.Text = (New SQL).getValueTxtBySql("SELECT [wo_warenort] from [tblWarenorte] where [wo_id] = " & DAKOSY_REF.dySr_WarenortID, "AVISO") End If diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 3a7da0fe..7fd0f844 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -1,9 +1,6 @@ Imports System.IO Imports System.Reflection -Imports com.sun.tools.corba.se.idl Imports com.sun.xml.internal.rngom -Imports DocumentFormat.OpenXml.Drawing.Diagrams -Imports DocumentFormat.OpenXml.VariantTypes Imports MDM_Worker Imports Microsoft.Office.Interop Imports VERAG_PROG_ALLGEMEIN @@ -1511,22 +1508,25 @@ Public Class usrcntlFremdrechnungen End If - - Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value - If daId > 0 Then - Me.Cursor = Cursors.WaitCursor - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - DS.OPEN_SINGLE() + If Not IsDBNull(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) AndAlso IsNumeric(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) Then + Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value + If daId > 0 Then + Me.Cursor = Cursors.WaitCursor + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + DS.OPEN_SINGLE() + End If End If + Case Else - - Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value - If daId > 0 Then - Me.Cursor = Cursors.WaitCursor - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - DS.OPEN_SINGLE() + If Not IsDBNull(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) AndAlso IsNumeric(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) Then + Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value + If daId > 0 Then + Me.Cursor = Cursors.WaitCursor + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + DS.OPEN_SINGLE() + End If End If End Select @@ -1535,12 +1535,13 @@ Public Class usrcntlFremdrechnungen Select Case aktLieferant Case "RMC" - - Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("RE_Anhang_daid").Value - If daId > 0 Then - Me.Cursor = Cursors.WaitCursor - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) - DS.OPEN_SINGLE() + If Not IsDBNull(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) AndAlso IsNumeric(dgvLFRechnung.Rows(e.RowIndex).Cells("daId").Value) Then + Dim daId = dgvLFRechnung.Rows(e.RowIndex).Cells("RE_Anhang_daid").Value + If daId > 0 Then + Me.Cursor = Cursors.WaitCursor + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(daId) + DS.OPEN_SINGLE() + End If End If End Select @@ -1640,47 +1641,57 @@ Public Class usrcntlFremdrechnungen cast(case when [daId] is not null then 1 else 0 end as bit) as PDFvorhanden,cast(isnull(InvToCustomer, 0) as bit) as OrigRE ,[Country] as Land FROM [VERAG].[dbo].[tblIDSInvoicesNewSplittedByCountry] WHERE [TotalInvoiceId] = " & rechnugnsID & setSQLDetailWhere(aktLieferant, "Country") + Dim dtRechnugnsdet As DataTable = (New SQL).loadDgvBySql(sql, "FMZOLL") + If setDatatable Then - - Dim dtRechnugnsdet As DataTable = (New SQL).loadDgvBySql(sql, "FMZOLL") Return dtRechnugnsdet - End If + Dim imgGray = My.Resources.pdf_gray + Dim imgRed = My.Resources.pdf + + If Not dtRechnugnsdet.Columns.Contains("PDF_Image") Then + dtRechnugnsdet.Columns.Add("PDF_Image", GetType(Image)) + End If + + For Each row As DataRow In dtRechnugnsdet.Rows + + If Convert.ToBoolean(row("PDFvorhanden")) Then + row("PDF_Image") = imgRed + Else + row("PDF_Image") = imgGray + End If + + + Next With dgvDetails + .Columns.Clear() + .AutoGenerateColumns = True + .DataSource = dtRechnugnsdet + + ' ImageColumn hinzufügen + Dim c As New DataGridViewImageColumn With { + .Name = "PDF", + .HeaderText = "PDF", + .DataPropertyName = "PDF_Image", + .ImageLayout = DataGridViewImageCellLayout.Zoom, + .Width = 40 + } + + .Columns.Add(c) + .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells - .SET_SQL(sql, "FMZOLL") - .LOAD() .ClearSelection() - Dim c As New DataGridViewImageColumn - c.Name = "PDF" : c.HeaderText = "PDF" - c.DefaultCellStyle.NullValue = Nothing - c.ImageLayout = DataGridViewImageCellLayout.Zoom - c.Width = 40 - c.DefaultCellStyle.Padding = New Padding(2) - c.DefaultCellStyle.BackColor = Color.White - c.Image = My.Resources.pdf_gray - - - If Not .Columns.Contains("PDF") Then .Columns.Add(c) - - If .Columns.Count > 0 Then - - For Each r As DataGridViewRow In .Rows - - If IsDBNull(r.Cells("daId").Value) OrElse r.Cells("daId").Value = 0 Then - DirectCast(r.Cells("PDF"), DataGridViewImageCell).Value = My.Resources.pdf_gray - End If - - If .Columns.Contains("daId") Then - If .Columns("daId") IsNot Nothing Then .Columns("daId").Visible = False - End If - - Next + ' daId ausblenden + If .Columns.Contains("daId") Then + .Columns("daId").Visible = False + End If + If .Columns.Contains("PDF_Image") Then + .Columns("PDF_Image").Visible = False End If End With