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

Merge branch 'ADMIN' of https://dev.azure.com/VeragAG/_git/ADMIN into ADMIN

Browse Source
This commit is contained in:
d.breimaier
2025-02-17 13:26:05 +01:00
parent 23c9866173 cb798cd22b
commit d605cc8305
9 changed files with 361 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -801,7 +801,7 @@ Public Class cDakosyNCTSOut004
End Function
Shared Function LOADByAnmIDFull(ncts_dyaAnmID As String, loadALL As Boolean) As cDakosyNCTSOut004
Shared Function LOADByAnmIDFull(ncts_dyaAnmID As Integer, loadALL As Boolean) As cDakosyNCTSOut004
Try
Dim NCTS As New cDakosyNCTSOut004
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

21
DAKOSY_Worker/cDakosyFunftions.vb
View File

@@ -62,15 +62,18 @@ Public Class cDakosyFunftions
Case "AMBAR"
Return "AMBWO"
Case "VERAG"
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "SUB" : Return "SUB"
Case "SBG" : Return "SBG"
Case "NKD" : Return "NKD"
Case "NEU" : Return "NEU"
Case "WAI" : Return "WAI"
Case Else : Return "SUB"
End Select
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER IsNot Nothing Then
Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_niederlassung
Case "SUB" : Return "SUB"
Case "SBG" : Return "SBG"
Case "NKD" : Return "NKD"
Case "NEU" : Return "NEU"
Case "WAI" : Return "WAI"
Case Else : Return "SUB"
End Select
Else
Return "SUB"
End If
Case "UNISPED"
Return ""'"ATSP"
Case "IMEX"

10
DAKOSY_Worker/cZOLL_IMPORT.vb
View File

@@ -337,7 +337,7 @@ Public Class cZOLL_IMPORT
Dim filiale = getFiliale(LRN, filialeBez)
Select Case filiale
Case "5501" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX"
Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" : Return False 'Keine Atoerfassung
Case "4801", "4802" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" ' Return False 'Keine Atoerfassung --> ab 11.02.2025 schon!
Case "5801" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE"
Case "5601" : VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED"
End Select
@@ -958,7 +958,11 @@ Public Class cZOLL_IMPORT
Try
If SPEDITIONSBUCH.Personalnummer Is Nothing Then Return False
If If(SPEDITIONSBUCH.Vermittler, "") = "" Then Return False
Select Case SPEDITIONSBUCH.FilialenNr
Case 4801, 4802
Case Else
If If(SPEDITIONSBUCH.Vermittler, "") = "" Then Return False
End Select
If Not IsNumeric(If(SPEDITIONSBUCH.Abfertigungsart, "")) Then Return False
If SPEDITIONSBUCH.Abfertigungsanzahl = 0 Then Return False
@@ -994,7 +998,7 @@ Public Class cZOLL_IMPORT
End If
Dim VERAGSQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt As DataTable = VERAGSQL.loadDgvBySql("SELECT isnull(veoant_beznr,'') as veoant_beznr FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And (veoant_beznr LIKE '%" & filiale & "/" & pos & "/" & jahr & "%' OR veoant_beznr LIKE '%" & filiale & "-" & pos & "-" & jahr & "%') AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG)
Dim dt As DataTable = VERAGSQL.loadDgvBySql("Select isnull(veoant_beznr,'') as veoant_beznr FROM veoant WHERE basman_nr='" & strManNr & "' And basman_nl='" & strManNl & "' And (veoant_beznr LIKE '%" & filiale & "/" & pos & "/" & jahr & "%' OR veoant_beznr LIKE '%" & filiale & "-" & pos & "-" & jahr & "%') AND veoant_stat BETWEEN 50 AND 60 ORDER BY basman_nr, basman_nl, veoant_beznr, veoant_lfdnr DESC", ATLAS_SERVER_VERBINDUNG)
If dt IsNot Nothing Then
For Each r As DataRow In dt.Rows

10
UID/ADMIN.vbproj
View File

@@ -1134,6 +1134,16 @@
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
<Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
<Name>DAKOSY_Worker_lib</Name>
</ProjectReference>
<ProjectReference Include="..\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
<Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
<Name>TELOTEC_Worker_lib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

54
initATLASAufschubkonten/cWorker_AES_EXG.vb
View File

@@ -143,7 +143,7 @@ Public Class cWorker_AES_EXG
'----------------------------------------------------------------------
'Wenn markiert wurde, dass die NCTS Daten ergänzt werden sollten
'----------------------------------------------------------------------
Dim testDY = True
Dim testDY = False
If testDY Or (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)
If testDY Then
@@ -321,32 +321,42 @@ Public Class cWorker_AES_EXG
'----------------------------------------------------------------------
'Es wird bei Daten zum AUsgang und "_EXG" automaitsch die Qualifizierung aufgerufen...
Dim test = False
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 = ""
'----------------------------------------------------------------------
'----------------------------------------------------------------------
If False Then '--------------QUALIFIZIERUNG NOCH NCIHT SENDEN! ------------------
'----------------------------------------------------------------------
'----------------------------------------------------------------------
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
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
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

16
initATLASAufschubkonten/frmDYNachrichtenVerarbeitung.vb
View File

@@ -10873,22 +10873,30 @@ Public Class frmDYNachrichtenVerarbeitung
Shared Function isAtez(bezugsNr As String) As Boolean
Dim atez As Boolean = False
Try
If bezugsNr <> "" AndAlso bezugsNr.Length > 4 AndAlso bezugsNr.Substring(bezugsNr.Length, 4) = "ATEZ" Then
atez = True
End If
If bezugsNr <> "" AndAlso bezugsNr.Length > 4 AndAlso bezugsNr.Substring(0, 4) = "ATEZ" Then
atez = True
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return atez
End Function
Shared Function isAtezIRU(bezugsNr As String) As Boolean
Dim atez As Boolean = False
Try
If bezugsNr <> "" AndAlso bezugsNr.Length > 4 AndAlso bezugsNr.Substring(bezugsNr.Length, 4) = "IRU0" Then
If bezugsNr <> "" AndAlso bezugsNr.Length > 4 AndAlso bezugsNr.Substring(0, 4) = "IRU0" Then
atez = True
End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return atez
End Function

142
initATLASAufschubkonten/frmStartOptions.Designer.vb generated
View File

@@ -163,6 +163,7 @@ Partial Class frmStartOptions
Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.TabPage3 = New System.Windows.Forms.TabPage()
Me.LinkLabel71 = New System.Windows.Forms.LinkLabel()
Me.cbxOverrideNCTSFin = New System.Windows.Forms.CheckBox()
Me.Label48 = New System.Windows.Forms.Label()
Me.datTranscodeBis = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -184,6 +185,8 @@ Partial Class frmStartOptions
Me.LinkLabel30 = New System.Windows.Forms.LinkLabel()
Me.Label11 = New System.Windows.Forms.Label()
Me.TabPage4 = New System.Windows.Forms.TabPage()
Me.lblUTAPDFvollst = New System.Windows.Forms.LinkLabel()
Me.txtUTADate = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.TextBox3 = New System.Windows.Forms.TextBox()
Me.cbxIDSUmbenenen = New System.Windows.Forms.CheckBox()
Me.txtIDSYear = New VERAG_PROG_ALLGEMEIN.MyTextBox()
@@ -296,8 +299,9 @@ Partial Class frmStartOptions
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.txtUTADate = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.lblUTAPDFvollst = New System.Windows.Forms.LinkLabel()
Me.Button28 = New System.Windows.Forms.Button()
Me.MyTextBox5 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label49 = New System.Windows.Forms.Label()
Me.pnl.SuspendLayout()
CType(Me.PictureBox24, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -2143,6 +2147,10 @@ Partial Class frmStartOptions
'
'TabPage3
'
Me.TabPage3.Controls.Add(Me.Label49)
Me.TabPage3.Controls.Add(Me.MyTextBox5)
Me.TabPage3.Controls.Add(Me.Button28)
Me.TabPage3.Controls.Add(Me.LinkLabel71)
Me.TabPage3.Controls.Add(Me.cbxOverrideNCTSFin)
Me.TabPage3.Controls.Add(Me.Label48)
Me.TabPage3.Controls.Add(Me.datTranscodeBis)
@@ -2170,11 +2178,22 @@ Partial Class frmStartOptions
Me.TabPage3.Text = "Partner-Systeme"
Me.TabPage3.UseVisualStyleBackColor = True
'
'LinkLabel71
'
Me.LinkLabel71.AutoSize = True
Me.LinkLabel71.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.LinkLabel71.Location = New System.Drawing.Point(476, 152)
Me.LinkLabel71.Name = "LinkLabel71"
Me.LinkLabel71.Size = New System.Drawing.Size(64, 13)
Me.LinkLabel71.TabIndex = 145
Me.LinkLabel71.TabStop = True
Me.LinkLabel71.Text = "Upload FTP"
'
'cbxOverrideNCTSFin
'
Me.cbxOverrideNCTSFin.AutoSize = True
Me.cbxOverrideNCTSFin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxOverrideNCTSFin.Location = New System.Drawing.Point(548, 267)
Me.cbxOverrideNCTSFin.Location = New System.Drawing.Point(548, 228)
Me.cbxOverrideNCTSFin.Name = "cbxOverrideNCTSFin"
Me.cbxOverrideNCTSFin.Size = New System.Drawing.Size(196, 17)
Me.cbxOverrideNCTSFin.TabIndex = 139
@@ -2279,7 +2298,7 @@ Partial Class frmStartOptions
Me.btnTestATEZ.Name = "btnTestATEZ"
Me.btnTestATEZ.Size = New System.Drawing.Size(123, 24)
Me.btnTestATEZ.TabIndex = 140
Me.btnTestATEZ.Text = "test ATEZ"
Me.btnTestATEZ.Text = "Check ATEZ MRN"
Me.btnTestATEZ.UseVisualStyleBackColor = True
'
'LinkLabel39
@@ -2506,6 +2525,43 @@ Partial Class frmStartOptions
Me.TabPage4.Text = "VERAG 360"
Me.TabPage4.UseVisualStyleBackColor = True
'
'lblUTAPDFvollst
'
Me.lblUTAPDFvollst.AutoSize = True
Me.lblUTAPDFvollst.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.lblUTAPDFvollst.Location = New System.Drawing.Point(609, 451)
Me.lblUTAPDFvollst.Name = "lblUTAPDFvollst"
Me.lblUTAPDFvollst.Size = New System.Drawing.Size(113, 13)
Me.lblUTAPDFvollst.TabIndex = 157
Me.lblUTAPDFvollst.TabStop = True
Me.lblUTAPDFvollst.Text = "PDF Daten vollständig"
'
'txtUTADate
'
Me.txtUTADate._DateTimeOnly = False
Me.txtUTADate._numbersOnly = False
Me.txtUTADate._numbersOnlyKommastellen = ""
Me.txtUTADate._numbersOnlyTrennzeichen = False
Me.txtUTADate._Prozent = False
Me.txtUTADate._ShortDateNew = False
Me.txtUTADate._ShortDateOnly = True
Me.txtUTADate._TimeOnly = False
Me.txtUTADate._TimeOnly_Seconds = False
Me.txtUTADate._value = ""
Me.txtUTADate._Waehrung = False
Me.txtUTADate._WaehrungZeichen = True
Me.txtUTADate.BackColor = System.Drawing.SystemColors.Window
Me.txtUTADate.ForeColor = System.Drawing.Color.Red
Me.txtUTADate.Location = New System.Drawing.Point(537, 448)
Me.txtUTADate.MaxLength = 10
Me.txtUTADate.MaxLineLength = -1
Me.txtUTADate.MaxLines_Warning = ""
Me.txtUTADate.MaxLines_Warning_Label = Nothing
Me.txtUTADate.Name = "txtUTADate"
Me.txtUTADate.Size = New System.Drawing.Size(66, 20)
Me.txtUTADate.TabIndex = 156
Me.txtUTADate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'TextBox3
'
Me.TextBox3.BackColor = System.Drawing.SystemColors.Menu
@@ -3881,42 +3937,50 @@ Partial Class frmStartOptions
Me.DataGridViewTextBoxColumn1.MinimumWidth = 8
Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1"
'
'txtUTADate
'Button28
'
Me.txtUTADate._DateTimeOnly = False
Me.txtUTADate._numbersOnly = False
Me.txtUTADate._numbersOnlyKommastellen = ""
Me.txtUTADate._numbersOnlyTrennzeichen = False
Me.txtUTADate._Prozent = False
Me.txtUTADate._ShortDateNew = False
Me.txtUTADate._ShortDateOnly = True
Me.txtUTADate._TimeOnly = False
Me.txtUTADate._TimeOnly_Seconds = False
Me.txtUTADate._value = ""
Me.txtUTADate._Waehrung = False
Me.txtUTADate._WaehrungZeichen = True
Me.txtUTADate.BackColor = System.Drawing.SystemColors.Window
Me.txtUTADate.ForeColor = System.Drawing.Color.Red
Me.txtUTADate.Location = New System.Drawing.Point(537, 448)
Me.txtUTADate.MaxLength = 10
Me.txtUTADate.MaxLineLength = -1
Me.txtUTADate.MaxLines_Warning = ""
Me.txtUTADate.MaxLines_Warning_Label = Nothing
Me.txtUTADate.Name = "txtUTADate"
Me.txtUTADate.Size = New System.Drawing.Size(66, 20)
Me.txtUTADate.TabIndex = 156
Me.txtUTADate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
Me.Button28.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button28.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.Button28.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button28.Location = New System.Drawing.Point(419, 302)
Me.Button28.Name = "Button28"
Me.Button28.Size = New System.Drawing.Size(123, 39)
Me.Button28.TabIndex = 146
Me.Button28.Text = "Check all open " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ATEZ MRN"
Me.Button28.UseVisualStyleBackColor = True
'
'lblUTAPDFvollst
'MyTextBox5
'
Me.lblUTAPDFvollst.AutoSize = True
Me.lblUTAPDFvollst.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
Me.lblUTAPDFvollst.Location = New System.Drawing.Point(609, 451)
Me.lblUTAPDFvollst.Name = "lblUTAPDFvollst"
Me.lblUTAPDFvollst.Size = New System.Drawing.Size(113, 13)
Me.lblUTAPDFvollst.TabIndex = 157
Me.lblUTAPDFvollst.TabStop = True
Me.lblUTAPDFvollst.Text = "PDF Daten vollständig"
Me.MyTextBox5._DateTimeOnly = False
Me.MyTextBox5._numbersOnly = False
Me.MyTextBox5._numbersOnlyKommastellen = ""
Me.MyTextBox5._numbersOnlyTrennzeichen = False
Me.MyTextBox5._Prozent = False
Me.MyTextBox5._ShortDateNew = False
Me.MyTextBox5._ShortDateOnly = False
Me.MyTextBox5._TimeOnly = False
Me.MyTextBox5._TimeOnly_Seconds = False
Me.MyTextBox5._value = ""
Me.MyTextBox5._Waehrung = False
Me.MyTextBox5._WaehrungZeichen = False
Me.MyTextBox5.ForeColor = System.Drawing.Color.Black
Me.MyTextBox5.Location = New System.Drawing.Point(548, 272)
Me.MyTextBox5.MaxLength = 18
Me.MyTextBox5.MaxLineLength = -1
Me.MyTextBox5.MaxLines_Warning = ""
Me.MyTextBox5.MaxLines_Warning_Label = Nothing
Me.MyTextBox5.Name = "MyTextBox5"
Me.MyTextBox5.Size = New System.Drawing.Size(185, 20)
Me.MyTextBox5.TabIndex = 139
'
'Label49
'
Me.Label49.AutoSize = True
Me.Label49.Location = New System.Drawing.Point(545, 328)
Me.Label49.Name = "Label49"
Me.Label49.Size = New System.Drawing.Size(10, 13)
Me.Label49.TabIndex = 139
Me.Label49.Text = "-"
'
'frmStartOptions
'
@@ -4249,4 +4313,8 @@ Partial Class frmStartOptions
Friend WithEvents txtIDSYear As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents lblUTAPDFvollst As LinkLabel
Friend WithEvents txtUTADate As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents LinkLabel71 As LinkLabel
Friend WithEvents MyTextBox5 As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Button28 As Button
Friend WithEvents Label49 As Label
End Class

192
initATLASAufschubkonten/frmStartOptions.resx
View File

@@ -212,102 +212,6 @@
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox25.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -820,6 +724,102 @@
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="PictureBox25.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox21.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox19.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox18.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj
oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB
QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC
j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ
VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox
XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf
9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe
VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh
42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A
pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin
lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS
d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp
hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ
LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs
8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ
NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P
ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAgIAAAAEAGAAoyAAAFgAAACgAAACAAAAAAAEAAAEAGAAAAAAAAMgAAMQOAADEDgAAAAAAAAAA

117
initATLASAufschubkonten/frmStartOptions.vb
View File

@@ -1,6 +1,8 @@
Imports System.Data.OleDb
Imports System.IO
Imports System.Net
Imports System.Net.Security
Imports System.Security.Cryptography.X509Certificates
Imports System.Text
Imports System.Xml
Imports Renci.SshNet
@@ -3070,7 +3072,7 @@ Public Class frmStartOptions
End Function
Function sendWOELFL_USTVAntraege(Mail_To, Optional Mail_CC = "", Optional Mail_BCC = "")
Function sendWOELFL_USTVAntraege(art As String, Optional Mail_To As String = "", Optional Mail_CC As String = "", Optional Mail_BCC As String = "")
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
@@ -3105,17 +3107,49 @@ Public Class frmStartOptions
", "FMZOLL")
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt, False)
Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt, False,, "USTV_" & Now.ToString("ddMMyyyy"))
If PDF <> "" Then
Dim list As New List(Of String)
list.Add(PDF)
Dim Body = "Anbei befindet sich die Auflistung der USTV-Anträge.<br>"
Select Case art
Case "MAIL"
Dim list As New List(Of String)
list.Add(PDF)
Dim Body = "Anbei befindet sich die Auflistung der USTV-Anträge.<br>"
Body &= "<br><br>Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString
Body &= "<br><br>Automatisch generiertes E-Mail."
Dim Mail_betreff = "USTV-Anträge"
Body &= "<br><br>Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString
Body &= "<br><br>Automatisch generiertes E-Mail."
Dim Mail_betreff = "USTV-Anträge"
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list)
VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list)
Case "FTP"
Dim sftpHost As String = "195.70.110.195" ' Deine SFTP-Server-IP
Dim sftpPort As Integer = 22 ' Standard-SFTP-Port (ändern, falls nötig)
Dim sftpUsername As String = "verag"
Dim sftpPassword As String = "Di1543V!r205"
Dim localFilePath As String = PDF
Dim remoteDirectory As String = "/verag2rmc/" ' Zielordner auf dem SFTP-Server
Try
' Verbindung zum SFTP-Server herstellen
Using sftpClient As New SftpClient(sftpHost, sftpPort, sftpUsername, sftpPassword)
sftpClient.Connect()
Console.WriteLine("SFTP-Verbindung hergestellt.")
' Datei hochladen
Using fileStream As New FileStream(localFilePath, FileMode.Open)
sftpClient.UploadFile(fileStream, remoteDirectory & Path.GetFileName(localFilePath))
End Using
Console.WriteLine("Datei erfolgreich hochgeladen!")
sftpClient.Disconnect()
End Using
Catch ex As Exception
Console.WriteLine("Fehler: " & ex.Message)
End Try
End Select
End If
End If
@@ -3125,7 +3159,9 @@ Public Class frmStartOptions
Return False
End Try
End Function
Private Function ValidateServerCertificate(sender As Object, certificate As X509Certificate, chain As X509Chain, sslPolicyErrors As SslPolicyErrors) As Boolean
Return True
End Function
Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "", Optional setKundenvermerk As Boolean = False) As Boolean
Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
Try
@@ -3891,18 +3927,17 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG"
Dim Validto = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
Dim Validto = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.KartenNr = SQl.checkNullStr(oRDR.GetValue("CardNumber"))
SDL.KartenNr = SQL.checkNullStr(oRDR.GetValue("CardNumber"))
If Validto <> "" Then
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(oRDR.GetValue("CardNumber"), 1, 2), Mid(Validto, 3, 2), 1)))
End If
SDL.OBUID = SQl.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQl.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQl.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQl.checkNullStr(oRDR.GetValue("Status"))
SDL.OBUID = SQL.checkNullStr(oRDR.GetValue("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(oRDR.GetValue("DatumVertragsabschluss"))
SDL.Kategorie = SQL.checkNullStr(oRDR.GetValue("Kategorie"))
SDL.Schadstoffklasse = SQL.checkNullStr(oRDR.GetValue("Schadstoffklasse"))
SDL.Status = SQL.checkNullStr(oRDR.GetValue("Status"))
SDL.SAVE()
End If
@@ -3948,21 +3983,21 @@ Public Class frmStartOptions
End If
SDL.Sachbearbeiter = "ASFINAG" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "_TEST", "")
Dim Validto = SQl.checkNullStr(row.Item("contractDate"))
Dim Validto = SQL.checkNullStr(row.Item("contractDate"))
SDL.KartenNr = SQl.checkNullStr(row.Item("cardNumber"))
SDL.KartenNr = SQL.checkNullStr(row.Item("cardNumber"))
If Validto <> "" Then
'MsgBox(Mid(row.Item("ValidTo"), 1, 2) & " " & Mid(row.Item("ValidTo"), 3, 2))
SDL.GültigBis = DateAdd("d", -1, DateAdd("m", 1, DateSerial("20" & Mid(row.Item("ValidTo"), 1, 2), Mid(row.Item("ValidTo"), 3, 2), 1))) 'noch im DETAIL checken!
End If
SDL.OBUID = SQl.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQl.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQl.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQl.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQl.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQl.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQl.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.OBUID = SQL.checkNullStr(row.Item("OBUID"))
SDL.Vertragsabschlussdatum = SQL.checkNullStr(row.Item("contractDate"))
SDL.Kategorie = SQL.checkNullStr(row.Item("vehicleCategory"))
SDL.Schadstoffklasse = SQL.checkNullStr(row.Item("emissionCategory"))
SDL.Status = SQL.checkNullStr(row.Item("status"))
SDL.Nationalitaet = SQL.checkNullStr(row.Item("nationality"))
SDL.CO2Kategorie = SQL.checkNullStr(row.Item("CO2EmissionsClass"))
SDL.SAVE()
End If
@@ -4791,9 +4826,14 @@ Public Class frmStartOptions
Me.Cursor = Cursors.Default
End Sub
Private Sub LinkLabel50_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel50.LinkClicked
Private Sub LinkLabel50_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel50.LinkClicked, LinkLabel71.LinkClicked
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
sendWOELFL_USTVAntraege("al@verag.ag")
If sender Is LinkLabel50 Then
sendWOELFL_USTVAntraege("MAIL", "al@verag.ag")
ElseIf sender Is LinkLabel71 Then
sendWOELFL_USTVAntraege("FTP")
End If
End Sub
Function INSERT_Kundenumsaetze(insertLastYears As Integer) As Boolean
@@ -5405,7 +5445,7 @@ Public Class frmStartOptions
For Each r In dtRE.Rows
Dim mrnAlt = sql.DLookup("Weitere_Reg_Nr", "[AVISO].[dbo].[tbl_DY_Zollmeldungen_Import]", "[Weitere_Reg_Nr] is not null and [Registriernummer_MRN] = '" & r.Item("Belegdaten") & "'", "AVISO")
Dim mrnAlt = sql.DLookup("Weitere_Reg_Nr", "[tbl_DY_Zollmeldungen_Import]", "[Weitere_Reg_Nr] is not null and [Registriernummer_MRN] = '" & r.Item("Belegdaten") & "'", "AVISO")
If mrnAlt IsNot Nothing AndAlso mrnAlt <> "" Then
If sql.doSQL("update RechnungsausgangPositionen set Weitere_Reg_Nr ='" & mrnAlt & "' where RK_ID= " & r.Item("RK_ID") & " AND Belegdaten = '" & r.Item("Belegdaten") & "'", "FMZOLL") Then
@@ -5436,7 +5476,7 @@ Public Class frmStartOptions
End Sub
Private Sub Button27_Click(sender As Object, e As EventArgs) Handles btnTestATEZ.Click
VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn("24TR34340000000145")
VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.updateStatusByMRN(MyTextBox5.Text)
End Sub
@@ -5513,4 +5553,19 @@ Public Class frmStartOptions
End If
End Sub
Private Sub Button28_Click(sender As Object, e As EventArgs) Handles Button28.Click
Dim dt = (New SQL).loadDgvBySql("SELECT TOP (200) ncts_MRN FROM [tblNCTS_FREMD] where ncts_Status between 50 and 59 and ncts_Partnersystem='ATEZ'", "FMZOLL")
If dt IsNot Nothing Then
Label49.Text = "-"
Dim cnt = 1
For Each r In dt.Rows
Label49.Text = cnt & "/" & dt.Rows.Count
Me.Refresh()
VERAG_PROG_ALLGEMEIN.cATEZ_ncts_api.get_ie015_xml_by_mrn(r("ncts_MRN"))
Next
Label49.Text = dt.Rows.Count & "fin"
End If
End Sub
End Class