neu

2020-12-13 21:31:40 +01:00
parent 14a7113144
commit 62315eaef7
5 changed files with 111 additions and 1536 deletions
--- a/initATLASAufschubkonten/cMAVIWorker.vb
+++ b/initATLASAufschubkonten/cMAVIWorker.vb
@@ -7,7 +7,7 @@ Public Class cMAVIWorker

    Shared SQL As New VERAG_PROG_ALLGEMEIN.SQL

-
+    Shared Partnersystem = "" ' FUnzt noch nciht --> leer für zuordnung guid mrn, sonst problem

    Public Shared Function readNCTS_VersandanmeldungXML_CC015B(FORM As frmTRNCTS_NachrichtenVerarbeitung, doc As XmlDocument) As String
        Try
@@ -35,35 +35,35 @@ Public Class cMAVIWorker


                Dim AnsprechpTMP_Email = ""
-                Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr(LRN, True,, "MAVI")
-                If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
-                    NCTS.ncts_ObjectName = LRN
+                Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr(LRN, True,, Partnersystem)
+                If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
+                NCTS.ncts_ObjectName = LRN

-                    NCTS.ncts_Partnersystem = "MAVI"
+                NCTS.ncts_Partnersystem = "MAVI"


-                    If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then
-                        Dim BRG As New cNCTSPartnerWorker.cNCTS_TR_Sicherheitsangaben
-                        BRG.nctsSA_GRN = doc.GetElementsByTagName("GuaRefNumGRNREF1")(0).InnerText
-                        Dim Betrag = doc.GetElementsByTagName("AmoConREF7")(0).InnerText
-                        If IsNumeric(Betrag) Then
-                            BRG.nctsSA_AbgabenBetrag = CDbl(Betrag)
-                        End If
-
-                        NCTS.ncts_SICHERHEITSANGABEN = New List(Of cNCTSPartnerWorker.cNCTS_TR_Sicherheitsangaben)
-                        NCTS.ncts_SICHERHEITSANGABEN.Add(BRG)
+                If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then
+                    Dim BRG As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben
+                    BRG.nctsSA_GRN = doc.GetElementsByTagName("GuaRefNumGRNREF1")(0).InnerText
+                    Dim Betrag = doc.GetElementsByTagName("AmoConREF7")(0).InnerText
+                    If IsNumeric(Betrag) Then
+                        BRG.nctsSA_AbgabenBetrag = CDbl(Betrag)
                    End If

+                    NCTS.ncts_SICHERHEITSANGABEN = New List(Of VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben)
+                    NCTS.ncts_SICHERHEITSANGABEN.Add(BRG)
+                End If

-                    If If(NCTS.ncts_Status, 0) <= 5 Then NCTS.ncts_Status = 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
-                    NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status

-                    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_05,,,, statusTMP)
-                    Else
-                        readNCTS_VersandanmeldungXML_CC015B = ""
-                    End If
+                If If(NCTS.ncts_Status, 0) <= 5 Then NCTS.ncts_Status = 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
+                NCTS.ncts_Status_KEWILL_Equivalent = NCTS.ncts_Status
+
+                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_05,,,, statusTMP)
+                Else
+                    readNCTS_VersandanmeldungXML_CC015B = ""
+                End If



@@ -114,8 +114,8 @@ Public Class cMAVIWorker


                Dim AnsprechpTMP_Email = ""
-                Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, GUID, "", True,, "MAVI")
-                If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, GUID, "", True,, Partnersystem)
+                If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
                NCTS.ncts_ObjectName = LRN
                NCTS.ncts_GUID = GUID

@@ -219,8 +219,8 @@ Public Class cMAVIWorker


                    Dim AnsprechpTMP_Email = ""
-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, "", MRN, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, "", MRN, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
                    NCTS.ncts_ObjectName = LRN

                    NCTS.ncts_Partnersystem = "MAVI"
@@ -230,14 +230,14 @@ Public Class cMAVIWorker
                    NCTS.ncts_Befoerderungsmittel_KennzeichenAbgang = ncts_Befoerderungsmittel_KennzeichenAbgang
                    NCTS.ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend = ncts_Befoerderungsmittel_KennzeichenGrenzueberschreitend
                    'If doc.GetElementsByTagName("GuaRefNumGRNREF1").Count > 0 AndAlso doc.GetElementsByTagName("AmoConREF7").Count > 0 Then
-                    '    Dim BRG As New cNCTSPartnerWorker.cNCTS_TR_Sicherheitsangaben
+                    '    Dim BRG As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben
                    '    BRG.nctsSA_GRN = doc.GetElementsByTagName("GuaRefNumGRNREF1")(0).InnerText
                    '    Dim Betrag = doc.GetElementsByTagName("AmoConREF7")(0).InnerText
                    '    If IsNumeric(Betrag) Then
                    '        BRG.nctsSA_AbgabenBetrag = CDbl(Betrag)
                    '    End If

-                    '    NCTS.ncts_SICHERHEITSANGABEN = New List(Of cNCTSPartnerWorker.cNCTS_TR_Sicherheitsangaben)
+                    '    NCTS.ncts_SICHERHEITSANGABEN = New List(Of VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben)
                    '    NCTS.ncts_SICHERHEITSANGABEN.Add(BRG)
                    'End If

@@ -303,13 +303,13 @@ Public Class cMAVIWorker
                    Catch ex As Exception
                    End Try

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByMRN(MRN, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByMRN(MRN, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
                    'NCTS.ncts_ObjectName = LRN 
                    '  NCTS.ncts_GUID = Guid
                    NCTS.ncts_MRN = MRN
                    NCTS.ncts_Erledigung = TMSTMP.ToShortDateString
-                    readNCTS_ErledigungsmitteilungXML_CC045A=MRN
+                    readNCTS_ErledigungsmitteilungXML_CC045A = MRN

                    NCTS.ncts_Partnersystem = "MAVI"

@@ -370,8 +370,8 @@ Public Class cMAVIWorker

                    Dim AnsprechpTMP_Email = ""

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByGUID(GUID, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByGUID(GUID, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
                    'NCTS.ncts_ObjectName = LRN 
                    NCTS.ncts_GUID = GUID

@@ -441,8 +441,8 @@ Public Class cMAVIWorker
                    outputFile.Write(xmlCC009A)
                    outputFile.Close()

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN("", "", MRN, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN("", "", MRN, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR

                    NCTS.ncts_Partnersystem = "MAVI"
                    NCTS.ncts_MRN = MRN
@@ -509,8 +509,8 @@ Public Class cMAVIWorker
                    outputFile.Write(xmlCC016A)
                    outputFile.Close()

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, "", "", True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN(LRN, "", "", True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR

                    NCTS.ncts_Partnersystem = "MAVI"
                    NCTS.ncts_ObjectName = LRN
@@ -575,8 +575,8 @@ Public Class cMAVIWorker
                    outputFile.Write(xmlCC051B)
                    outputFile.Close()

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN("", "", MRN, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByBezugsNr_or_GUID_or_MRN("", "", MRN, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR

                    NCTS.ncts_Partnersystem = "MAVI"
                    NCTS.ncts_MRN = MRN
@@ -637,8 +637,8 @@ Public Class cMAVIWorker

                    Dim AnsprechpTMP_Email = ""

-                    Dim NCTS As cNCTSPartnerWorker.cNCTS_TR = cNCTSPartnerWorker.cNCTS_TR.LOADByGUID(GUID, True,, "MAVI")
-                    If NCTS Is Nothing Then NCTS = New cNCTSPartnerWorker.cNCTS_TR
+                    Dim NCTS As VERAG_PROG_ALLGEMEIN.cNCTS_TR = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByGUID(GUID, True,, Partnersystem)
+                    If NCTS Is Nothing Then NCTS = New VERAG_PROG_ALLGEMEIN.cNCTS_TR
                    'NCTS.ncts_ObjectName = LRN 
                    NCTS.ncts_GUID = GUID