This commit is contained in:
2024-09-06 14:55:43 +02:00
parent 779b96578c
commit 61052b43e9
4 changed files with 248 additions and 158 deletions

View File

@@ -657,7 +657,7 @@ Public Class frmMDMNachrichtenVerarbeitung
'Label31.Visible = True 'Label31.Visible = True
readPLOSE_Detail = "Zeilen: " & cnt readPLOSE_Detail = "Zeilen: " & cnt
Else Else
MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") ' MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.")
End If End If
End Using End Using
@@ -678,7 +678,6 @@ Public Class frmMDMNachrichtenVerarbeitung
Catch ex As Exception Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name)
MsgBox(ex.StackTrace & ex.Message)
readPLOSE_Detail = "" readPLOSE_Detail = ""
End Try End Try
End Function End Function

View File

@@ -169,6 +169,7 @@ Partial Class frmStartOptions
Me.LinkLabel30 = New System.Windows.Forms.LinkLabel() Me.LinkLabel30 = New System.Windows.Forms.LinkLabel()
Me.Label11 = New System.Windows.Forms.Label() Me.Label11 = New System.Windows.Forms.Label()
Me.TabPage4 = New System.Windows.Forms.TabPage() Me.TabPage4 = New System.Windows.Forms.TabPage()
Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox()
Me.LinkLabel62 = New System.Windows.Forms.LinkLabel() Me.LinkLabel62 = New System.Windows.Forms.LinkLabel()
Me.LinkLabel60 = New System.Windows.Forms.LinkLabel() Me.LinkLabel60 = New System.Windows.Forms.LinkLabel()
Me.LinkLabel61 = New System.Windows.Forms.LinkLabel() Me.LinkLabel61 = New System.Windows.Forms.LinkLabel()
@@ -245,7 +246,8 @@ Partial Class frmStartOptions
Me.lblRoutineManager = New System.Windows.Forms.Label() Me.lblRoutineManager = New System.Windows.Forms.Label()
Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Button21 = New System.Windows.Forms.Button() Me.Button21 = New System.Windows.Forms.Button()
Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() Me.MyTextBox4 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label41 = New System.Windows.Forms.Label()
Me.pnl.SuspendLayout() Me.pnl.SuspendLayout()
CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -956,6 +958,8 @@ Partial Class frmStartOptions
' '
'TabPage1 'TabPage1
' '
Me.TabPage1.Controls.Add(Me.Label41)
Me.TabPage1.Controls.Add(Me.MyTextBox4)
Me.TabPage1.Controls.Add(Me.LinkLabel99) Me.TabPage1.Controls.Add(Me.LinkLabel99)
Me.TabPage1.Controls.Add(Me.PictureBox99) Me.TabPage1.Controls.Add(Me.PictureBox99)
Me.TabPage1.Controls.Add(Me.Button99) Me.TabPage1.Controls.Add(Me.Button99)
@@ -1042,7 +1046,7 @@ Partial Class frmStartOptions
Me.Button99.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button99.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button99.Location = New System.Drawing.Point(581, 346) Me.Button99.Location = New System.Drawing.Point(581, 346)
Me.Button99.Name = "Button99" Me.Button99.Name = "Button99"
Me.Button99.Size = New System.Drawing.Size(211, 24) Me.Button99.Size = New System.Drawing.Size(195, 24)
Me.Button99.TabIndex = 81 Me.Button99.TabIndex = 81
Me.Button99.Text = "AAS Sendung 24h" Me.Button99.Text = "AAS Sendung 24h"
Me.Button99.UseVisualStyleBackColor = True Me.Button99.UseVisualStyleBackColor = True
@@ -1055,7 +1059,7 @@ Partial Class frmStartOptions
Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button20.Location = New System.Drawing.Point(581, 323) Me.Button20.Location = New System.Drawing.Point(581, 323)
Me.Button20.Name = "Button20" Me.Button20.Name = "Button20"
Me.Button20.Size = New System.Drawing.Size(211, 24) Me.Button20.Size = New System.Drawing.Size(195, 24)
Me.Button20.TabIndex = 80 Me.Button20.TabIndex = 80
Me.Button20.Text = "xxx AAS Ankunft 4h" Me.Button20.Text = "xxx AAS Ankunft 4h"
Me.Button20.UseVisualStyleBackColor = True Me.Button20.UseVisualStyleBackColor = True
@@ -1067,7 +1071,7 @@ Partial Class frmStartOptions
Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button19.Location = New System.Drawing.Point(581, 300) Me.Button19.Location = New System.Drawing.Point(581, 300)
Me.Button19.Name = "Button19" Me.Button19.Name = "Button19"
Me.Button19.Size = New System.Drawing.Size(211, 24) Me.Button19.Size = New System.Drawing.Size(195, 24)
Me.Button19.TabIndex = 79 Me.Button19.TabIndex = 79
Me.Button19.Text = "AAS Vermerke 24h" Me.Button19.Text = "AAS Vermerke 24h"
Me.Button19.UseVisualStyleBackColor = True Me.Button19.UseVisualStyleBackColor = True
@@ -1089,7 +1093,7 @@ Partial Class frmStartOptions
Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button18.Location = New System.Drawing.Point(581, 277) Me.Button18.Location = New System.Drawing.Point(581, 277)
Me.Button18.Name = "Button18" Me.Button18.Name = "Button18"
Me.Button18.Size = New System.Drawing.Size(211, 24) Me.Button18.Size = New System.Drawing.Size(195, 24)
Me.Button18.TabIndex = 77 Me.Button18.TabIndex = 77
Me.Button18.Text = "AAS Vermerke Überschreitung" Me.Button18.Text = "AAS Vermerke Überschreitung"
Me.Button18.UseVisualStyleBackColor = True Me.Button18.UseVisualStyleBackColor = True
@@ -2207,6 +2211,19 @@ Partial Class frmStartOptions
Me.TabPage4.Text = "VERAG 360" Me.TabPage4.Text = "VERAG 360"
Me.TabPage4.UseVisualStyleBackColor = True Me.TabPage4.UseVisualStyleBackColor = True
' '
'cbxOnlyBilledTransactions
'
Me.cbxOnlyBilledTransactions.AutoSize = True
Me.cbxOnlyBilledTransactions.Checked = True
Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84)
Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions"
Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17)
Me.cbxOnlyBilledTransactions.TabIndex = 121
Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen"
Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True
'
'LinkLabel62 'LinkLabel62
' '
Me.LinkLabel62.AutoSize = True Me.LinkLabel62.AutoSize = True
@@ -3114,18 +3131,37 @@ Partial Class frmStartOptions
Me.Button21.Text = "AAS Sendung 24h" Me.Button21.Text = "AAS Sendung 24h"
Me.Button21.UseVisualStyleBackColor = True Me.Button21.UseVisualStyleBackColor = True
' '
'cbxOnlyBilledTransactions 'MyTextBox4
' '
Me.cbxOnlyBilledTransactions.AutoSize = True Me.MyTextBox4._DateTimeOnly = False
Me.cbxOnlyBilledTransactions.Checked = True Me.MyTextBox4._numbersOnly = False
Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked Me.MyTextBox4._numbersOnlyKommastellen = ""
Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.MyTextBox4._numbersOnlyTrennzeichen = False
Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84) Me.MyTextBox4._Prozent = False
Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions" Me.MyTextBox4._ShortDateNew = True
Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17) Me.MyTextBox4._ShortDateOnly = True
Me.cbxOnlyBilledTransactions.TabIndex = 121 Me.MyTextBox4._TimeOnly = False
Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen" Me.MyTextBox4._TimeOnly_Seconds = False
Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True Me.MyTextBox4._value = ""
Me.MyTextBox4._Waehrung = False
Me.MyTextBox4._WaehrungZeichen = False
Me.MyTextBox4.ForeColor = System.Drawing.Color.Red
Me.MyTextBox4.Location = New System.Drawing.Point(775, 277)
Me.MyTextBox4.MaxLineLength = -1
Me.MyTextBox4.MaxLines_Warning = ""
Me.MyTextBox4.MaxLines_Warning_Label = Nothing
Me.MyTextBox4.Name = "MyTextBox4"
Me.MyTextBox4.Size = New System.Drawing.Size(53, 20)
Me.MyTextBox4.TabIndex = 87
'
'Label41
'
Me.Label41.AutoSize = True
Me.Label41.Location = New System.Drawing.Point(772, 261)
Me.Label41.Name = "Label41"
Me.Label41.Size = New System.Drawing.Size(56, 13)
Me.Label41.TabIndex = 90
Me.Label41.Text = "ab Datum:"
' '
'frmStartOptions 'frmStartOptions
' '
@@ -3403,4 +3439,6 @@ Partial Class frmStartOptions
Friend WithEvents LinkLabel60 As LinkLabel Friend WithEvents LinkLabel60 As LinkLabel
Friend WithEvents LinkLabel62 As LinkLabel Friend WithEvents LinkLabel62 As LinkLabel
Friend WithEvents cbxOnlyBilledTransactions As CheckBox Friend WithEvents cbxOnlyBilledTransactions As CheckBox
Friend WithEvents Label41 As Label
Friend WithEvents MyTextBox4 As VERAG_PROG_ALLGEMEIN.MyTextBox
End Class End Class

View File

@@ -524,129 +524,6 @@
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox15.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="PictureBox14.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>
<metadata name="clmnMRN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<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> </value>
</data> </data>
<data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="PictureBox12.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -743,6 +620,132 @@
WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/
nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de
CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII=
</value>
</data>
<data name="PictureBox15.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="PictureBox14.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>
<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="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> </value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -14,6 +14,7 @@ Imports Renci.SshNet
Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN
Public Class frmStartOptions Public Class frmStartOptions
Dim WithEvents timer As New Timer Dim WithEvents timer As New Timer
@@ -543,7 +544,7 @@ Public Class frmStartOptions
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim f As New frmInfo(PARAM) Dim f As New frmInfo(PARAM)
f.Show() f.Show()
doAASVermerke_Schwelle() doAASVermerke_Schwelle(Nothing)
closeMe() closeMe()
'------------------------------ '------------------------------
@@ -3952,27 +3953,33 @@ Public Class frmStartOptions
End Sub End Sub
Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click
doAASVermerke_Schwelle() Dim abDatum = Nothing
If MyTextBox4._value <> "" Then abDatum = CDate(MyTextBox4._value)
doAASVermerke_Schwelle(abDatum)
End Sub End Sub
Function doAASVermerke_Schwelle() Function doAASVermerke_Schwelle(Optional abDatum = Nothing)
Try Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim dt = SQL.loadDgvBySql(" Dim dt = SQL.loadDgvBySql("
SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk] SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk],Vermerke.SendungID SendungsId
,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr ,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr,VermerkID
FROM [Aviso] FROM [Aviso]
inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID
inner join VermerkeCodes on Vermerke.VermerkeCode=VermerkeCodes.VermerkCodeId inner join VermerkeCodes on Vermerke.VermerkeCode=VermerkeCodes.VermerkCodeId
WHERE [Aviso].Status NOT IN (1,2) AND AAS_Warnsystem=1 and AAS_Warnstufe=0 and DATEDIFF(HOUR,Vermerke.Datum,GETDATE())>AAS_SchwelleStunden and [VermerkIDAufgehoben] is null WHERE [Aviso].Status NOT IN (1,2) AND AAS_Warnsystem=1 and AAS_Warnstufe=0 and DATEDIFF(HOUR,Vermerke.Datum,GETDATE())>AAS_SchwelleStunden and [VermerkIDAufgehoben] is null
and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945)) /*and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945))*/
AND Aviso.Datum > DATEADD( day,-1,GETDATE()) AND Aviso.Datum > " & If(abDatum IsNot Nothing, "'" & CDate(abDatum).ToShortDateString & "'", " DATEADD( day,-1,GETDATE())") & "
AND Geloescht=0
", "AVISO") ", "AVISO")
If dt IsNot Nothing Then If dt IsNot Nothing Then
For Each r In dt.Rows For Each r In dt.Rows
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1) MsgBox(r("AvisoId"))
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1)
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
cVermerkeDAL.increaseWarnstufe(r("VermerkID"))
Next Next
End If End If
Catch ex As Exception Catch ex As Exception
@@ -3995,7 +4002,9 @@ Public Class frmStartOptions
If dt IsNot Nothing Then If dt IsNot Nothing Then
For Each r In dt.Rows For Each r In dt.Rows
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0) insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0)
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
Next Next
End If End If
Catch ex As Exception Catch ex As Exception
@@ -4020,7 +4029,9 @@ Public Class frmStartOptions
If dt IsNot Nothing Then If dt IsNot Nothing Then
For Each r In dt.Rows For Each r In dt.Rows
insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0) insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0)
insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk"))
Next Next
End If End If
Catch ex As Exception Catch ex As Exception
@@ -4033,50 +4044,68 @@ Public Class frmStartOptions
Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio) Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio)
' '
'Benachrichtigung 'Benachrichtigung
If SendungsId Is DBNull.Value Then SendungsId = Nothing
Try Try
'Benutzer vorschreiben der Sendung...
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
Dim art = "B" Dim art = "B"
'MsgBox("Benutzer vorschreiben" & sendToID)
'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung... 'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung...
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
art = "B" art = "B"
End If End If
' MsgBox("Benutzer der Sendung" & sendToID)
'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW .. 'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW ..
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1) sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1)
art = "B" art = "B"
End If End If
' MsgBox("Benutzer der LKW" & sendToID)
'Wenn Benutzer des LKWs nicht online, Team... 'Wenn Benutzer des LKWs nicht online, Team der Sendung...
If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then
sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1)
art = "T" art = "T"
End If End If
' MsgBox("Team der Sendung" & sendToID)
'Wenn TEAM nicht gefunden, Firma... 'Wenn Team der Sendung nicht gefunden, Team des LKW...
If sendToID <= 0 Then
sendToID = SQL.DLookup("TeamId", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO", -1)
art = "T"
End If
' MsgBox("Team LKW " & sendToID)
'Wenn TEAM LKW nicht gefunden, Firma...
If sendToID <= 0 Then If sendToID <= 0 Then
If firma IsNot Nothing AndAlso firma <> "" Then If firma IsNot Nothing AndAlso firma <> "" Then
sendToID = firma sendToID = firma
art = "F" art = "F"
End If End If
End If End If
' MsgBox("XXXX" & sendToID)
'Wenn gefunden 'Wenn gefunden
If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then
Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO")
Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO")
If GrenzstelleAVISO = "???" Then ' If GrenzstelleAVISO = "???" Then
Select Case statusAVISO Select Case statusAVISO
Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben
'Nicht 'Nicht
Case Else Case Else
MsgBox("!!!!!" & sendToID)
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma)
insertVermerk(AvisoId, SendungsId, 115, "(AAS) " & TXT_AAS_BODY)
End Select End Select
End If ' End If
End If End If
Catch ex As Exception Catch ex As Exception
@@ -4086,6 +4115,27 @@ Public Class frmStartOptions
Return True Return True
End Function End Function
Sub insertVermerk(AvisoID, SendungID, VermerkCodeId, VermerkText)
If SendungID Is DBNull.Value Then SendungID = -1
Dim myVermerk As New cVermerk
myVermerk.VermerkID = 0
myVermerk.AvisoID = AvisoID
myVermerk.Datum = Now
myVermerk.Mitarbeiter = "AAS (AUTO)"
myVermerk.MitarbeiterId = -1
myVermerk.Hinweis_Vermerk = VermerkText
myVermerk.VermerkCodeId = VermerkCodeId
myVermerk.SendungID = SendungID
myVermerk.HintergrundVermerk = True
If SendungID > 0 Then myVermerk.VermerkArt = "S" Else myVermerk.VermerkArt = "A"
Dim VermerkeDAL As New cVermerkeDAL
VermerkeDAL.SpeichernVermerk(myVermerk)
End Sub
Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click
doAASVermerke_24h() doAASVermerke_24h()
End Sub End Sub