diff --git a/DAKOSY_Worker/cIMPORT_Codelisten.vb b/DAKOSY_Worker/cIMPORT_Codelisten.vb index 866667f..98808f9 100644 --- a/DAKOSY_Worker/cIMPORT_Codelisten.vb +++ b/DAKOSY_Worker/cIMPORT_Codelisten.vb @@ -29,6 +29,8 @@ Public Class cIMPORT_Codelisten Return Import_I0200(TESTSYSTEM) Case "I0700" Return Import_I0700(TESTSYSTEM) + Case "C0141" + Return Import_C0141(TESTSYSTEM) End Select Return False End Function @@ -230,6 +232,56 @@ Public Class cIMPORT_Codelisten End Function + + Shared Function Import_C0141(TESTSYSTEM) As Boolean + Dim MyData As String = "" + Try + System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 + + Using WC As New System.Net.WebClient() + ' C0008_URL() + WC.Encoding = ASCIIEncoding.UTF8 + Dim URL = cDY_Paramter.GET_PARAM_ByName("C0141_URL", TESTSYSTEM, "VERAG") + If URL = String.Empty Then Return False + ' MsgBox(URL) + MyData = WC.DownloadString(URL) + Dim doc As New XmlDocument() + doc.LoadXml(MyData) + + Dim LC As New cZollstellen + If doc.HasChildNodes Then + If doc.GetElementsByTagName("Codelist").Count > 0 Then + If doc.GetElementsByTagName("Codelist")(0).HasChildNodes Then + For Each Entry As XmlNode In doc.GetElementsByTagName("Codelist")(0).ChildNodes + ' MsgBox(Entry.SelectNodes("Code")(0).InnerText) + Dim Code = "" + Dim Description = "" + Dim StartDate = Nothing + Dim EndDate = Nothing + If Entry.SelectNodes("Code").Count > 0 Then Code = Entry.SelectNodes("Code")(0).InnerText + If Entry.SelectNodes("Description").Count > 0 Then Description = Entry.SelectNodes("Description")(0).InnerText + If Entry.SelectNodes("StartDate").Count > 0 Then StartDate = CDate(Entry.SelectNodes("StartDate")(0).InnerText) + If Entry.SelectNodes("EndDate").Count > 0 Then EndDate = CDate(Entry.SelectNodes("EndDate")(0).InnerText) + + LC.Add(New cZollstellen.cZollstelle(Code, Description, StartDate, EndDate)) + + Next + End If + End If + End If + If LC.Count > 0 Then + Return LC.INSERT_DB(TESTSYSTEM) + End If + End Using + + Catch ex As Exception + MsgBox(ex.Message) + End Try + Return False + + End Function + + Shared Function Import_C0013(TESTSYSTEM) As Boolean Dim MyData As String = "" Try @@ -944,6 +996,46 @@ Class cVorpapierArten End Class +Class cZollstellen + Inherits List(Of cZollstelle) + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Function INSERT_DB(TESTSSYSTEM) As Boolean + + If SQL.doSQL("DELETE FROM [tbl_DY_ZollDE_C0141_Zollstellen]", , , , SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then + Dim ok = True + For Each l In Me + Dim List As New List(Of VERAG_PROG_ALLGEMEIN.MyListItem2) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Code", l.Code)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("Description", l.Description)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("StartDate", l.StartDate)) + List.Add(New VERAG_PROG_ALLGEMEIN.MyListItem2("EndDate", l.EndDate)) + If Not SQL.doSQL("INSERT INTO [tbl_DY_ZollDE_C0141_Zollstellen] (Code, Description, StartDate, EndDate) VALUES (@Code, @Description, @StartDate, @EndDate); ", "FMZOLL", , List, SQL.GetNewOpenConnectionFMZOLL_SYSTEM(TESTSSYSTEM)) Then + ok = False + End If + Next + Return ok + End If + Return False + End Function + + Class cZollstelle + Property Code As String = "" + Property Description As String = "" + Property StartDate As Object = Nothing + Property EndDate As Object = Nothing + + Sub New(Code, Description, StartDate, EndDate) + Me.Code = Code + Me.Description = Description + Me.StartDate = StartDate + Me.EndDate = EndDate + End Sub + End Class + +End Class + Class cUnterlageArten Inherits List(Of cUnterlageArt) diff --git a/MDM_Worker/MDM_Worker_lib.vbproj b/MDM_Worker/MDM_Worker_lib.vbproj index 46b84f4..30d6d5b 100644 --- a/MDM_Worker/MDM_Worker_lib.vbproj +++ b/MDM_Worker/MDM_Worker_lib.vbproj @@ -68,6 +68,7 @@ + True diff --git a/MDM_Worker/cPLOSE_Inv_Data.vb b/MDM_Worker/cPLOSE_Inv_Data.vb new file mode 100644 index 0000000..cd792f2 --- /dev/null +++ b/MDM_Worker/cPLOSE_Inv_Data.vb @@ -0,0 +1,157 @@ + +Imports System.Data.SqlClient +Imports System.Reflection +Public Class cPLOSE_Inv_Data + + Property plInv_Id As Integer + Property plInv_SupplierRechnungsDatum As Date + Property plInv_SupplierRechnungsNr As String + Property plInv_SupplierCountry As Object = Nothing + Property plInv_Lieferant As Object = Nothing + Property plInv_LieferantCode As Object = Nothing + Property plInv_LieferantUID As Object = Nothing + Property plInv_RechnungsJahr As Object = Nothing + Property plInv_Dateiname As Object = Nothing + Property plInv_Einlesedatum As Object = Nothing + Property plInv_Datensatztyp As Object = Nothing + Property plInv_PLOSEKundennummer As Object = Nothing + Property plInv_Firmenname As Object = Nothing + Property plInv_Nettobetrag As Object = Nothing + Property plInv_MWSTBetrag As Object = Nothing + Property plInv_Bruttobetrag As Object = Nothing + Property plInv_Services As Object = Nothing + Property plInv_PdfFileName As Object = Nothing + Property plInv_daId As Object = Nothing + Property plInv_tstmp As DateTime = Now + + + + + + Public hasEntry = False + + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Sub New() + + End Sub + + Sub New(plInv_Id) + Me.plInv_Id = plInv_Id + LOAD() + End Sub + Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Id", plInv_Id,, True)) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_SupplierRechnungsDatum", plInv_SupplierRechnungsDatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_SupplierRechnungsNr", plInv_SupplierRechnungsNr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_SupplierCountry", plInv_SupplierCountry)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Lieferant", plInv_Lieferant)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_LieferantCode", plInv_LieferantCode)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_LieferantUID", plInv_LieferantUID)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_RechnungsJahr", plInv_RechnungsJahr)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Dateiname", plInv_Dateiname)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Einlesedatum", plInv_Einlesedatum)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Datensatztyp", plInv_Datensatztyp)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_PLOSEKundennummer", plInv_PLOSEKundennummer)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Firmenname", plInv_Firmenname)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Nettobetrag", plInv_Nettobetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_MWSTBetrag", plInv_MWSTBetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Bruttobetrag", plInv_Bruttobetrag)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_Services", plInv_Services)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_PdfFileName", plInv_PdfFileName)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_daId", plInv_daId)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("plInv_tstmp", plInv_tstmp)) + + Return list + End Function + + + + Public Function SAVE() As Boolean + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim sqlstr = " BEGIN TRAN IF EXISTS(SELECT * FROM tblPLOSE_Inv_Data WHERE plInv_Id=@plInv_Id) " & + " BEGIN " & getUpdateCmd() & " END " & + " Else " & + " BEGIN " & getInsertCmd() & " END " & + " commit tran " + + 'Return SQL.doSQLVarList(sqlstr, "FMZOLL", , list) + plInv_Id = SQL.doSQLVarListID(plInv_Id, sqlstr, "FMZOLL", , list) + Return (plInv_Id > 0) + End Function + + Public Sub LOAD() + Try + hasEntry = False + Using conn As SqlConnection = SQL.GetNewOpenConnectionFMZOLL() + Using cmd As New SqlCommand("SELECT * FROM tblPLOSE_Inv_Data WHERE plInv_Id=@plInv_Id ", conn) + cmd.Parameters.AddWithValue("@plInv_Id", plInv_Id) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + For Each li In getParameterList() + Dim propInfo As PropertyInfo = Me.GetType.GetProperty(li.Scalarvariable) + + If dr.Item(li.Text) Is DBNull.Value Then + propInfo.SetValue(Me, Nothing) + Else + propInfo.SetValue(Me, dr.Item(li.Text)) + End If + + Next + hasEntry = True + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Sub + + + + Public Function getUpdateCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + + Dim str As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "] = @" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + Return (" UPDATE [tblPLOSE_Inv_Data] SET " & str & " WHERE plInv_Id=@plInv_Id ") + + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + + + Public Function getInsertCmd() As String + Try + Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList() + Dim str As String = "" + Dim values As String = "" + For Each i In list + If Not i.isPrimaryParam Then + str &= "[" & i.Text & "]," + values &= "@" & i.Scalarvariable & "," '.Replace("-", "").Replace(" ", "") & "," + End If + Next + str = str.Substring(0, str.Length - 1) 'wg. ',' + values = values.Substring(0, values.Length - 1) 'wg. ',' + Return (" INSERT INTO tblPLOSE_Inv_Data (" & str & ") VALUES(" & values & ") ") + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + Return "" + End Function + +End Class + diff --git a/initATLASAufschubkonten/cGetMsgType.vb b/initATLASAufschubkonten/cGetMsgType.vb index 38974bd..0f2fcc7 100644 --- a/initATLASAufschubkonten/cGetMsgType.vb +++ b/initATLASAufschubkonten/cGetMsgType.vb @@ -516,6 +516,15 @@ Public Class cGetMsgType End If Return False End Function + Shared Function isPLOSE_INVData(doc As String) As Boolean + Dim lines() As String = IO.File.ReadAllLines(doc) + If lines.Count > 0 Then + If lines(0).ToString.StartsWith("PloseCode") Then + Return True + End If + End If + Return False + End Function End Class diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.Designer.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.Designer.vb index c250a12..e2f67c8 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.Designer.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.Designer.vb @@ -234,7 +234,7 @@ Partial Class frmMDMNachrichtenVerarbeitung Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "frmMDMNachrichtenVerarbeitung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "DY NachrichtenVerarbeitung" + Me.Text = "MDM NachrichtenVerarbeitung" Me.pnl.ResumeLayout(False) Me.pnl.PerformLayout() CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index 9ec7d5a..4036f16 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -357,7 +357,7 @@ Public Class frmMDMNachrichtenVerarbeitung Exit Sub End If - For i = 1 To 3 + For i = 1 To 5 For Each d In System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD) Try @@ -371,59 +371,94 @@ Public Class frmMDMNachrichtenVerarbeitung ' If fi.Extension = ".edi" Then Dim alreadyMoved = False - If fi.Extension.ToLower = ".csv" Then - - '------------------------------------------------------------------------------------------------------------------------------ - ' PLOSE - '------------------------------------------------------------------------------------------------------------------------------ + '------------------------------------------------------------------------------------------------------------------------------ + ' PLOSE + '------------------------------------------------------------------------------------------------------------------------------ - '------------------------------------------ - '------------------ DETAIL ------------------ - '------------------------------------------ - Select Case i - Case 1 - 'TC: Versandbestätigung + + Select Case i + Case 1 + '------------------------------------------ + '------------------ DETAIL ------------------ + '------------------------------------------ + If fi.Extension.ToLower = ".csv" Then + If Not found And cGetMsgType.isPLOSE_Detail(d) Then If readPLOSE_Detail(d) <> "" Then found = True ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True End If If found Then cntDatenEingelesen += 1 - Case 2 - 'TC: Versandbestätigung + End If + Case 2 + '------------------------------------------ + '------------------ HEADER ------------------ + '------------------------------------------ + If fi.Extension.ToLower = ".csv" Then + + If Not found And cGetMsgType.isPLOSE_Header(d) Then If readPLOSE_Header(d) <> "" Then found = True ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True End If If found Then cntDatenEingelesen += 1 - Case 3 - frmStartOptions.moveFile_DateBack(d, ERROR_PFAD) + End If + Case 3 + '------------------------------------------ + '------------------ PLOSE_INVData: neues CSV --> Rechnungen + PDF-Link ------------------ + '------------------------------------------ + + If fi.Extension.ToLower = ".csv" Then + If Not found And cGetMsgType.isPLOSE_INVData(d) Then + If readPLOSE_INVData(d) <> "" Then found = True + ' ' If bezugsNr <> "" Then addDGVEinarbeitung("NCTS: Versandbestätigung", bezugsNr) : found = True + End If + If found Then cntDatenEingelesen += 1 + End If + Case 4 + '------------------------------------------ + '------------------ PDF ------------------ + '------------------------------------------ + If fi.Extension.ToLower = ".pdf" Then + found = False + + If Not IO.Directory.Exists(ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + + 'File in Datenarchiv sichern: + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "PLOSE", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d)) + DS.uploadDataToDATENSERVER(d) + 'DatenArchiv-Id in tblPLOSE_Inv_Data Tabelle eintragen (über PDF-Name) : + SQL.doSQL("Update [tblPLOSE_Inv_Data] SET [plInv_daId]='" & DS.da_id & "' where [plInv_PdfFileName] = '" & DS.da_name & "' and [plInv_Einlesedatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") + + frmStartOptions.moveFile_DateBack(d, ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + 'frmStartOptions.copyFile_DateBack(d, ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + addDGVEinarbeitung("PDF", DS.da_name) + dgvEinarbeitung.Refresh() + + 'Eintrag + End If + Case 5 + frmStartOptions.moveFile_DateBack(d, ERROR_PFAD) dsNichtErkannt += 1 End Select - End If - If fi.Extension.ToLower = ".pdf" Then - found = False - - If Not IO.Directory.Exists(ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - frmStartOptions.moveFile_DateBack(d, ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - - End If - If True Then - If Not alreadyMoved Then - If found Then - If Not IO.Directory.Exists(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - frmStartOptions.moveFile_DateBack(d, ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") - End If + + + If True Then + If Not alreadyMoved Then + If found Then + If Not IO.Directory.Exists(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") + frmStartOptions.moveFile_DateBack(d, ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") End If End If - - Me.Refresh() - End If + + Me.Refresh() + + End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try @@ -723,6 +758,100 @@ Public Class frmMDMNachrichtenVerarbeitung End Function + + Function readPLOSE_INVData(d As String) As String + Try + Dim cnt = 0 + readPLOSE_INVData = "" + + + Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(d, Encoding.UTF8) + MyReader.TextFieldType = FileIO.FieldType.Delimited + MyReader.SetDelimiters(";") + Dim currentRow As String() + + + + Dim fi As FileInfo = New FileInfo(d) + + While Not MyReader.EndOfData + Try + currentRow = MyReader.ReadFields() + + If currentRow(0) <> "PloseCode" Then ' Header + If currentRow.Length >= 15 Then + Dim PLOSE_INV As New MDM_Worker.cPLOSE_Inv_Data + + PLOSE_INV.plInv_SupplierRechnungsDatum = SQL.isleernothingDateFormatstring(currentRow(7)) + PLOSE_INV.plInv_SupplierRechnungsNr = SQL.isleernothing(currentRow(8)) + PLOSE_INV.plInv_SupplierCountry = SQL.isleernothing(currentRow(6)) + PLOSE_INV.plInv_Lieferant = SQL.isleernothing(currentRow(4)) + PLOSE_INV.plInv_LieferantCode = SQL.isleernothing(currentRow(3)) + PLOSE_INV.plInv_LieferantUID = SQL.isleernothing(currentRow(5)) + 'PLOSE_INV.plInv_RechnungsJahr = SQL.isleernothing(currentRow(7)) --> JAHR + PLOSE_INV.plInv_PdfFileName = SQL.isleernothing(currentRow(14)) + PLOSE_INV.plInv_Einlesedatum = Now.ToShortDateString + PLOSE_INV.plInv_Datensatztyp = "PDF" + PLOSE_INV.plInv_PLOSEKundennummer = SQL.isleernothing(currentRow(0)) + PLOSE_INV.plInv_Firmenname = SQL.isleernothing(currentRow(1)) + ' PLOSE_INV.plInv_DatumTransaktion = SQL.isleernothing(currentRow(0)) + ' PLOSE_INV.plInv_Produktbeschreibung = SQL.isleernothing(currentRow(0)) + PLOSE_INV.plInv_Services = SQL.isleernothing(currentRow(13)) + + PLOSE_INV.plInv_Nettobetrag = CDbl(CDbl(SQL.isNullReturnValue(currentRow(9), 0).replace(".", ",")) + CDbl(SQL.isNullReturnValue(currentRow(11), 0).replace(".", ","))) + PLOSE_INV.plInv_MWSTBetrag = CDbl(SQL.isNullReturnValue(currentRow(10), 0).replace(".", ",")) + PLOSE_INV.plInv_Bruttobetrag = CDbl(SQL.isNullReturnValue(currentRow(12), 0).replace(".", ",")) + + ' [plInv_daId] + + + PLOSE_INV.plInv_Dateiname = fi.Name + + '''''''''''' + If PLOSE_INV.SAVE() Then + + ' UPDATE tblPLOSE_Details: + SQL.doSQL("UPDATE [tblPLOSE_Details] SET [plose_plInvId] ='" & PLOSE_INV.plInv_Id & "' where plose_SupplierRechnungsNr='" & PLOSE_INV.plInv_SupplierRechnungsNr & "' AND plose_SupplierRechnungsDatum='" & PLOSE_INV.plInv_SupplierRechnungsDatum & "'", "FMZOLL") + End If + + End If + End If + + cnt += 1 + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End While + + + readPLOSE_INVData = "Zeilen: " & cnt + + End Using + + + + + Try + ' System.IO.File.Delete(p) + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + addDGVEinarbeitung("PLOSE: INV_DATA (" & cnt & ")", readPLOSE_INVData) + + ' End Using + + 'End If + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + MsgBox(ex.StackTrace & ex.Message) + readPLOSE_INVData = "" + End Try + End Function + + Private Sub dgvEinarbeitung_SelectionChanged(sender As Object, e As EventArgs) Handles dgvEinarbeitung.SelectionChanged dgvEinarbeitung.ClearSelection() diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index ce34d3c..3626bbf 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmStartOptions Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + Me.Button16 = New System.Windows.Forms.Button() Me.Button14 = New System.Windows.Forms.Button() Me.Label20 = New System.Windows.Forms.Label() Me.Label19 = New System.Windows.Forms.Label() @@ -155,7 +156,8 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() - Me.Button16 = New System.Windows.Forms.Button() + Me.LinkLabel37 = New System.Windows.Forms.LinkLabel() + Me.PictureBox16 = New System.Windows.Forms.PictureBox() Me.pnl.SuspendLayout() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() @@ -179,6 +181,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -246,6 +249,18 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(861, 827) Me.pnl.TabIndex = 0 ' + 'Button16 + ' + Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button16.Location = New System.Drawing.Point(559, 182) + Me.Button16.Name = "Button16" + Me.Button16.Size = New System.Drawing.Size(211, 24) + Me.Button16.TabIndex = 57 + Me.Button16.Text = "MAIL_ATTACH_WORK_FILES" + Me.Button16.UseVisualStyleBackColor = True + ' 'Button14 ' Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -291,6 +306,7 @@ Partial Class frmStartOptions Me.MyTextBox2._DateTimeOnly = False Me.MyTextBox2._numbersOnly = True Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True Me.MyTextBox2._Prozent = False Me.MyTextBox2._ShortDateNew = False Me.MyTextBox2._ShortDateOnly = False @@ -359,6 +375,7 @@ Partial Class frmStartOptions Me.txtSyskaWdhDateiname._DateTimeOnly = False Me.txtSyskaWdhDateiname._numbersOnly = False Me.txtSyskaWdhDateiname._numbersOnlyKommastellen = "" + Me.txtSyskaWdhDateiname._numbersOnlyTrennzeichen = True Me.txtSyskaWdhDateiname._Prozent = False Me.txtSyskaWdhDateiname._ShortDateNew = False Me.txtSyskaWdhDateiname._ShortDateOnly = False @@ -406,6 +423,7 @@ Partial Class frmStartOptions Me.txtEZOLLAnhDat._DateTimeOnly = False Me.txtEZOLLAnhDat._numbersOnly = False Me.txtEZOLLAnhDat._numbersOnlyKommastellen = "" + Me.txtEZOLLAnhDat._numbersOnlyTrennzeichen = True Me.txtEZOLLAnhDat._Prozent = False Me.txtEZOLLAnhDat._ShortDateNew = True Me.txtEZOLLAnhDat._ShortDateOnly = False @@ -631,6 +649,8 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.LinkLabel37) + Me.TabPage1.Controls.Add(Me.PictureBox16) Me.TabPage1.Controls.Add(Me.Button15) Me.TabPage1.Controls.Add(Me.Button8) Me.TabPage1.Controls.Add(Me.LinkLabel28) @@ -668,7 +688,7 @@ Partial Class frmStartOptions Me.TabPage1.Controls.Add(Me.PictureBox8) Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) Me.TabPage1.Size = New System.Drawing.Size(851, 395) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Zollverfahren" @@ -1090,8 +1110,8 @@ Partial Class frmStartOptions Me.TabPage2.Controls.Add(Me.txtVRGOut_BezugsNr) Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) - Me.TabPage2.Size = New System.Drawing.Size(852, 395) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage2.Size = New System.Drawing.Size(851, 395) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "VERAG Interface" Me.TabPage2.UseVisualStyleBackColor = True @@ -1355,6 +1375,7 @@ Partial Class frmStartOptions Me.txtVRGOut_MRN._DateTimeOnly = False Me.txtVRGOut_MRN._numbersOnly = False Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" + Me.txtVRGOut_MRN._numbersOnlyTrennzeichen = True Me.txtVRGOut_MRN._Prozent = False Me.txtVRGOut_MRN._ShortDateNew = False Me.txtVRGOut_MRN._ShortDateOnly = False @@ -1377,6 +1398,7 @@ Partial Class frmStartOptions Me.txtVRGOut_FilialenNr._DateTimeOnly = False Me.txtVRGOut_FilialenNr._numbersOnly = False Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_FilialenNr._numbersOnlyTrennzeichen = True Me.txtVRGOut_FilialenNr._Prozent = False Me.txtVRGOut_FilialenNr._ShortDateNew = False Me.txtVRGOut_FilialenNr._ShortDateOnly = False @@ -1400,6 +1422,7 @@ Partial Class frmStartOptions Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False Me.txtVRGOut_AbfertigungsNr._numbersOnly = False Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_AbfertigungsNr._numbersOnlyTrennzeichen = True Me.txtVRGOut_AbfertigungsNr._Prozent = False Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False @@ -1434,6 +1457,7 @@ Partial Class frmStartOptions Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False Me.txtVRGOutEZA_BezugsNr._numbersOnly = False Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOutEZA_BezugsNr._numbersOnlyTrennzeichen = True Me.txtVRGOutEZA_BezugsNr._Prozent = False Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False @@ -1468,6 +1492,7 @@ Partial Class frmStartOptions Me.txtVRGOut_BezugsNr._DateTimeOnly = False Me.txtVRGOut_BezugsNr._numbersOnly = False Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_BezugsNr._numbersOnlyTrennzeichen = True Me.txtVRGOut_BezugsNr._Prozent = False Me.txtVRGOut_BezugsNr._ShortDateNew = False Me.txtVRGOut_BezugsNr._ShortDateOnly = False @@ -1497,7 +1522,7 @@ Partial Class frmStartOptions Me.TabPage3.Controls.Add(Me.Label11) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(852, 395) + Me.TabPage3.Size = New System.Drawing.Size(851, 395) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Partner-Systeme" Me.TabPage3.UseVisualStyleBackColor = True @@ -1669,6 +1694,7 @@ Partial Class frmStartOptions Me.MyTextBox1._DateTimeOnly = False Me.MyTextBox1._numbersOnly = True Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True Me.MyTextBox1._Prozent = False Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False @@ -1855,17 +1881,27 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' - 'Button16 + 'LinkLabel37 ' - Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button16.Location = New System.Drawing.Point(559, 182) - Me.Button16.Name = "Button16" - Me.Button16.Size = New System.Drawing.Size(211, 24) - Me.Button16.TabIndex = 57 - Me.Button16.Text = "MAIL_ATTACH_WORK_FILES" - Me.Button16.UseVisualStyleBackColor = True + Me.LinkLabel37.AutoSize = True + Me.LinkLabel37.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel37.Location = New System.Drawing.Point(295, 125) + Me.LinkLabel37.Name = "LinkLabel37" + Me.LinkLabel37.Size = New System.Drawing.Size(94, 13) + Me.LinkLabel37.TabIndex = 57 + Me.LinkLabel37.TabStop = True + Me.LinkLabel37.Text = "C0141 - Zollstellen" + ' + 'PictureBox16 + ' + Me.PictureBox16.BackgroundImage = CType(resources.GetObject("PictureBox16.BackgroundImage"), System.Drawing.Image) + Me.PictureBox16.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.PictureBox16.Location = New System.Drawing.Point(400, 120) + Me.PictureBox16.Name = "PictureBox16" + Me.PictureBox16.Size = New System.Drawing.Size(18, 18) + Me.PictureBox16.TabIndex = 58 + Me.PictureBox16.TabStop = False + Me.PictureBox16.Visible = False ' 'frmStartOptions ' @@ -1907,6 +1943,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox16, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2042,4 +2079,6 @@ Partial Class frmStartOptions Friend WithEvents Label20 As Label Friend WithEvents Button15 As Button Friend WithEvents Button16 As Button + Friend WithEvents LinkLabel37 As LinkLabel + Friend WithEvents PictureBox16 As PictureBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 5eab5b7..2f8f7a4 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -140,6 +140,30 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= @@ -382,6 +406,57 @@ CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + True + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj @@ -478,60 +553,6 @@ CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - True - - - True - AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 0c5195c..0f7908f 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -190,6 +190,10 @@ Public Class frmStartOptions Me.Refresh() DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0014", True) DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0014", False) + + Me.Refresh() + DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", True) + DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", False) Me.Refresh() closeMe() End Sub @@ -1352,7 +1356,7 @@ Public Class frmStartOptions Dim MAIL_attach As New List(Of String) MAIL_attach.Add(FIN_FILE) - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag",, MAIL_attach) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag;sb@verag.ag",, MAIL_attach) '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -2026,6 +2030,36 @@ Public Class frmStartOptions Return True End Function + Public Function copyFile_DateBack(file, toDirectory, Optional ByRef dest = "") + If Not IO.File.Exists(file) Then Return False + If Not IO.Directory.Exists(toDirectory) Then IO.Directory.CreateDirectory(toDirectory) + dest = toDirectory & cut_file(file) + Dim fio As IO.FileInfo = New FileInfo(file) + Dim ext = fio.Extension + If IO.File.Exists(dest) Then + dest = toDirectory & cut_file(file).Replace(ext, Now.ToString("_yyMMdd_HHmmss.fff")) & ext + End If + IO.File.Copy(file, dest) ' Verschiebt die Datei + Return True + End Function + + 'Public Function getFileName_DateBack(file) As String + ' If Not IO.File.Exists(file) Then Return False + + ' Dim fio As IO.FileInfo = New FileInfo(file) + ' Dim ext = fio.Extension + + ' Return cut_file(file).Replace(ext, Now.ToString("_yyMMdd_HHmmss.fff")) & ext + 'End Function + Public Function getFileName(file) As String + If Not IO.File.Exists(file) Then Return False + + Dim fio As IO.FileInfo = New FileInfo(file) + + Return fio.Name + End Function + + Public Function copyFile(file, toDirectory, Optional ByRef dest = "") If Not IO.File.Exists(file) Then Return False If Not IO.Directory.Exists(toDirectory) Then IO.Directory.CreateDirectory(toDirectory) @@ -3157,4 +3191,14 @@ Public Class frmStartOptions doIDSPlatts() doExcelImportNCTS_FREMD() End Sub + + Private Sub LinkLabel37_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel37.LinkClicked + Me.Cursor = Cursors.WaitCursor + Try + DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", True) 'TESTSYSTEM + Dim erg = DAKOSY_Worker.cIMPORT_Codelisten.IMPORT("C0141", False) 'ECHTSYSTEM + showPic(erg, PictureBox16) + Catch ex As Exception : VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name) : End Try + Me.Cursor = Cursors.Default + End Sub End Class \ No newline at end of file