Merge branch 'ADMIN' of https://git.it.verag.ag/edv/ADMIN into ADMIN

This commit is contained in:
2026-01-07 14:01:17 +01:00
12 changed files with 1733 additions and 249 deletions

View File

@@ -997,6 +997,15 @@ Public Class frmStartOptions
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
'=====IMPORT IN VERAG DATENMODELL==========
Dim IMP As New DAKOSY_Worker.cImporter_DHFToVERAG
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Case "UNIDPED" : IMP.ImportEZOLLByLRN(cDHF_Anhaenge.CRN, "EZOLL_UNISPED", False)
Case Else : IMP.ImportEZOLLByLRN(cDHF_Anhaenge.CRN, "EZOLL", False)
End Select
'==========================================
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"
@@ -2611,14 +2620,18 @@ Public Class frmStartOptions
destFull = ""
moveFile(pfad, ZIEL_PFAD, destFull)
Try
If DS.insertDataToDATENSERVER(destFull) Then
If IsNumeric(dy_id) AndAlso dy_id > 0 Then
sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_VBD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
sql.doSQL("UPDATE Speditionsbuch SET DokumentId_VBD='" & DS.da_id & "' where AtlasBezNrNCTS='" & betreff.ToString.Trim & "' AND DokumentId_VBD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", dy_id)
If DS.insertDataToDATENSERVER(destFull) Then
If IsNumeric(dy_id) AndAlso dy_id > 0 Then
sql.doSQL("UPDATE tblDakosy_Zollanmeldungen SET dy_VBD_dsId='" & DS.da_id & "' where dy_id='" & dy_id & "'", "FMZOLL")
sql.doSQL("UPDATE Speditionsbuch SET DokumentId_VBD='" & DS.da_id & "' where AtlasBezNrNCTS='" & betreff.ToString.Trim & "' AND DokumentId_VBD is null", "FMZOLL") 'Falls Spedbuch schon zuvor generiert wurde!
doMailZollbeleg(DS.GET_TOP1_PATH, "VBD", dy_id)
End If
End If
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, "Pfad: " & destFull & vbNewLine & vbNewLine & ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
End If