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

This commit is contained in:
2026-04-09 12:48:15 +02:00
8 changed files with 2528 additions and 2236 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -167,6 +167,7 @@ Public Class cImporter_DakosyToVERAG
' ================================================================
' ABGABEN
' ================================================================
If eza.eza_AUFSCHUB IsNot Nothing Then
For Each d In eza.eza_AUFSCHUB

View File

@@ -1,4 +1,5 @@
Imports VERAG_PROG_ALLGEMEIN
Imports com.sun.rowset.internal
Imports VERAG_PROG_ALLGEMEIN
Public Class cZollsysteme_Aktenbeschriftung
@@ -28,6 +29,8 @@ Public Class cZollsysteme_Aktenbeschriftung
Property Zollstelle_Eingang As String = ""
Property Waehrungscode As String = "EUR"
Property Incoterms As String = ""
Property Incoterms_code As String = ""
Property Incoterms_ort As String = ""
Property Geschaeftsart As String = ""
Property isUeT1 As Boolean = False
Property dtWARENPOS As New DataTable
@@ -97,53 +100,54 @@ Public Class cZollsysteme_Aktenbeschriftung
getDataByBezugsnummer = False
'MsgBox("2 " & Abfertigungsart)
Select Case Abfertigungsart
Case 38, 26 'AT
Select Case Zollsystem_Land
Case "AT"
'eZoll
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
Case 38, 26 'AT
Select Case Zollsystem_Land
Case "AT"
'eZoll
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
' MsgBox("1")
Case "DE"
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
Case "DE"
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
Case Else
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
' MsgBox("3 ")
End Select
If Not getDataByBezugsnummer Then
' getADFrom_EZOLL
getDataByBezugsnummer = load_NCTS004_FromDAKOSY(BezugsNr, True, PosNrAngeben) 'Neues NCTS Format!
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben)
isUeT1 = (getDataByBezugsnummer)
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
End If
End If
Case 1, 2, 3, 28, 39
'... and Systeme
Select Case Zollsystem_Land
Case "AT"
'eZoll
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
Case Else
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
End Select
Case Else
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
getDataByBezugsnummer = load_NCTS004_FromDAKOSY(BezugsNr, True, PosNrAngeben) 'Neues NCTS Format!
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben)
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
End If
End If
' MsgBox("3 ")
End Select
If Not getDataByBezugsnummer Then
' getADFrom_EZOLL
getDataByBezugsnummer = load_NCTS004_FromDAKOSY(BezugsNr, True, PosNrAngeben) 'Neues NCTS Format!
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben)
isUeT1 = (getDataByBezugsnummer)
Sachbearbeiter = "" ' Bei Ü-T1 soll der SB leer sein, sonst wird dieser evtl. beim Austragen herangezogen...
End If
End If
Case 1, 2, 3, 28, 39
'... and Systeme
Select Case Zollsystem_Land
Case "AT"
'eZoll
getDataByBezugsnummer = load_EZA_FromEZOLL(BezugsNr, True)
Case Else
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
End Select
Case Else
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
getDataByBezugsnummer = load_NCTS004_FromDAKOSY(BezugsNr, True, PosNrAngeben) 'Neues NCTS Format!
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_NCTS_FromDAKOSY(BezugsNr, True, PosNrAngeben)
If Not getDataByBezugsnummer Then 'Falls doch nicht
getDataByBezugsnummer = load_EZA_FromDAKOSY(BezugsNr, True)
End If
End If
End Select
End Function
@@ -293,6 +297,7 @@ Public Class cZollsysteme_Aktenbeschriftung
If Not IsNull(DTzsAnmValData.Rows(0).Item("InvVal")) Then Rechnungspreis = CDbl(DTzsAnmValData.Rows(0).Item("InvVal")) : RechnungspreisohneWahrung = CDbl(DTzsAnmValData.Rows(0).Item("InvVal"))
If Not IsNull(DTzsAnmValData.Rows(0).Item("InvCurr")) Then Waehrungscode = DTzsAnmValData.Rows(0).Item("InvCurr") : Rechnungspreis &= " " & Waehrungscode
If Not IsNull(DTzsAnmValData.Rows(0).Item("TermDelCd")) Then Incoterms = DTzsAnmValData.Rows(0).Item("TermDelCd")
If Not IsNull(DTzsAnmValData.Rows(0).Item("TermDelCd")) Then Incoterms_code = DTzsAnmValData.Rows(0).Item("TermDelCd")
If Not IsNull(DTzsAnmValData.Rows(0).Item("TransacCd")) Then Geschaeftsart = DTzsAnmValData.Rows(0).Item("TransacCd")
@@ -352,7 +357,7 @@ Public Class cZollsysteme_Aktenbeschriftung
If Not IsNull(row.Item("Orig")) Then R("Herkunft") = row.Item("Orig")
If Not IsNull(row.Item("ComCd")) AndAlso IsNumeric(row.Item("ComCd")) Then
R("isCBAM") = checkisCBAM(row.Item("ComCd"))
R("isCBAM") = cGreendeal_CBAM_Trn.isCBAMTnr(row.Item("ComCd"))
End If
dtWARENPOS.Rows.Add(R)
@@ -438,42 +443,42 @@ Public Class cZollsysteme_Aktenbeschriftung
Return load_EZA_FromDAKOSY(EZA)
End Function
Function checkisCBAM(cbamWarenNr As String) As Boolean
'Function checkisCBAM(cbamWarenNr As String) As Boolean
' Return
' If (Left(cbamWarenNr, 4) = "2523" Or
' Left(cbamWarenNr, 4) = "2716" Or
' Left(cbamWarenNr, 4) = "2808" Or
' Left(cbamWarenNr, 4) = "2814" Or
' Left(cbamWarenNr, 4) = "3102" Or
' Left(cbamWarenNr, 4) = "3105" Or
' Left(cbamWarenNr, 4) = "7201" Or
' Left(cbamWarenNr, 4) = "7203" Or
' Left(cbamWarenNr, 4) = "7318" Or
' Left(cbamWarenNr, 6) = "283421" Or
' Left(cbamWarenNr, 6) = "260112" Or
' Left(cbamWarenNr, 6) = "720211" Or
' Left(cbamWarenNr, 6) = "720219" Or
' Left(cbamWarenNr, 6) = "720241" Or
' Left(cbamWarenNr, 6) = "720249" Or
' Left(cbamWarenNr, 6) = "720260" Or
' Left(cbamWarenNr, 6) = "280410" Or
' Left(cbamWarenNr, 4) = "7326" Or
' Left(cbamWarenNr, 4) = "7601" Or
' Left(cbamWarenNr, 4) = "7616" Or
' Left(cbamWarenNr, 8) = "25070080" Or
' CInt(Left(cbamWarenNr, 4)) <= 7301 And CInt(Left(cbamWarenNr, 4)) >= 7311 Or
' CInt(Left(cbamWarenNr, 4)) <= 7205 And CInt(Left(cbamWarenNr, 4)) >= 7229 Or
' CInt(Left(cbamWarenNr, 4)) <= 7603 And CInt(Left(cbamWarenNr, 4)) >= 7614) And Not Left(cbamWarenNr, 6) = "310560" Then
If (Left(cbamWarenNr, 4) = "2523" Or
Left(cbamWarenNr, 4) = "2716" Or
Left(cbamWarenNr, 4) = "2808" Or
Left(cbamWarenNr, 4) = "2814" Or
Left(cbamWarenNr, 4) = "3102" Or
Left(cbamWarenNr, 4) = "3105" Or
Left(cbamWarenNr, 4) = "7201" Or
Left(cbamWarenNr, 4) = "7203" Or
Left(cbamWarenNr, 4) = "7318" Or
Left(cbamWarenNr, 6) = "283421" Or
Left(cbamWarenNr, 6) = "260112" Or
Left(cbamWarenNr, 6) = "720211" Or
Left(cbamWarenNr, 6) = "720219" Or
Left(cbamWarenNr, 6) = "720241" Or
Left(cbamWarenNr, 6) = "720249" Or
Left(cbamWarenNr, 6) = "720260" Or
Left(cbamWarenNr, 6) = "280410" Or
Left(cbamWarenNr, 4) = "7326" Or
Left(cbamWarenNr, 4) = "7601" Or
Left(cbamWarenNr, 4) = "7616" Or
Left(cbamWarenNr, 8) = "25070080" Or
CInt(Left(cbamWarenNr, 4)) <= 7301 And CInt(Left(cbamWarenNr, 4)) >= 7311 Or
CInt(Left(cbamWarenNr, 4)) <= 7205 And CInt(Left(cbamWarenNr, 4)) >= 7229 Or
CInt(Left(cbamWarenNr, 4)) <= 7603 And CInt(Left(cbamWarenNr, 4)) >= 7614) And Not Left(cbamWarenNr, 6) = "310560" Then
' Return True
Return True
' Else
Else
' Return False
Return False
' End If
End If
End Function
'End Function
Function load_EZA_FromDAKOSY(EZA As DAKOSY_Worker.cDakosyEZA) As Boolean
Try
@@ -486,7 +491,7 @@ Public Class cZollsysteme_Aktenbeschriftung
'Me.Rechnungspreis &= " " & If(EZA.eza_Rechnungswaehrung, "")
ATCMRN = If(EZA.eza_ANR, "")
Me.RechnungspreisohneWahrung =Me.Rechnungspreis
Me.RechnungspreisohneWahrung = Me.Rechnungspreis
Me.Rechnungspreis &= " " & If(EZA.eza_Rechnungswaehrung, "")
'Property Absender As String
@@ -517,7 +522,7 @@ Public Class cZollsysteme_Aktenbeschriftung
If Not IsNull(POS.ezaWP_UrsprungslandCode) Then R("Herkunft") = POS.ezaWP_UrsprungslandCode
If Not IsNull(POS.ezaWP_Rohmasse) Then R("Netto") = POS.ezaWP_Rohmasse
If Not IsNull(POS.ezaWP_WarennummerEZT) AndAlso IsNumeric(POS.ezaWP_WarennummerEZT) Then
R("isCBAM") = checkisCBAM(POS.ezaWP_WarennummerEZT)
R("isCBAM") = cGreendeal_CBAM_Trn.isCBAMTnr(POS.ezaWP_WarennummerEZT)
End If
@@ -603,9 +608,10 @@ Public Class cZollsysteme_Aktenbeschriftung
If EZA.eza_ArtGeschaeftCode IsNot Nothing AndAlso EZA.eza_ArtGeschaeftCode <> "" Then Geschaeftsart = EZA.eza_ArtGeschaeftCode
If EZA.eza_LieferbedingungCode IsNot Nothing AndAlso EZA.eza_LieferbedingungCode <> "" Then Incoterms = EZA.eza_LieferbedingungCode
If EZA.eza_LieferbedingungCode IsNot Nothing AndAlso EZA.eza_LieferbedingungCode <> "" Then Incoterms_code = EZA.eza_LieferbedingungCode
If EZA.eza_LieferbedingungCode IsNot Nothing AndAlso EZA.eza_LieferbedingungCode <> "" Then Incoterms = EZA.eza_LieferbedingungCode
If EZA.eza_LieferbedingungOrt IsNot Nothing AndAlso EZA.eza_LieferbedingungOrt <> "" AndAlso Incoterms <> "" Then Incoterms &= " " & EZA.eza_LieferbedingungOrt
If EZA.eza_LieferbedingungOrt IsNot Nothing AndAlso EZA.eza_LieferbedingungOrt <> "" AndAlso Incoterms <> "" Then Incoterms_ort = " " & EZA.eza_LieferbedingungOrt
If EZA.eza_Rechnungswaehrung IsNot Nothing AndAlso EZA.eza_Rechnungswaehrung <> "" Then Waehrungscode = EZA.eza_Rechnungswaehrung

View File

@@ -136,6 +136,7 @@ Public Class cWorker_AES_EXG
STATUS.SAVE()
'----------------------------------------------------------------------
'NCTS AKtualisieren!
'----------------------------------------------------------------------
@@ -143,22 +144,25 @@ Public Class cWorker_AES_EXG
'----------------------------------------------------------------------
'Wenn markiert wurde, dass die NCTS Daten ergänzt werden sollten
'----------------------------------------------------------------------
Dim testDY = False
Dim testDY = True
If testDY Or (EXG.exg_AutoFill_DyId IsNot Nothing AndAlso EXG.exg_AutoFill_DyId >= 0) Then
Console.WriteLine("EXG: NCTS Verarbeitung starten...")
'----------------------------------------------------------------------
'NCTS BEFÜLLEN!
'----------------------------------------------------------------------
Dim NCTS_OUT = fillNCTS_WithEXG_AutoFill(EXG, "TEEEEEEESTTT")
'----------------------------------------------------------------------
'----------------------------------------------------------------------
testDY = True
'Prüfen ob alle EXG Daten gekommen sind --> NCTS Senden!
If testDY Or (cDakosyEXG.isFillNCTS_ID_ALLCompleted(EXG.exg_AutoFill_DyId)) Then
Dim DY_ANM = New cDakosy_Zollanmeldungen(EXG.exg_AutoFill_DyId)
If NCTS_OUT IsNot Nothing Then
'Dim cDY As New cDakosyNCTSOut(cDyAnm.dy_Id, cDyAnm.dy_Erstellung_SB)
NCTS_OUT.ncts_dyaAnmID = DY_ANM.dy_Id
NCTS_OUT.ncts_Erstellung_SB = DY_ANM.dy_Erstellung_SB
@@ -170,12 +174,17 @@ Public Class cWorker_AES_EXG
'VON HIER löschnen ohne test
If testDY OrElse NCTS_OUT.SAVE_ALL() Then
If If(EXG.exg_AutoFill_DyId, -1) > 0 Then 'Nur speichern wenn bei test exg_AutoFill_DyId befüllt ist
NCTS_OUT.SAVE_ALL()
End If
Dim saveFile = ""
If cDakosyNCTSOut004.generateVersandanmeldungNCTSDE_004(NCTS_OUT, saveFile, "CREATE", Application.StartupPath) Then
If saveFile <> "" Then
frmStartOptions.copyFile(saveFile, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\upl\NCTS\")
End If
@@ -213,71 +222,71 @@ Public Class cWorker_AES_EXG
DY_ANM.UPDATE_AVISO_SND(DY_ANM.dy_SendungsId)
End If
End If
End If
'----------------------------------------------------------------------
'QULAIFIZIERUNG!
'----------------------------------------------------------------------
'----------------------------------------------------------------------
'Es wird bei Daten zum AUsgang und "_EXG" automaitsch die Qualifizierung aufgerufen...
Dim test = False
'----------------------------------------------------------------------
'----------------------------------------------------------------------
If False Then '--------------QUALIFIZIERUNG NOCH NCIHT SENDEN! ------------------
'----------------------------------------------------------------------
'----------------------------------------------------------------------
If readEZA_DatenZumAusgang_DataEXITDE_005.Contains("_EXG") Or test Then
Dim IOPARTNER = VWI.Transaktion.IOPartner
Dim DIVISION3 = VWI.Transaktion.IODivision3
Dim DAKOSY_SB = "ANDREAS"
Dim DY_ACTIONS As New List(Of String)
If IOPARTNER = "UNAT" Then
DAKOSY_SB = "luxbauer"
End If
End If
Dim saveFile = ""
DY_ACTIONS.Add("CHANGE")
DY_ACTIONS.Add("SEND")
'----------------------------------------------------------------------
'QULAIFIZIERUNG!
'----------------------------------------------------------------------
If generateInformationenZumAusgang003(EXG, readEZA_DatenZumAusgang_DataEXITDE_005, saveFile, DY_ACTIONS, IOPARTNER, DIVISION3, DAKOSY_SB) Then
If saveFile <> "" Then
If test Then
frmStartOptions.copyFile(saveFile, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\upl\")
Else
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, readEZA_DatenZumAusgang_DataEXITDE_005, -1, IOPARTNER) Then
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
Return True
'----------------------------------------------------------------------
'Es wird bei Daten zum AUsgang und "_EXG" automaitsch die Qualifizierung aufgerufen...
Dim test = False
'----------------------------------------------------------------------
'----------------------------------------------------------------------
If False Then '--------------QUALIFIZIERUNG NOCH NCIHT SENDEN! ------------------
'----------------------------------------------------------------------
'----------------------------------------------------------------------
If readEZA_DatenZumAusgang_DataEXITDE_005.Contains("_EXG") Or test Then
Dim IOPARTNER = VWI.Transaktion.IOPartner
Dim DIVISION3 = VWI.Transaktion.IODivision3
Dim DAKOSY_SB = "ANDREAS"
Dim DY_ACTIONS As New List(Of String)
If IOPARTNER = "UNAT" Then
DAKOSY_SB = "luxbauer"
End If
Dim saveFile = ""
DY_ACTIONS.Add("CHANGE")
DY_ACTIONS.Add("SEND")
If generateInformationenZumAusgang003(EXG, readEZA_DatenZumAusgang_DataEXITDE_005, saveFile, DY_ACTIONS, IOPARTNER, DIVISION3, DAKOSY_SB) Then
If saveFile <> "" Then
If test Then
frmStartOptions.copyFile(saveFile, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\upl\")
Else
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
Return False
If cDakosyFunftions.send_Data_To_Dakosy_FTP(saveFile, readEZA_DatenZumAusgang_DataEXITDE_005, -1, IOPARTNER) Then
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_03)
Return True
Else
'DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_ANM, DAKOSY_Worker.cDY_Statusliste.S_09)
Return False
End If
End If
End If
End If
End If
End If
'----------------------------------------------------------------------
FORM.addDGVEinarbeitung("AES: ExportGest.-DatenZumAusgang", STATUS.dySt_BezugsNr)
End If
'----------------------------------------------------------------------
'----------------------------------------------------------------------
FORM.addDGVEinarbeitung("AES: ExportGest.-DatenZumAusgang", STATUS.dySt_BezugsNr)
End If
'----------------------------------------------------------------------
'----------------------------------------------------------------------
End If
End If
Next
@@ -297,13 +306,16 @@ Public Class cWorker_AES_EXG
Shared Function fillNCTS_WithEXG_AutoFill(EXG As cDakosyEXG, ObjectName As String) As cDakosyNCTSOut004
If (EXG.exg_AutoFill_DyId IsNot Nothing AndAlso EXG.exg_AutoFill_DyId >= 0) Then
Dim NCTS_OUT = DAKOSY_Worker.cDakosyNCTSOut004.LOADByAnmIDFull(EXG.exg_AutoFill_DyId, False)
Dim NCTS_OUT = DAKOSY_Worker.cDakosyNCTSOut004.LOADByAnmIDFull(EXG.exg_AutoFill_DyId, True)
If NCTS_OUT Is Nothing Then
NCTS_OUT = New DAKOSY_Worker.cDakosyNCTSOut004
NCTS_OUT.ncts_ObjectName = "TEEEESSSSTTT"
NCTS_OUT.ncts_ObjectName = ObjectName
End If
Console.WriteLine("EXG: NCTS befüllen...")
DAKOSY_Worker.cDakosyNCTSOut004.fillNCTS_WithEXG(NCTS_OUT, EXG, ObjectName)
Console.WriteLine("EXG: NCTS updaten...")
cDakosyEXG.UPDATE_FillNCTS_ID_Completed(EXG.exg_Id) 'Eintrag, dass AutoFill durchgelaufen ist
Return NCTS_OUT

View File

@@ -230,14 +230,19 @@ Public Class frmDYNachrichtenVerarbeitung
For Each d In getFilesInOrder() 'System.System.IO.Directory.GetFiles(VERARBEITUNGS_PFAD,,)
Try
Console.WriteLine(d)
Dateiname = d
cWorker_NCTS.Dateiname = d
If System.IO.File.Exists(d) Then
Dim found = False
Dim statusTMP As DAKOSY_Worker.cDakosy_Statusmeldungen = Nothing
Dim fi As FileInfo = New FileInfo(d)
Console.WriteLine(fi.Name)
If Not fi.Name.StartsWith(".") And Not fi.Name.StartsWith("lock_") Then
Console.WriteLine("Verarbeitung Datein ohne Punkt / lock")
d = frmStartOptions.lockFile(d)
fi = New FileInfo(d)
' EDIFACT
@@ -249,6 +254,7 @@ Public Class frmDYNachrichtenVerarbeitung
alreadyMoved = True
addDGVEinarbeitung("** NLC-Datei **", fi.Name)
ElseIf fi.Extension = ".edi" Then ' Or fi.Name.StartsWith("ZA") Then
Console.WriteLine("Verarbeitung Datein EDI")
Dim s As String = File.ReadAllText(d, System.Text.UTF8Encoding.Default)
If s.Contains("'") Then
Dim lines = s.Split("'")
@@ -282,6 +288,7 @@ Public Class frmDYNachrichtenVerarbeitung
'XML
ElseIf fi.Extension = ".xml" Then
Console.WriteLine("Verarbeitung Datein XML")
Dim xmlWriterSettings As XmlWriterSettings = New XmlWriterSettings With {.Encoding = System.Text.Encoding.UTF8, .CheckCharacters = True}
Dim doc As New XmlDocument()
@@ -417,7 +424,7 @@ Public Class frmDYNachrichtenVerarbeitung
If Not found And cGetMsgType.isSumAErledigungsinformation(doc, VERSION) Then
Select Case VERSION
Case "005" :: If cWorker_Verwahrung.readVW_SumAErledigungsinformation(Me, d, saveVerwahrung, sendMail, GESTELLUNG_TESTLAUF) <> "" Then found = True '--> TEIL DER VERWAHRUNG - RECHTE SEITE
Case "005" : If cWorker_Verwahrung.readVW_SumAErledigungsinformation(Me, d, saveVerwahrung, sendMail, GESTELLUNG_TESTLAUF) <> "" Then found = True '--> TEIL DER VERWAHRUNG - RECHTE SEITE
Case Else : If cWorker_Verwahrung.readVW_SumAErledigungsinformation(Me, d, saveVerwahrung, sendMail, GESTELLUNG_TESTLAUF) <> "" Then found = True '--> TEIL DER VERWAHRUNG - RECHTE SEITE
End Select
End If
@@ -455,9 +462,13 @@ Public Class frmDYNachrichtenVerarbeitung
'------------------------------------------
Console.WriteLine("EXG")
'AES: GEST
If Not found And cGetMsgType.isAES_DatenZumAusgang(doc, VERSION) Then
frmStartOptions.copyFile(d, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\")
Console.WriteLine("isAES_DatenZumAusgang")
Try : frmStartOptions.copyFile(d, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\")
Catch : End Try
Select Case VERSION
Case False
Case Else : If cWorker_AES_EXG.readEZA_DatenZumAusgang_DataEXITDE_005(Me, d, saveVerwahrung) <> "" Then found = True
@@ -466,7 +477,8 @@ Public Class frmDYNachrichtenVerarbeitung
'AES: Zoll Nachricht
If Not found And cGetMsgType.isAES_E_EXT_DAT(doc) Then
frmStartOptions.copyFile(d, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\")
Try : frmStartOptions.copyFile(d, "\\datenarchiv\Datenarchiv\DAKOSY\ECHTSYSTEM\EXG\")
Catch : End Try
'Select Case VERSION
' Case False
' Case Else : If cWorker_AES_EXG.readEZA_DatenZumAusgang_DataEXITDE_005(Me, d, saveVerwahrung) <> "" Then found = True
@@ -787,6 +799,7 @@ Public Class frmDYNachrichtenVerarbeitung
End If
End If
Catch ex As Exception
Console.WriteLine("ERROR" & ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Next
@@ -10272,9 +10285,9 @@ Public Class frmDYNachrichtenVerarbeitung
'End If
If EZA.EinzelAbgabenbescheid.KopfDaten.AbgabenNachArt IsNot Nothing AndAlso EZA.EinzelAbgabenbescheid.KopfDaten.AbgabenNachArt.Count > 0 Then
Dim a As New DAKOSY_Worker.cDakosy_EZA_Aufschub
AUFSCHUB = New List(Of DAKOSY_Worker.cDakosy_EZA_Aufschub)
For Each ABG In EZA.EinzelAbgabenbescheid.KopfDaten.AbgabenNachArt
Dim a As New DAKOSY_Worker.cDakosy_EZA_Aufschub
a.ezaAfb_ArtAufschubantrag = ABG.ArtAufschubAntrag
a.ezaAfb_AufschubnehmerEORI = ABG.AufschubnehmerTIN
a.ezaAfb_HZA = ABG.KennBuchstabenAufschub
@@ -10288,12 +10301,9 @@ Public Class frmDYNachrichtenVerarbeitung
' Case "B0000" 'EUST
' Case "B0000" 'EUST
'End Select
AUFSCHUB.Add(a)
Next
AUFSCHUB.Add(a)
End If
End If
If readEZA_Abgabenbescheid012 <> "" Then 'BEZUGSNR vorhanden

File diff suppressed because it is too large Load Diff

View File

@@ -236,174 +236,6 @@
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox26.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -817,9 +649,78 @@
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox25.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
@@ -866,6 +767,102 @@
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox11.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox10.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="PictureBox9.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABGdJREFUSEtj
YKAyYOFk4Za0knSzzrXOd8x2jJeUlGRgZ2dHV0YFwMjAKKInomlUYJRl32e/wn+Z/0Gf2T4L9eP1rQRV
BQWZ2JnQdVAGBNQEFI2KjHLCj4Qfjz0f+zX+Uvz/iKMR9z2XeU7USdNxENYVFmZkYWRE10c2sGqyKgg/
FH4s7mLcPxAGWQhjR5+Pnm5Wa+bAxs/Ggq6PbODQ77Aw5mzMO5BF6DjuYtzDoB1BU5ynO9uh6yMZcIpy
Sin5KsX5rva9gMWiP3EX4354LPDYb9VkVWpSZmKIrp8kwMrDyifnLBcUtCPoYfSp6G9oln2PPh39InRf
6EXVYNUYLjEuCXT9JAMFT4UI5+nO22POxPyMuxD3F83CK/4b/CdoJ2hb8CnwiTIyM5Iff8yczNxSVlJu
Nm02i8P2h72EJRKwRRfifsScibnts9Kn0yjfyIZfkZ+bhZOFGd0MkgC7ALuIXppeDXq8xZ6L/Rl+MPyR
2xy3iXpperai+qLUyfG4LIw8GvnGY57HVnFDcTk2bjZ0beQBHikeeWV/5QTvpd4nI49FfoRZFnM+5rdd
j91KEV0REzY+Ng5GZgJ5nJmDmZtPgU9dwUPBUsZeRoNLgosNXRO7ILsIOKFMdd4adTzqE7Lv/Pf6b9JM
1wxB0YALgFIQrxyvmlacVrHfer/prnNccxW9FWXZBdhZGZCKQEENQUOzKrMpaKnxR9zFuOeWMyy9JDwl
WJHNxQk4xTilVAJVkkP2hjyLPhP9NvJE5C7PJZ7J4ibikqw8rPDkjMPCazEXYorkveWVWHiISPnMHMxc
qsGqKe7z3Q+Cy75LcSBDXkQcjdjuMMEhStJKUo6JlYmVlZdVQD9Lv8F3je9FeKq8EHvZf5N/j26Grg6P
LA8PutlYgYKbQqjzVOdtyK6GuvxD7IXYlea15v5ixmISXBJcsm5z3PZC5X7FXYx7Grg9cKpZlZkzuxA7
GxMrE4FUAgXIpTuahWDxmPMx011mudiiWQhyzBKzSjMvQQ1BXnQz8QJpG2lPZX/lKMs6y464i3H34y/F
g+syJIsfhh8KPw6yLPxQ+GuQWOSRyNc27Tbd0rbSZizcZJQibHxsvBImEsamFaaVrjNdNwXvDH6A7mMY
BlnqNtttj5yrXDAosaGbRTKQdZYNsOu2WxZ9MvpD3IW43/GX4hHl5MW4n75rfI/pZ+kXsouwC6HrJQuw
cLPwKngqeLvPc18adTLqRfyl+F9IFt73We0zQTdd14BdkIotI25JbgkZBxkHtVC1JLc5brtjz8f+jL0Q
+z1oZ9B6syqzaGEdYX5mdmYqt4qgQDVINcVjocfByBORr63brCulbaW10NVQHYibiNsHbQ+6L24q7oAu
RxPAxs8mJG4iDmp1USehIAMuLi4GeXl5NlNTU347OzsRe3t7UWRsZ2cnbG5uzicrK8vKxcVFXOmCD0hK
SjJ6enoK1NXVqU6aNMlg2rRpxsh48uTJus3NzYqurq68EhISJGd6ADkzAttxL7feAAAAAElFTkSuQmCC
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -89,6 +89,9 @@ Public Class frmStartOptions
txtGJ_UNISPED.Text = Now.Year
txtUTADate.Text = Today.ToShortDateString
MyTextBox5._value = Today.AddDays(-7).ToShortDateString
txtEZOLLAnhDat._value = Now.ToShortDateString
Dim Paramslist As New cParameterList(VERAG_PROG_ALLGEMEIN.cAllgemein.PROGID)
@@ -662,6 +665,19 @@ Public Class frmStartOptions
closeMe()
'------------------------------
Case "MODALTRANS_GET" '
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
getNCTS_MODALTRANS(Now.AddDays(-3))
closeMe()
'------------------------------
Case "MODALTRANS_UPDATE" '
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
UpdateOpenModaltransNCTSFremdStatuses()
closeMe()
'------------------------------
Case "MSE_NEWTRANSACTIONS_IMPORT" 'jeweils am 15/letzen Tag des Monats vor allen anderen MSE-Aufrufen!
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
@@ -7817,4 +7833,160 @@ repeatRequest:
End Sub
Private Sub Button29_Click_2(sender As Object, e As EventArgs) Handles Button29.Click
getNCTS_MODALTRANS(CDate(MyTextBox5._value))
End Sub
Sub getNCTS_MODALTRANS(Optional from As Object = Nothing)
'Dim MT As New VERAG_PROG_ALLGEMEIN.cModalTransNCTS.cMT_NCTS_ApiClient
'Dim LIST = MT.GetNCTSDeclarations(CDate("01.03.2026"))
'If LIST.Count = 0 Then Console.WriteLine("Keine Eintäge")
'For Each MRN In LIST
' Console.WriteLine(MRN.lrn)
'Next
If from Is Nothing Then from = Now.AddDays(-1)
Dim MT As New VERAG_PROG_ALLGEMEIN.cModalTransNCTS.cMT_NCTS_ApiClient
Dim LIST = MT.GetAllNCTSDeclarations(CDate(from))
If LIST.Count = 0 Then Console.WriteLine("Keine Eintäge")
For Each MRN In LIST
Try
Dim nctsFremd = VERAG_PROG_ALLGEMEIN.cNCTS_FREMD.LOADByMRN(MRN.mrn, False)
If nctsFremd IsNot Nothing Then
Console.WriteLine(MRN.mrn & " found")
Else
Console.WriteLine(MRN.mrn & " not found")
End If
Console.WriteLine(MRN.mrn & " - " & MRN.lrn)
Dim statusValue As Integer = -1
If nctsFremd IsNot Nothing Then
Integer.TryParse(If(nctsFremd.ncts_Status, "").ToString(), statusValue)
End If
' Fall 1: vorhanden + Status 60/90 -> nichts tun
If nctsFremd IsNot Nothing AndAlso (statusValue = 60 OrElse statusValue = 90) Then
Console.WriteLine("Übersprungen, da ncts_Status = " & statusValue)
Continue For
End If
If nctsFremd Is Nothing Then
'
Console.WriteLine("*Neu anlegen")
Dim nctsMt = MT.GetNCTSDeclarationByMRN(MRN.mrn)
If nctsMt Is Nothing Then
Console.WriteLine("Keine Modaltrans-Daten gefunden.")
Continue For
End If
' Debug-Ausgaben
Console.WriteLine("vehicle_code:" & If(nctsMt.vehicle_code, ""))
Console.WriteLine("lrn:" & If(nctsMt.lrn, ""))
Console.WriteLine("letter_grn:" & If(nctsMt.letter_grn, ""))
Console.WriteLine("guarantee_curr:" & If(nctsMt.guarantee_curr, ""))
Console.WriteLine("guarantee_price:" & If(nctsMt.guarantee_price, ""))
Console.WriteLine("status:" & If(nctsMt.status, ""))
MT.ConvertModaltransToNCTSFremd(nctsMt)
Else
' Vorhanden, aber anderer Status -> Update (auskommentiert)
'Status updaten:
Console.WriteLine("*Updaten")
If MT.UpdateNCTSFremdStatusFromTimelines(nctsFremd.ncts_MRN, nctsFremd, False) Then
nctsFremd.SAVE()
End If
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
End Try
Next
End Sub
Private Sub Button31_Click_1(sender As Object, e As EventArgs) Handles Button31.Click
UpdateOpenModaltransNCTSFremdStatuses()
End Sub
Public Function UpdateOpenModaltransNCTSFremdStatuses() As Integer
Dim updatedCount As Integer = 0
Dim totalCount As Integer = 0
Try
Dim sqlstr As String = "SELECT ncts_MRN FROM [tblNCTS_FREMD] " &
"WHERE ncts_Partnersystem = 'MODALTRANS' " &
"AND ISNULL(ncts_Status, 0) < 60 " &
"AND ISNULL(ncts_MRN, '') <> ''"
Console.WriteLine("=== Starte Update Modaltrans NCTS_FREMD ===")
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = SQL.loadDgvBySql(sqlstr, "FMZOLL")
If dt Is Nothing OrElse dt.Rows.Count = 0 Then
Console.WriteLine("Keine offenen Datensätze gefunden.")
Return 0
End If
Console.WriteLine("Gefundene Datensätze: " & dt.Rows.Count)
Dim MT As New VERAG_PROG_ALLGEMEIN.cModalTransNCTS.cMT_NCTS_ApiClient
For Each row As DataRow In dt.Rows
totalCount += 1
Dim mrn As String = If(row("ncts_MRN"), "").ToString.Trim
If String.IsNullOrWhiteSpace(mrn) Then
Console.WriteLine("[" & totalCount & "] MRN leer -> übersprungen")
Continue For
End If
Console.WriteLine("[" & totalCount & "] Prüfe MRN: " & mrn)
Dim nctsFremd As VERAG_PROG_ALLGEMEIN.cNCTS_FREMD = VERAG_PROG_ALLGEMEIN.cNCTS_FREMD.LOADByMRN(mrn, False)
If nctsFremd Is Nothing Then
Console.WriteLine(" -> Datensatz nicht gefunden")
Continue For
End If
Try
If MT.UpdateNCTSFremdStatusFromTimelines(nctsFremd.ncts_MRN, nctsFremd, False) Then
nctsFremd.SAVE()
updatedCount += 1
Console.WriteLine(" -> ✔ Aktualisiert (Status: " & nctsFremd.ncts_Status & ")")
End If
Catch exInner As Exception
Console.WriteLine(" -> ❌ Fehler bei MRN " & mrn & ": " & exInner.Message)
End Try
Next
Console.WriteLine("=== Fertig ===")
Console.WriteLine("Gesamt geprüft: " & totalCount)
Console.WriteLine("Aktualisiert: " & updatedCount)
Catch ex As Exception
Console.WriteLine("❌ Globaler Fehler: " & ex.Message)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(
ex.Message,
ex.StackTrace,
System.Reflection.MethodInfo.GetCurrentMethod.Name
)
End Try
Return updatedCount
End Function
End Class