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

neu

Browse Source
This commit is contained in:
Andreas Luxbauer
2020-12-13 21:31:40 +01:00
parent 14a7113144
commit 62315eaef7
5 changed files with 111 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cNCTSPartnerWorker/NCTSPartnerWorker.vbproj
View File

@@ -65,7 +65,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Class1.vb" />
<Compile Include="cNCTS_TR.vb" />
<Compile Include="MAVI\cMavi_Paramter.vb" />
<Compile Include="MAVI\cMAVIGetMsgType.vb" />
<Compile Include="MAVI\cMAVIFunctions.vb" />

1488
cNCTSPartnerWorker/cNCTS_TR.vb
View File

File diff suppressed because it is too large Load Diff

48
initATLASAufschubkonten/cMAVIWorker.vb
View File

@@ -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,22 +35,22 @@ 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
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"
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
@@ -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

38
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -600,11 +600,25 @@ Public Class frmDYNachrichtenVerarbeitung
Case "IME"
AES_TMP.aes_firma = "IMEX"
AES_TMP.aes_niederlassung = "IMEX"
Case "UNAT", "ATSPED"
AES_TMP.aes_firma = "UNISPED"
AES_TMP.aes_niederlassung = "ATSP"
End Select
AES_TMP.SAVE()
End If
End If
If If(AES_TMP.aes_firma, "") = "" And If(AES_TMP.aes_firma, "") = "" Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA 'Gehrt nur bei UNSPED
Case "UNISPED"
AES_TMP.aes_firma = "UNISPED"
AES_TMP.aes_niederlassung = "ATSP"
End Select
End If
End Sub
@@ -643,9 +657,14 @@ Public Class frmDYNachrichtenVerarbeitung
Case "IME"
EZA_TMP.eza_firma = "IMEX"
EZA_TMP.eza_niederlassung = "IMX"
Case "UNAT", "ATSPED"
EZA_TMP.eza_firma = "UNISPED"
EZA_TMP.eza_niederlassung = "ATSP"
End Select
firma = EZA_TMP.eza_firma
nl = EZA_TMP.eza_niederlassung
firma = If(EZA_TMP.eza_firma, "")
nl = If(EZA_TMP.eza_niederlassung, "")
EZA_TMP.SAVE()
End If
@@ -654,6 +673,18 @@ Public Class frmDYNachrichtenVerarbeitung
DY_TMP.tryFindAviso()
DY_TMP.SAVE()
End If
If If(EZA_TMP.eza_firma, "") = "" And If(EZA_TMP.eza_niederlassung, "") = "" Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA 'Gehrt nur bei UNSPED
Case "UNISPED"
EZA_TMP.eza_firma = "UNISPED"
EZA_TMP.eza_niederlassung = "ATSP"
firma = EZA_TMP.eza_firma
nl = EZA_TMP.eza_niederlassung
End Select
End If
End Sub
@@ -4355,7 +4386,7 @@ Public Class frmDYNachrichtenVerarbeitung
' niederlassung = "SBG"
Case "4803", "5003", "5103", "5303", "4805", "4811"
firma = "VERAG"
Case "4801"
Case "5601"
firma = "UNISPED"
niederlassung = "ATSP"
End Select
@@ -5446,7 +5477,6 @@ Public Class frmDYNachrichtenVerarbeitung
Dim nl = ""
SaveEZA_FirmaNL(EZA_TMP, DY_TMP, division, firma, nl)
If AUFSCHUB IsNot Nothing And EZA_TMP IsNot Nothing Then
EZA_TMP.eza_AUFSCHUB.Clear()
For Each a In AUFSCHUB

34
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -697,6 +697,21 @@ Public Class frmStartOptions
' LC.Add(New VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse(Code, Description, StartDate, EndDate))
' VERAG_PROG_ALLGEMEIN.
getEZB_Waehrungskurse = True
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
SQL.doSQL("IF NOT EXISTS (SELECT * FROM baskur WHERE baskur_code ='" & EZB.ezb_waehrungscode & "' AND baskur_gbdat =cast(getdate() as date) )
BEGIN
INSERT INTO [baskur]
([baskur_code],[baskur_typ],[baskur_bez],[baskur_faktor],[baskur_kurs],[baskur_gvdat],[baskur_gbdat],[baskur_edat],[baskur_adat],[baskur_sb],[baskur_cdealt],[baskur_wkz])
VALUES ('" & EZB.ezb_waehrungscode & "',1,'-',1," & Entry.Attributes("rate").Value & ",cast(getdate() as date),cast(getdate() as date),getdate(),getdate(),'VRG',000,'EUR')
END", "ATLAS")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Next
End If
VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse.UPDATE_Waehrungstabelle(datum) ' Waehrungstabelle befüllen
@@ -797,6 +812,25 @@ Public Class frmStartOptions
' LC.Add(New VERAG_PROG_ALLGEMEIN.cEZB_Waehrungskurse(Code, Description, StartDate, EndDate))
' VERAG_PROG_ALLGEMEIN.
getEZB_Waehrungskurse90D = True
'MsgBox(datum.ToShortDateString & " - " & Now.ToShortDateString)
'If datum.ToShortDateString = Now.ToShortDateString Then 'aktuellen TAG sichern.
' Try
' Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
' SQL.doSQL("INSERT INTO [baskur]
' ([baskur_code],[baskur_typ],[baskur_bez],[baskur_faktor],[baskur_kurs],[baskur_gvdat],[baskur_gbdat],[baskur_edat],[baskur_adat],[baskur_sb],[baskur_cdealt],[baskur_wkz])
' VALUES ('" & EZB.ezb_waehrungscode & "',1,'-',1," & Entry.Attributes("rate").Value & ",cast(getdate() as date),cast(getdate() as date),getdate(),getdate(),'VRG',000,'EUR')", "ATLAS")
' Catch ex As Exception
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
' End Try
'End If
Next