diff --git a/SDL/My Project/AssemblyInfo.vb b/SDL/My Project/AssemblyInfo.vb index aa721df7..ded1e0b1 100644 --- a/SDL/My Project/AssemblyInfo.vb +++ b/SDL/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb index 35525b1f..6bafe672 100644 --- a/SDL/USTV/frmMDM_USTVAntrag.vb +++ b/SDL/USTV/frmMDM_USTVAntrag.vb @@ -1,7 +1,12 @@  +Imports System.IO Imports System.Reflection +Imports System.Windows.Documents +Imports com.sun.org.apache.xml.internal.resolver Imports com.sun.tools.internal.ws.wsdl.framework Imports DocumentFormat.OpenXml.Office2010.Drawing.Charts +Imports itextsharp.text.pdf +Imports itextsharp.text.pdf.parser Imports java.text.Normalizer Imports jdk.nashorn.internal.objects.annotations 'Imports DocumentFormat.OpenXml.Drawing.Charts @@ -1437,40 +1442,71 @@ Public Class frmMDM_USTVAntrag Select Case schnnittstellenNr Case 1 - If dsID > 0 Then Me.Cursor = Cursors.WaitCursor cFakturierung.doRechnungsDruck_SRorER(dsID,, False, 3) End If - Case Else + '----------- ERST AKTIVIEREN; WENN POR ANTRAG RECHNUNG (üer RE-NR) + + 'Case 8 + + ' Me.Cursor = Cursors.WaitCursor + ' Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsID) + ' Dim path_src As String = DS.OPEN_SINGLE(False) + ' If path_src = "" Then Exit Sub + + ' Dim pdfDoc As itextsharp.text.Document = Nothing + + ' Try + + ' Dim fi As New System.IO.DirectoryInfo(path_src) + ' Dim pdf As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(path_src) + ' pdf.unethicalreading = True + ' Dim pages As New List(Of Integer)() + + ' For page As Integer = 1 To pdf.NumberOfPages + + ' Dim strategy As ITextExtractionStrategy = New SimpleTextExtractionStrategy() + ' Dim currentPageText As String = PdfTextExtractor.GetTextFromPage(pdf, page, strategy) + + ' Dim searchtext As String = "ON BEHALF AND FOR ACCOUNT OF:" + ' Dim searchtext2 As String = "IDS Europe B.V. " & Antrag_LandKz.ToString + + ' If Not (currentPageText.Contains(searchtext) AndAlso currentPageText.Contains(searchtext2)) Then + ' Dim pageDictionary As PdfDictionary = pdf.GetPageN(page) + ' pageDictionary.Put(PdfName.PAGEMODE, PdfName.USENONE) + ' Else + ' pages.Add(page) + ' End If + + ' Next + + ' pdf.Close() + ' 'For Each page In pages + ' ' MsgBox("Text found on page: " & page) + ' 'Next + + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + ' End Try + Case Else If dsID > 0 Then Me.Cursor = Cursors.WaitCursor Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER(dsID) DS.OPEN_SINGLE() End If - End Select - - End If - - - Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) Me.Cursor = Cursors.Default End Try - Me.Cursor = Cursors.Default - - - End Sub - Private Function getDaID(SchnittstellenNr, reDat, reNr) - Dim da_id = -1 Select Case If(SchnittstellenNr, -1) diff --git a/SDL/mdm/usrcntlFremdrechnungen.vb b/SDL/mdm/usrcntlFremdrechnungen.vb index 81e9d33e..9e6f2d54 100644 --- a/SDL/mdm/usrcntlFremdrechnungen.vb +++ b/SDL/mdm/usrcntlFremdrechnungen.vb @@ -314,9 +314,9 @@ Public Class usrcntlFremdrechnungen 'UTA Case 212 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & - " [Rechnungsdatum],[Abrechnungsnummer] as Rechnungsnummer,Kundennummer,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] where Kundennummer = " & kdNr & " group by [Abrechnungsnummer],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]" + " [Rechnungsdatum],[Abrechnungsnummer] as Rechnungsnummer,Kundennummer,[daId],[Lieferland_ISO2] as Land, 'RE' as Art, cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTAImportNew] inner join adressen on Kundennummer = UTAKundenNr where AdressenNr = " & kdNr & " group by [Abrechnungsnummer],[Rechnungsdatum],Kundennummer,[daId],[Lieferland_ISO2]" - SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " [Datum], [RechnungsNr],[KundenNr],[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments] where KundenNr = " & kdNr + SQL_STR &= " UNION ALL SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") & " [Datum], [RechnungsNr],[KundenNr],[daId],'',[DocumentTyp], cast(case when [daId] is not null then 1 else 0 end as bit) as PDF FROM [VERAG].[dbo].[tblUTADocuments]inner join adressen on KundenNr = UTAKundenNr where AdressenNr = " & kdNr 'PLOSE Case 214 : SQL_STR = "SELECT " & IIf(cbxMax200Eintrage.Checked, " top 200 ", "") &