diff --git a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb index 7abf902..507dc59 100644 --- a/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb +++ b/DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb @@ -755,7 +755,7 @@ Public Class cDakosyNCTSOut004 Public Function SAVE_ALL(Optional errHinweis = "") As Boolean If Not SAVE(errHinweis) Then Return False - If Not SAVE_Guarantee() Or Not SAVE_TransportEquipment() Or Not SAVE_HouseConsignment() Then Return False + If Not SAVE_Guarantee() Or Not SAVE_HouseConsignment() Or Not SAVE_TransportEquipment() Then Return False Return True End Function @@ -1177,7 +1177,7 @@ Public Class cDakosyNCTSOut004 Public Function SAVE_Guarantee() As Boolean 'Zuserst alle OffertenPos von dem Offert löschen - If DELETE_Guarantee() Then + If True Then ' DELETE_Guarantee() Then 'jetzt die Standartofferten einfügen For Each p In ncts_GUARANTEE p.nctsGRT_NctsId = ncts_Id diff --git a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb index 840eea4..93105fa 100644 --- a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb +++ b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb @@ -139,7 +139,7 @@ Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) Else - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") End If Case Else Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId) @@ -271,7 +271,7 @@ Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS004_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) Else - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.ncts_ObjectName & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.ncts_ObjectName & " (DAKOSY)") End If Case Else Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS004_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId) @@ -396,7 +396,7 @@ Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromTELOTEC_V2_0_2(NCTS_TMP, UniqueId, getTOBBKdnr) copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) Else - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.telanm_BezugsNr & vbNewLine & getTOBBDetails, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & NCTS_TMP.telanm_BezugsNr & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & NCTS_TMP.telanm_BezugsNr & " (TELOTEC)") End If Case Else @@ -580,7 +580,7 @@ Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId, getTOBBKdnr) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found) Else - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & LRN & vbNewLine & getTOBBDetails, "", System.Reflection.MethodInfo.GetCurrentMethod.Name, , "BezugsNr: " & LRN & " (DHF/EZOLL)") + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("TOBB: KEINE KDNR | BezugsNr: " & LRN & vbNewLine & getTOBBDetails(), "", System.Reflection.MethodInfo.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.LOG, "BezugsNr: " & LRN & " (DHF/EZOLL)") End If Case Else diff --git a/initATLASAufschubkonten/cWorker_NCTS.vb b/initATLASAufschubkonten/cWorker_NCTS.vb index 525911b..0d65d64 100644 --- a/initATLASAufschubkonten/cWorker_NCTS.vb +++ b/initATLASAufschubkonten/cWorker_NCTS.vb @@ -1196,8 +1196,7 @@ Public Class cWorker_NCTS - - If NCTS.SAVE_ALL() Then + If NCTS.SAVE() Then If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_50,,,, statusTMP) Else readNCTS_VersandanmeldungXML_DETPRH = "" @@ -1883,7 +1882,7 @@ Public Class cWorker_NCTS 'If If(NCTS.ncts_Status_KEWILL_Equivalent, 0) <= 5 Then NCTS.ncts_Status_KEWILL_Equivalent = DAKOSY_Worker.cDY_Statusliste.S_05 - If NCTS.SAVE_ALL("Datei: " & Dateiname) Then + If NCTS.SAVE("Datei: " & Dateiname) Then If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05) Return bezugsNr End If