edv/ADMIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ADMIN' of https://verag.visualstudio.com/ADMIN/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2023-12-01 15:27:24 +01:00
parent 250a8303f0 07e21d0c59
commit bec09948bf
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DAKOSY_Worker/DAKOSY/ATLAS/NCTS/cDakosyNCTSOut004.vb
View File

@@ -755,7 +755,7 @@ Public Class cDakosyNCTSOut004
Public Function SAVE_ALL(Optional errHinweis = "") As Boolean Public Function SAVE_ALL(Optional errHinweis = "") As Boolean
If Not SAVE(errHinweis) Then Return False 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 Return True
End Function End Function
@@ -1177,7 +1177,7 @@ Public Class cDakosyNCTSOut004
Public Function SAVE_Guarantee() As Boolean Public Function SAVE_Guarantee() As Boolean
'Zuserst alle OffertenPos von dem Offert löschen 'Zuserst alle OffertenPos von dem Offert löschen
If DELETE_Guarantee() Then If True Then ' DELETE_Guarantee() Then
'jetzt die Standartofferten einfügen 'jetzt die Standartofferten einfügen
For Each p In ncts_GUARANTEE For Each p In ncts_GUARANTEE
p.nctsGRT_NctsId = ncts_Id p.nctsGRT_NctsId = ncts_Id

8
initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb
View File

@@ -139,7 +139,7 @@
Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId, getTOBBKdnr) 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) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
Else 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 End If
Case Else Case Else
Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId) 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) 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) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
Else 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 End If
Case Else Case Else
Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS004_FromDAKOSY_V2_0_2(NCTS_TMP, DY_TMP, UniqueId) 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) 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) copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
Else 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 End If
Case Else Case Else
@@ -580,7 +580,7 @@
Dim NCTS_VERAG_OUT = genVERAG_OUT_NCTS_FromEZOLLByAnmId_V2_0_2(AnmId, UniqueId, getTOBBKdnr) 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) If NCTS_VERAG_OUT IsNot Nothing Then copyNCTSToFTP_V2_0_2(NCTS_VERAG_OUT, o, vorsystem, filePath, destFile, UniqueId, checkAlreadyProvided, found)
Else 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 End If
Case Else Case Else

5
initATLASAufschubkonten/cWorker_NCTS.vb
View File

@@ -1196,8 +1196,7 @@ Public Class cWorker_NCTS
If NCTS.SAVE() Then
If NCTS.SAVE_ALL() Then
If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_50,,,, statusTMP) If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_50,,,, statusTMP)
Else Else
readNCTS_VersandanmeldungXML_DETPRH = "" 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 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) If If(NCTS.ncts_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05)
Return bezugsNr Return bezugsNr
End If End If