Datenarchiv, Pose, StartOptions, EZOLL-Einarbeitung, etc.
This commit is contained in:
@@ -690,7 +690,7 @@ Public Class frmStartOptions
|
||||
If fehler <> "" Then
|
||||
API.UPDTAE_ERR("Batch-Nr: " & batchrequestNr & "-" & totalPages, fehler, "getTransactionsFromBatchNrAndPage")
|
||||
closeMe()
|
||||
Exit Sub
|
||||
Exit For
|
||||
Else
|
||||
counTrans += dt.Rows.Count
|
||||
End If
|
||||
@@ -930,7 +930,24 @@ Public Class frmStartOptions
|
||||
|
||||
End Try
|
||||
End Function
|
||||
Function importFileFromEZOLL(datum As Date) As Boolean
|
||||
|
||||
Private Sub addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY As DataTable, Anhaenge As cDHF_Anhaenge, SPEDBUCH_TMP As cSpeditionsbuch, datumImport As Date)
|
||||
|
||||
If SPEDBUCH_TMP IsNot Nothing Then
|
||||
Dim R As DataRow = dtSPEDEintrageAusEinarbeitung_HISTORY.NewRow
|
||||
R("FilialNr") = SPEDBUCH_TMP.FilialenNr
|
||||
R("AbfertigungsNr") = SPEDBUCH_TMP.AbfertigungsNr
|
||||
R("Abfertigungsdatum") = SPEDBUCH_TMP.Abfertigungsdatum
|
||||
R("LNR") = Anhaenge.LRN
|
||||
R("CRN") = Anhaenge.CRN
|
||||
R("Abfertigungsart") = R("AbfertigungsNr") = SPEDBUCH_TMP.Abfertigungsart
|
||||
R("Firma") = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
R("AnhaengeAbDatum") = datumImport.ToShortDateString
|
||||
dtSPEDEintrageAusEinarbeitung_HISTORY.Rows.Add(R)
|
||||
End If
|
||||
|
||||
End Sub
|
||||
Function importFileFromEZOLL(datum As Date, Optional sendMail As Boolean = True) As Boolean
|
||||
Try
|
||||
Dim db = "EZOLL"
|
||||
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
@@ -938,7 +955,23 @@ Public Class frmStartOptions
|
||||
End Select
|
||||
Dim sql As New VERAG_PROG_ALLGEMEIN.SQL
|
||||
Dim dt As DataTable = sql.loadDgvBySql("SELECT [zzAktivitaet].LizenzNr,[zzAktivitaet].Operatorid,[zzAktivitaet].AnmID,MsgTyp,[zzAktivitaet].ErstelltAm,pfad,zsAnmRefs.LRN,zsAnmRefs.CRN ,[zzAktivitaet].VorgangID FROM [zzAktivitaet] INNER JOIN zsAnmRefs On zsAnmrefs.AnmID=zzAktivitaet.AnmID
|
||||
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
|
||||
where MsgTyp IN ('EZ922','EZ923','TR109', 'EX431', 'CC529C', 'CC599C', 'CC029C') and ErstelltAm>='" & datum.ToShortDateString & " 00:00:00' and pfad is not null", db, 200)
|
||||
|
||||
Dim dtSPEDEintrageAusEinarbeitung_HISTORY As New DataTable
|
||||
|
||||
With dtSPEDEintrageAusEinarbeitung_HISTORY
|
||||
.Columns.Add("FilialNr", GetType(Integer))
|
||||
.Columns.Add("AbfertigungsNr", GetType(Integer))
|
||||
.Columns.Add("Abfertigungsdatum", GetType(String))
|
||||
.Columns.Add("LNR", GetType(String))
|
||||
.Columns.Add("CRN", GetType(String))
|
||||
.Columns.Add("Abfertigungsart", GetType(String))
|
||||
.Columns.Add("AnhaengeAbDatum", GetType(String))
|
||||
.Columns.Add("Firma", GetType(String))
|
||||
End With
|
||||
|
||||
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
For Each row In dt.Rows
|
||||
Dim cDHF_Anhaenge As New VERAG_PROG_ALLGEMEIN.cDHF_Anhaenge(row("AnmID"), row("MsgTyp"), row("LizenzNr"))
|
||||
@@ -959,15 +992,16 @@ Public Class frmStartOptions
|
||||
Dim Bezeichnung = ""
|
||||
Select Case row("MsgTyp")
|
||||
Case "EZ922" : Bezeichnung = "STEUERBESCHEID"
|
||||
Case "EZ923"
|
||||
Case "EZ923", "CC529C"
|
||||
Select Case row("VorgangID")
|
||||
Case "AF"
|
||||
Case "AF" ' -> CC529C ist immer AF!
|
||||
Bezeichnung = "ABD"
|
||||
Case Else '"EF"
|
||||
Bezeichnung = "STEUERBESCHEID_MITT"
|
||||
End Select
|
||||
Case "TR109" : Bezeichnung = "VBD"
|
||||
Case "EX431" : Bezeichnung = "AVM"
|
||||
|
||||
Case "TR109", "CC029C" : Bezeichnung = "VBD"
|
||||
Case "EX431", "CC599C" : Bezeichnung = "AVM"
|
||||
End Select
|
||||
|
||||
Try
|
||||
@@ -1003,7 +1037,10 @@ Public Class frmStartOptions
|
||||
If cDHF_Anhaenge.docID > 0 AndAlso cDHF_Anhaenge.LRN <> "" Then
|
||||
Select Case row("MsgTyp")
|
||||
Case "EZ922" 'STEUERBESCHEID
|
||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) And Not sendMail Then 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
'Eintrag aus Nacharbeitung -> Protokollieren
|
||||
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||
End If
|
||||
|
||||
'=====IMPORT IN VERAG DATENMODELL==========
|
||||
Dim IMP As New DAKOSY_Worker.cImporter_DHFToVERAG
|
||||
@@ -1014,38 +1051,57 @@ Public Class frmStartOptions
|
||||
'==========================================
|
||||
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_Steuerbeleg]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_Steuerbeleg] is null", "FMZOLL")
|
||||
doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
Case "TR109"
|
||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL")
|
||||
If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
Case "TR109", "CC029C"
|
||||
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "NCTS", SPEDBUCH_TMP) And Not sendMail Then
|
||||
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_VBD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrNCTS='" & cDHF_Anhaenge.LRN & "' AND [DokumentId_VBD] is null", "FMZOLL")
|
||||
' BEREITSTELLUNG DER DATEN AN FREMDSYSTEME
|
||||
cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID)
|
||||
doMailZollbeleg(destFull, "VBD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
Case "EZ923" ' STB/ABD
|
||||
If sendMail Then
|
||||
cVERAG_out_ncts.copyFileFTP_VERAGncts_EZOLL(cDHF_Anhaenge.AnmID)
|
||||
doMailZollbeleg(destFull, "VBD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
End If
|
||||
|
||||
Case "EZ923", "CC529C" ' STB/ABD
|
||||
Select Case row("VorgangID")
|
||||
Case "AF" ' --> AUSFUHR --> ABD
|
||||
'AES Stuff....
|
||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_ABD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_ABD is null", "FMZOLL")
|
||||
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) And Not sendMail Then 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||
End If
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_ABD]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrAES='" & cDHF_Anhaenge.LRN & "' AND DokumentId_ABD is null", "FMZOLL")
|
||||
|
||||
'Zeitspanne ? 3 Tage , älter nicht senden..
|
||||
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
||||
doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
If sendMail Then doMailZollbeleg(destFull, "ABD", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
End If
|
||||
Case Else '' --> EINFUHR --> 'Ergänzung STB - Mitteilung
|
||||
|
||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "EZA", SPEDBUCH_TMP) And Not sendMail Then
|
||||
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET DokumentId_Mitteilung='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_Mitteilung is null", "FMZOLL")
|
||||
doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
If sendMail Then doMailZollbeleg(destFull, "STB", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
|
||||
End Select
|
||||
|
||||
Case "EX431" 'AVM --> EZoll Anhänge & Mail senden
|
||||
|
||||
'Select Case art
|
||||
' Case "NCTS" : SPEDBUCH.AtlasBezNrNCTS = LRN
|
||||
' Case "AES" : SPEDBUCH.AtlasBezNrAES = LRN
|
||||
' Case Else : SPEDBUCH.AtlasBezNrEZA = LRN
|
||||
'End Select
|
||||
|
||||
Case "EX431", "CC599C" '-> Ausgangsvermerk 'AVM --> EZoll Anhänge & Mail senden
|
||||
'AES Stuff....
|
||||
DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_AVM]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrEZA='" & cDHF_Anhaenge.LRN & "' AND DokumentId_AVM is null", "FMZOLL")
|
||||
If DAKOSY_Worker.cZOLL_IMPORT.EZOLLImport(cDHF_Anhaenge.LRN, "AES", SPEDBUCH_TMP) And Not sendMail Then
|
||||
addTODatatable(dtSPEDEintrageAusEinarbeitung_HISTORY, cDHF_Anhaenge, SPEDBUCH_TMP, datum)
|
||||
End If 'Versucht den SpedBucheintrag, falls noch nicht vorhanden
|
||||
sql.doSQL("Update Speditionsbuch SET [DokumentId_AVM]='" & cDHF_Anhaenge.docID & "' WHERE AtlasBezNrAES='" & cDHF_Anhaenge.LRN & "' AND DokumentId_AVM is null", "FMZOLL")
|
||||
|
||||
If destFull <> "" AndAlso SPEDBUCH_TMP IsNot Nothing AndAlso SPEDBUCH_TMP.SendungID IsNot Nothing Then
|
||||
doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
If sendMail Then doMailZollbeleg(destFull, "AVM", SPEDBUCH_TMP.SendungID, cDHF_Anhaenge.LRN)
|
||||
End If
|
||||
|
||||
End Select
|
||||
@@ -1055,6 +1111,18 @@ Public Class frmStartOptions
|
||||
End If
|
||||
Next
|
||||
End If
|
||||
|
||||
If dtSPEDEintrageAusEinarbeitung_HISTORY.Rows.Count > 0 Then
|
||||
|
||||
Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dtSPEDEintrageAusEinarbeitung_HISTORY,,,,, False)
|
||||
If filepath <> "" Then
|
||||
Dim anhenge As New List(Of String)
|
||||
anhenge.Add(filepath)
|
||||
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("d.breimaier@verag.ag", "E-ZOLL nachträgliche Einarbeitung", "Im Anhang befinden sich die Speditionsbucheintrag, die bei der nachträglichen Einarbeitung angelegt wurden: " & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge)
|
||||
End If
|
||||
|
||||
|
||||
End If
|
||||
Return True
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -3932,10 +4000,6 @@ Public Class frmStartOptions
|
||||
Me.Visible = True
|
||||
End Sub
|
||||
|
||||
Private Sub LinkLabel25_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel25.LinkClicked
|
||||
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
|
||||
End Sub
|
||||
|
||||
Private Sub Button1_Click(sender As Object, e As EventArgs)
|
||||
For Each d In System.IO.Directory.GetDirectories(VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019")
|
||||
Dim fid As New FileInfo(d)
|
||||
@@ -4475,11 +4539,25 @@ Public Class frmStartOptions
|
||||
|
||||
Private Sub lblEZOLLDat_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles lblEZOLLDat.LinkClicked
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
|
||||
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value)
|
||||
showPic(bool, piceZollAnh)
|
||||
|
||||
If cbxEZOLLUNISPED.Checked Then
|
||||
|
||||
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
|
||||
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value, cbxSendEZOLL_INFO.Checked)
|
||||
showPic(bool, piceZollAnh)
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
|
||||
|
||||
Else
|
||||
Dim bool = importFileFromEZOLL(txtEZOLLAnhDat._value, cbxSendEZOLL_INFO.Checked)
|
||||
showPic(bool, piceZollAnh)
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.CheckedChanged
|
||||
Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs)
|
||||
|
||||
End Sub
|
||||
|
||||
@@ -5028,13 +5106,6 @@ Public Class frmStartOptions
|
||||
Me.Cursor = Cursors.Default
|
||||
End Sub
|
||||
|
||||
Private Sub LinkLabel48_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel48.LinkClicked
|
||||
Dim f = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
|
||||
importFileFromEZOLL(If(CheckBox2.Checked, Now.AddDays(-7), If(CheckBox3.Checked, Now.AddMonths(-1), Now)))
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = f
|
||||
End Sub
|
||||
|
||||
Private Function checkTestsystemSettings() As Boolean
|
||||
Dim check As Boolean = False
|
||||
If cbxTestFTP.Checked And Not cbxTestsystem.Checked Then
|
||||
@@ -7556,4 +7627,12 @@ repeatRequest:
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub Button31_Click(sender As Object, e As EventArgs) Handles btnEZOLL_7days.Click
|
||||
txtEZOLLAnhDat._value = Now().AddDays(-7).ToShortDateString
|
||||
End Sub
|
||||
|
||||
Private Sub Button32_Click(sender As Object, e As EventArgs) Handles btnEZOLL_1month.Click
|
||||
txtEZOLLAnhDat._value = Now().AddMonths(-1).ToShortDateString
|
||||
End Sub
|
||||
End Class
|
||||
Reference in New Issue
Block a user