diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index a3e6ccc3..3fba2a3a 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb index a0990917..ea8caa71 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.Designer.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.Designer.vb @@ -23,9 +23,9 @@ Partial Class usrcntlFremdrechnungen Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Me.DetailsAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Me.PDFHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FlowLayoutPanel = New System.Windows.Forms.FlowLayoutPanel() Me.btnSDL_Alle = New System.Windows.Forms.Button() Me.btnSDL_FREJUS = New System.Windows.Forms.Button() @@ -38,7 +38,11 @@ Partial Class usrcntlFremdrechnungen Me.btnSDL_RMC = New System.Windows.Forms.Button() Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.PDFLöschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RechnungsanhangHochladenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.RechnungsanhangloeschenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblCountMissingInvoices = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.Label9 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() @@ -68,8 +72,6 @@ Partial Class usrcntlFremdrechnungen Me.dgvLFRechnung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.dgvDetails = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel4 = New System.Windows.Forms.Panel() - Me.Label1 = New System.Windows.Forms.Label() - Me.lblCountMissingInvoices = New System.Windows.Forms.Label() Me.FlowLayoutPanel.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() Me.Panel1.SuspendLayout() @@ -83,12 +85,12 @@ Partial Class usrcntlFremdrechnungen Me.Panel4.SuspendLayout() Me.SuspendLayout() ' - 'DetailsAnzeigenToolStripMenuItem + 'PDFHochladenToolStripMenuItem ' - Me.DetailsAnzeigenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf - Me.DetailsAnzeigenToolStripMenuItem.Name = "DetailsAnzeigenToolStripMenuItem" - Me.DetailsAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(154, 22) - Me.DetailsAnzeigenToolStripMenuItem.Text = "PDF hochladen" + Me.PDFHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf + Me.PDFHochladenToolStripMenuItem.Name = "PDFHochladenToolStripMenuItem" + Me.PDFHochladenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) + Me.PDFHochladenToolStripMenuItem.Text = "PDF hochladen" ' 'FlowLayoutPanel ' @@ -268,17 +270,31 @@ Partial Class usrcntlFremdrechnungen ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DetailsAnzeigenToolStripMenuItem, Me.PDFLöschenToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PDFHochladenToolStripMenuItem, Me.PDFLöschenToolStripMenuItem, Me.RechnungsanhangHochladenToolStripMenuItem, Me.RechnungsanhangloeschenToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(155, 48) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(194, 92) ' 'PDFLöschenToolStripMenuItem ' Me.PDFLöschenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.del Me.PDFLöschenToolStripMenuItem.Name = "PDFLöschenToolStripMenuItem" - Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(154, 22) + Me.PDFLöschenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) Me.PDFLöschenToolStripMenuItem.Text = "PDF löschen" ' + 'RechnungsanhangHochladenToolStripMenuItem + ' + Me.RechnungsanhangHochladenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.pdf + Me.RechnungsanhangHochladenToolStripMenuItem.Name = "RechnungsanhangHochladenToolStripMenuItem" + Me.RechnungsanhangHochladenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) + Me.RechnungsanhangHochladenToolStripMenuItem.Text = "RE-Anhang hochladen" + ' + 'RechnungsanhangloeschenToolStripMenuItem + ' + Me.RechnungsanhangloeschenToolStripMenuItem.Image = Global.SDL.My.Resources.Resources.del + Me.RechnungsanhangloeschenToolStripMenuItem.Name = "RechnungsanhangloeschenToolStripMenuItem" + Me.RechnungsanhangloeschenToolStripMenuItem.Size = New System.Drawing.Size(193, 22) + Me.RechnungsanhangloeschenToolStripMenuItem.Text = "RE-Anhang löschen" + ' 'Panel1 ' Me.Panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -316,6 +332,27 @@ Partial Class usrcntlFremdrechnungen Me.Panel1.Size = New System.Drawing.Size(260, 907) Me.Panel1.TabIndex = 23 ' + 'lblCountMissingInvoices + ' + Me.lblCountMissingInvoices.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblCountMissingInvoices.BackColor = System.Drawing.Color.White + Me.lblCountMissingInvoices.Location = New System.Drawing.Point(173, 66) + Me.lblCountMissingInvoices.Name = "lblCountMissingInvoices" + Me.lblCountMissingInvoices.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblCountMissingInvoices.Size = New System.Drawing.Size(74, 13) + Me.lblCountMissingInvoices.TabIndex = 67 + Me.lblCountMissingInvoices.Text = "0" + Me.lblCountMissingInvoices.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(3, 66) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(116, 13) + Me.Label1.TabIndex = 66 + Me.Label1.Text = "fehlende Rechnungen:" + ' 'Label2 ' Me.Label2.AutoSize = True @@ -637,8 +674,8 @@ Partial Class usrcntlFremdrechnungen Me.dgvLFRechnung.AllowUserToDeleteRows = False Me.dgvLFRechnung.AllowUserToResizeColumns = False Me.dgvLFRechnung.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvLFRechnung.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvLFRechnung.BackgroundColor = System.Drawing.Color.White Me.dgvLFRechnung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvLFRechnung.Location = New System.Drawing.Point(4, 3) @@ -655,8 +692,8 @@ Partial Class usrcntlFremdrechnungen Me.dgvDetails.AllowUserToDeleteRows = False Me.dgvDetails.AllowUserToResizeColumns = False Me.dgvDetails.AllowUserToResizeRows = False - DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) - Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(245, Byte), Integer), CType(CType(255, Byte), Integer)) + Me.dgvDetails.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvDetails.BackgroundColor = System.Drawing.Color.White Me.dgvDetails.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvDetails.Location = New System.Drawing.Point(-1, 3) @@ -675,27 +712,6 @@ Partial Class usrcntlFremdrechnungen Me.Panel4.Size = New System.Drawing.Size(1356, 108) Me.Panel4.TabIndex = 11 ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(3, 66) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(116, 13) - Me.Label1.TabIndex = 66 - Me.Label1.Text = "fehlende Rechnungen:" - ' - 'lblCountMissingInvoices - ' - Me.lblCountMissingInvoices.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblCountMissingInvoices.BackColor = System.Drawing.Color.White - Me.lblCountMissingInvoices.Location = New System.Drawing.Point(173, 66) - Me.lblCountMissingInvoices.Name = "lblCountMissingInvoices" - Me.lblCountMissingInvoices.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.lblCountMissingInvoices.Size = New System.Drawing.Size(74, 13) - Me.lblCountMissingInvoices.TabIndex = 67 - Me.lblCountMissingInvoices.Text = "0" - Me.lblCountMissingInvoices.TextAlign = System.Drawing.ContentAlignment.TopRight - ' 'usrcntlFremdrechnungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -720,7 +736,7 @@ Partial Class usrcntlFremdrechnungen Me.ResumeLayout(False) End Sub - Friend WithEvents DetailsAnzeigenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem + Friend WithEvents PDFHochladenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents FlowLayoutPanel As System.Windows.Forms.FlowLayoutPanel Friend WithEvents btnSDL_Alle As System.Windows.Forms.Button Friend WithEvents btnSDL_IDS As System.Windows.Forms.Button @@ -765,4 +781,6 @@ Partial Class usrcntlFremdrechnungen Friend WithEvents dat_Sum_Bis As DateTimePicker Friend WithEvents lblCountMissingInvoices As Label Friend WithEvents Label1 As Label + Friend WithEvents RechnungsanhangHochladenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents RechnungsanhangloeschenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index fbc03d37..ea5dae9c 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -283,7 +283,7 @@ Public Class usrcntlFremdrechnungen " Adressen.AdressenNr, Adressen.[Name 1], tblTrdinInvoice.Rechnungsdatum, tblTrdinInvoice.Rechnungsnummer , tblTrdinInvoice.RechnungsbetragLokal as Bruttobetrag, 1 as daId, cast(1 as bit) as PDFvorhanden FROM tblTrdinInvoice inner join Adressen on KundenNrZentrale = AdressenNr WHERE 1 = 1 " & sqlfehlendePDF_VERAG & IIf(kdNr > 0, " AND tblTrdinInvoice.RechnungsKundenNr=" & kdNr, "") & " AND tblTrdinInvoice.FilialenNr = 4814 and tblTrdinInvoice.Rechnungsdatum " & setSQLWhere(SDLNrTmp, "'AT'") & " ORDER BY tblTrdinInvoice.Rechnungsdatum desc, tblTrdinInvoice.Rechnungsnummer" 'RMC Case "RMC" : SQL_STR = "SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahlTop, "") & - "Adressen.AdressenNr, Adressen.[Name 1],[rmc_reDatum] as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,rmc_kdNr as Kundennummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Bruttobetrag,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden, rmc_archiv as archiv, cast(isnull(InvToCustomer, 0) as bit) as OrigRE FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & whereKundennrKreisLieferanten & " order by rmc_reDatum desc, rmc_reNr" + "Adressen.AdressenNr, Adressen.[Name 1],[rmc_reDatum] as Rechnungsdatum,[rmc_reNr] as Rechnungsnummer,rmc_kdNr as Kundennummer,[rmc_betragNetto] as Nettobetrag,[rmc_betragBrutto] as Bruttobetrag,[rmc_waehrung] as Währung ,[rmc_euroBrutto] as Bruttobetrag,[rmc_daId] as daId,[rmc_betragMWST] as MWST,rmc_landKZ as Land, cast(case when [rmc_daId] is not null then 1 else 0 end as bit) as PDFvorhanden, rmc_archiv as archiv, cast(isnull(InvToCustomer, 0) as bit) as OrigRE, cast(isnull(rmc_daId_InvAtt,0) as bit) as RE_Anhang FROM [VERAG].[dbo].[tblRMCImport] inner join Adressen on Adressen.WölflKundenNr = rmc_kdNr where 1 = 1 " & sqlfehlendePDF_RMC & IIf(kdNr > 0, " AND AdressenNr=" & kdNr, "") & " and [rmc_reDatum] " & setSQLWhere(SDLNrTmp, "rmc_landKZ") & whereKundennrKreisLieferanten & " order by rmc_reDatum desc, rmc_reNr" Case "ALLE" : Dim anzahl As Integer = anzahlTop / 6 : SQL_STR = " select * from (SELECT " & IIf(cbxMax1000Eintrage.Checked, " top " & anzahl, "") & " @@ -1699,13 +1699,9 @@ Public Class usrcntlFremdrechnungen End If End Sub - Private Sub ContextMenuStrip2_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) + Private Sub DetailsAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PDFHochladenToolStripMenuItem.Click - End Sub - - Private Sub DetailsAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailsAnzeigenToolStripMenuItem.Click - - If dgvLFRechnung.CurrentRow.Cells("daId").Value Is Nothing Or IsDBNull(dgvLFRechnung.CurrentRow.Cells("daId").Value) Then + If (dgvLFRechnung.CurrentRow.Cells("daId").Value Is Nothing Or IsDBNull(dgvLFRechnung.CurrentRow.Cells("daId").Value)) Then @@ -1757,20 +1753,117 @@ Public Class usrcntlFremdrechnungen If dgvLFRechnung.CurrentRow.Cells("daId").Value Is Nothing Or IsDBNull(dgvLFRechnung.CurrentRow.Cells("daId").Value) Then - DetailsAnzeigenToolStripMenuItem.Visible = True + PDFHochladenToolStripMenuItem.Visible = True + PDFLöschenToolStripMenuItem.Visible = False Else - DetailsAnzeigenToolStripMenuItem.Visible = False + PDFHochladenToolStripMenuItem.Visible = False + PDFLöschenToolStripMenuItem.Visible = True + End If - ContextMenuStrip1.Show(Cursor.Position) - End If + If aktLieferant = "RMC" AndAlso dgvLFRechnung.Columns.Contains("RE_Anhang") Then + If Not dgvLFRechnung.CurrentRow.Cells("RE_Anhang").Value Then + RechnungsanhangHochladenToolStripMenuItem.Visible = True + RechnungsanhangloeschenToolStripMenuItem.Visible = False + Else + RechnungsanhangHochladenToolStripMenuItem.Visible = False + RechnungsanhangloeschenToolStripMenuItem.Visible = True + End If + + End If + + + ContextMenuStrip1.Show(Cursor.Position) + + End If End Sub + Private Sub RechnungsanhangHochladenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RechnungsanhangHochladenToolStripMenuItem.Click, RechnungsanhangloeschenToolStripMenuItem.Click + + + + Dim ReNr As String = dgvLFRechnung.SelectedRows(0).Cells("Rechnungsnummer").Value + Dim ReDat As String = dgvLFRechnung.SelectedRows(0).Cells("Rechnungsdatum").Value + Dim interneKundenNr As String = dgvLFRechnung.SelectedRows(0).Cells("AdressenNr").Value + Dim KundenNr As String = dgvLFRechnung.SelectedRows(0).Cells("Kundennummer").Value + Dim LieferlandISO2 As String = dgvLFRechnung.SelectedRows(0).Cells("Land").Value + + If LieferlandISO2 = "" Then MsgBox("Land kann nicht ermittelt werden") : Exit Sub + If KundenNr = "" OrElse Not IsNumeric(KundenNr) Then MsgBox("KundenNr kann nicht ermittelt werden") : Exit Sub + If ReDat = "" OrElse Not IsDate(ReDat) Then MsgBox("Rechnungsdatum kann nicht ermittelt werden") : Exit Sub + If interneKundenNr = "" OrElse Not IsNumeric(interneKundenNr) Then MsgBox("KundenNr kann nicht ermittelt werden") : Exit Sub + + Select Case sender.Name + Case "RechnungsanhangHochladenToolStripMenuItem" + + + Select Case aktLieferant + + Case "RMC" + + Dim RMC As New cRMC(KundenNr, ReNr, ReDat) + If RMC.hasEntry AndAlso RMC.rmc_daId_InvAtt Is Nothing Then + + Dim DS_Import As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC_ATT", Now.Year, interneKundenNr, interneKundenNr & "_" & ReNr & "_" & LieferlandISO2) + + If DS_Import.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then + RMC.rmc_daId_InvAtt = DS_Import.da_id + RMC.SAVE() + MsgBox("Dokument gesetzt! -> " & ReNr & " " & CDate(ReDat).ToShortDateString) + SET_SDL(aktLieferant) + End If + + Else + If Not RMC.hasEntry Then MsgBox("Es konnte kein Eintrag gefunden werden") : Exit Sub + If RMC.rmc_daId_InvAtt IsNot Nothing Then MsgBox("Eintrag besitzt bereits einen Rechnungsanhang!") : Exit Sub + + End If + + Case Else + + MsgBox("Funktion nicht implementiert!") + + End Select + + Case "RechnungsanhangloeschenToolStripMenuItem" + + Select Case aktLieferant + + Case "RMC" + + Dim RMC As New cRMC(KundenNr, ReNr, ReDat) + If RMC.hasEntry AndAlso RMC.rmc_daId_InvAtt IsNot Nothing Then + If vbYes = MsgBox("Möchten Sie den Rechnungsanhang von Kunde " & KundenNr & " und ReNr " & ReNr & " löschen? ", vbYesNoCancel) Then + Dim DS_Import As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(RMC.rmc_daId_InvAtt) + If DS_Import.DELETE_COMPLETE() Then + RMC.rmc_daId_InvAtt = Nothing + RMC.SAVE() + MsgBox("Dokument gelöscht! -> " & ReNr & " " & CDate(ReDat).ToShortDateString) + SET_SDL(aktLieferant) + End If + End If + + + Else + If Not RMC.hasEntry Then MsgBox("Es konnte kein Eintrag gefunden werden") : Exit Sub + If RMC.rmc_daId_InvAtt Is Nothing Then MsgBox("Eintrag besitzt keinen Rechnungsanhang!") : Exit Sub + + End If + + Case Else + + MsgBox("Funktion nicht implementiert!") + + End Select + + End Select + End Sub + End Class