diff --git a/DAKOSY_Worker/My Project/Settings.Designer.vb b/DAKOSY_Worker/My Project/Settings.Designer.vb index 53b3936..ed945b4 100644 --- a/DAKOSY_Worker/My Project/Settings.Designer.vb +++ b/DAKOSY_Worker/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.DAKOSY_Worker.My.MySettings Get Return Global.DAKOSY_Worker.My.MySettings.Default diff --git a/MDM_Worker/My Project/Settings.Designer.vb b/MDM_Worker/My Project/Settings.Designer.vb index 27b03ad..5fcbdb3 100644 --- a/MDM_Worker/My Project/Settings.Designer.vb +++ b/MDM_Worker/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.MDM_Worker.My.MySettings Get Return Global.MDM_Worker.My.MySettings.Default diff --git a/MailSender/My Project/Settings.Designer.vb b/MailSender/My Project/Settings.Designer.vb index a502e3b..e343799 100644 --- a/MailSender/My Project/Settings.Designer.vb +++ b/MailSender/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.MailSender.My.MySettings Get Return Global.MailSender.My.MySettings.Default diff --git a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb b/TELOTEK_Worker_lib/My Project/Settings.Designer.vb index 9bca1e9..012a590 100644 --- a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb +++ b/TELOTEK_Worker_lib/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.TELOTEC_Worker.My.MySettings Get Return Global.TELOTEC_Worker.My.MySettings.Default diff --git a/UID/My Project/Application.Designer.vb b/UID/My Project/Application.Designer.vb index 941d8d0..d4fa0c9 100644 --- a/UID/My Project/Application.Designer.vb +++ b/UID/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.ADMIN.frmLogin End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/UID/My Project/Settings.Designer.vb b/UID/My Project/Settings.Designer.vb index fde2271..626a6d9 100644 --- a/UID/My Project/Settings.Designer.vb +++ b/UID/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -53,51 +53,51 @@ Namespace My Return defaultInstance End Get End Property - - _ + + Public Property firmashort() As Boolean Get - Return CType(Me("firmashort"),Boolean) + Return CType(Me("firmashort"), Boolean) End Get Set - Me("firmashort") = value + Me("firmashort") = Value End Set End Property - - _ + + Public ReadOnly Property connToUID() As String Get - Return CType(Me("connToUID"),String) + Return CType(Me("connToUID"), String) End Get End Property - - _ + + Public ReadOnly Property connToAdminDEV() As String Get - Return CType(Me("connToAdminDEV"),String) + Return CType(Me("connToAdminDEV"), String) End Get End Property End Class End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.ADMIN.My.MySettings Get Return Global.ADMIN.My.MySettings.Default diff --git a/cNCTSPartnerWorker/My Project/Settings.Designer.vb b/cNCTSPartnerWorker/My Project/Settings.Designer.vb index db7fabe..08281e5 100644 --- a/cNCTSPartnerWorker/My Project/Settings.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.cNCTSPartnerWorker.My.MySettings Get Return Global.cNCTSPartnerWorker.My.MySettings.Default diff --git a/initATLASAufschubkonten/My Project/Application.Designer.vb b/initATLASAufschubkonten/My Project/Application.Designer.vb index 2584a6d..44a50fa 100644 --- a/initATLASAufschubkonten/My Project/Application.Designer.vb +++ b/initATLASAufschubkonten/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.RoutineManager.frmStartOptions End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/initATLASAufschubkonten/My Project/Settings.Designer.vb b/initATLASAufschubkonten/My Project/Settings.Designer.vb index 687997e..013004c 100644 --- a/initATLASAufschubkonten/My Project/Settings.Designer.vb +++ b/initATLASAufschubkonten/My Project/Settings.Designer.vb @@ -13,17 +13,17 @@ Option Explicit On Namespace My - - _ + + Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings) + #Region "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then +#If _MYTYPE = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object @@ -36,11 +36,11 @@ Namespace My End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - -#If _MyType = "WindowsForms" Then + +#If _MYTYPE = "WindowsForms" Then If Not addedHandler Then SyncLock addedHandlerLockObject If Not addedHandler Then @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + Friend Module MySettingsProperty - - _ + + Friend ReadOnly Property Settings() As Global.RoutineManager.My.MySettings Get Return Global.RoutineManager.My.MySettings.Default diff --git a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb index e363fb6..d8609cb 100644 --- a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb +++ b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb @@ -51,10 +51,10 @@ Shared Function copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean cVERAG_Interface_Settings = ISett Dim DY_TMP = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADByBezugsNr(BezugsNr) - Dim NCTS_TMP = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True) + Dim NCTS_TMP = DAKOSY_Worker.cDakosyNCTSOut004.LOADByBezugsNr(BezugsNr, True) If DY_TMP Is Nothing Then Return False If NCTS_TMP Is Nothing Then Return False - Return copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) + Return copyFileFTP_VERAGncts004_DY(NCTS_TMP, DY_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) End Function Shared Function getLRN_ByCRN(CRN As String) As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -63,7 +63,7 @@ Shared Function getBezugnNr_ByMRN(MRN As String) As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Return SQL.getValueTxtBySql(" SELECT TOP 1 ncts_ObjectName FROM tblDakosy_NCTSOut WHERE ncts_MRN = '" & MRN & "' ORDER BY ncts_Trans_DatumZeit DESC", "FMZOLL") + Return SQL.getValueTxtBySql(" SELECT TOP 1 ncts_ObjectName FROM tblDakosy_NCTSOut004 WHERE ncts_MRN = '" & MRN & "' ORDER BY ncts_Trans_DatumZeit DESC", "FMZOLL") End Function Shared Function copyFileFTP_VERAGncts_DY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, Optional checkAlreadyProvided As Boolean = True, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index db9428f..2e4b51c 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -657,7 +657,7 @@ Public Class frmMDMNachrichtenVerarbeitung 'Label31.Visible = True readPLOSE_Detail = "Zeilen: " & cnt Else - MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") + ' MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") End If End Using @@ -678,7 +678,6 @@ Public Class frmMDMNachrichtenVerarbeitung Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - MsgBox(ex.StackTrace & ex.Message) readPLOSE_Detail = "" End Try End Function diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index fd8e283..a7721aa 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -247,7 +247,8 @@ Partial Class frmStartOptions Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.cbxUploadDA = New System.Windows.Forms.CheckBox() + Me.Button21 = New System.Windows.Forms.Button() + Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() Me.pnl.SuspendLayout() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() @@ -842,6 +843,8 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Label41) + Me.TabPage1.Controls.Add(Me.MyTextBox4) Me.TabPage1.Controls.Add(Me.LinkLabel99) Me.TabPage1.Controls.Add(Me.PictureBox99) Me.TabPage1.Controls.Add(Me.Button99) @@ -925,7 +928,7 @@ Partial Class frmStartOptions Me.Button99.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button99.Location = New System.Drawing.Point(581, 346) 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.Text = "AAS Sendung 24h" Me.Button99.UseVisualStyleBackColor = True @@ -938,7 +941,7 @@ Partial Class frmStartOptions Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button20.Location = New System.Drawing.Point(581, 323) 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.Text = "xxx AAS Ankunft 4h" Me.Button20.UseVisualStyleBackColor = True @@ -950,7 +953,7 @@ Partial Class frmStartOptions Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button19.Location = New System.Drawing.Point(581, 300) 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.Text = "AAS Vermerke 24h" Me.Button19.UseVisualStyleBackColor = True @@ -972,7 +975,7 @@ Partial Class frmStartOptions Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button18.Location = New System.Drawing.Point(581, 277) 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.Text = "AAS Vermerke Überschreitung" Me.Button18.UseVisualStyleBackColor = True @@ -1904,52 +1907,6 @@ Partial Class frmStartOptions Me.TabPage4.Text = "VERAG 360" Me.TabPage4.UseVisualStyleBackColor = True ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.ForeColor = System.Drawing.Color.Red - Me.Label5.Location = New System.Drawing.Point(879, 39) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(56, 16) - Me.Label5.TabIndex = 126 - Me.Label5.Text = "PLOSE" - ' - 'LinkLabel23 - ' - Me.LinkLabel23.AutoSize = True - Me.LinkLabel23.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel23.Location = New System.Drawing.Point(879, 117) - Me.LinkLabel23.Name = "LinkLabel23" - Me.LinkLabel23.Size = New System.Drawing.Size(180, 13) - Me.LinkLabel23.TabIndex = 125 - Me.LinkLabel23.TabStop = True - Me.LinkLabel23.Text = "Eingangsnachrichten abrufen PROD" - ' - 'LinkLabel24 - ' - Me.LinkLabel24.AutoSize = True - Me.LinkLabel24.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel24.Location = New System.Drawing.Point(879, 92) - Me.LinkLabel24.Name = "LinkLabel24" - Me.LinkLabel24.Size = New System.Drawing.Size(177, 13) - Me.LinkLabel24.TabIndex = 124 - Me.LinkLabel24.TabStop = True - Me.LinkLabel24.Text = "Eingangsnachrichten abrufen TEST" - ' - '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 ' Me.LinkLabel62.AutoSize = True @@ -3144,16 +3101,30 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' - 'cbxUploadDA + 'Button21 ' - Me.cbxUploadDA.AutoSize = True - Me.cbxUploadDA.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxUploadDA.Location = New System.Drawing.Point(772, 324) - Me.cbxUploadDA.Name = "cbxUploadDA" - Me.cbxUploadDA.Size = New System.Drawing.Size(81, 17) - Me.cbxUploadDA.TabIndex = 128 - Me.cbxUploadDA.Text = "PDF ins DS" - Me.cbxUploadDA.UseVisualStyleBackColor = True + Me.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button21.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button21.Location = New System.Drawing.Point(581, 346) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(211, 24) + Me.Button21.TabIndex = 81 + Me.Button21.Text = "AAS Sendung 24h" + Me.Button21.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 ' 'frmStartOptions ' @@ -3427,10 +3398,4 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel60 As LinkLabel Friend WithEvents LinkLabel62 As LinkLabel Friend WithEvents cbxOnlyBilledTransactions As CheckBox - Friend WithEvents cbxMSEBatchNr As VERAG_PROG_ALLGEMEIN.MyComboBox - Friend WithEvents Label5 As Label - Friend WithEvents LinkLabel23 As LinkLabel - Friend WithEvents LinkLabel24 As LinkLabel - Friend WithEvents txtBatchNr As VERAG_PROG_ALLGEMEIN.MyTextBox - Friend WithEvents cbxUploadDA As CheckBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 8d1e514..61eadd8 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -524,129 +524,6 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - 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= - - - - - 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= - - - - True - - - - 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= - - - - - 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= - - - - - 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= @@ -743,6 +620,132 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + 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= + + + + + 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= + + + + True + + + True + + + + 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= + + + + + 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= + + + + + 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= diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 8fdd422..838b780 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -14,6 +14,7 @@ Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN + Public Class frmStartOptions Dim WithEvents timer As New Timer @@ -544,7 +545,7 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim f As New frmInfo(PARAM) f.Show() - doAASVermerke_Schwelle() + doAASVermerke_Schwelle(Nothing) closeMe() '------------------------------ @@ -3953,27 +3954,33 @@ Public Class frmStartOptions End Sub 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 - Function doAASVermerke_Schwelle() + Function doAASVermerke_Schwelle(Optional abDatum = Nothing) Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim dt = SQL.loadDgvBySql(" - SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk] - ,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr + 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,VermerkID FROM [Aviso] inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID 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 - and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945)) - AND Aviso.Datum > DATEADD( day,-1,GETDATE()) + /*and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945))*/ + AND Aviso.Datum > " & If(abDatum IsNot Nothing, "'" & CDate(abDatum).ToShortDateString & "'", " DATEADD( day,-1,GETDATE())") & " + AND Geloescht=0 ", "AVISO") If dt IsNot Nothing Then 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 End If Catch ex As Exception @@ -3996,7 +4003,9 @@ Public Class frmStartOptions If dt IsNot Nothing Then 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 End If Catch ex As Exception @@ -4021,7 +4030,9 @@ Public Class frmStartOptions If dt IsNot Nothing Then 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 End If Catch ex As Exception @@ -4034,50 +4045,68 @@ Public Class frmStartOptions Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio) ' 'Benachrichtigung + If SendungsId Is DBNull.Value Then SendungsId = Nothing Try + 'Benutzer vorschreiben der Sendung... Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) Dim art = "B" + 'MsgBox("Benutzer vorschreiben" & sendToID) 'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung... If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) art = "B" End If + ' MsgBox("Benutzer der Sendung" & sendToID) 'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW .. If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1) art = "B" 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 sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) art = "T" 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 firma IsNot Nothing AndAlso firma <> "" Then sendToID = firma art = "F" End If End If + ' MsgBox("XXXX" & sendToID) + 'Wenn gefunden If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") - If GrenzstelleAVISO = "???" Then - Select Case statusAVISO + ' If GrenzstelleAVISO = "???" Then + Select Case statusAVISO Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben 'Nicht Case Else + MsgBox("!!!!!" & sendToID) - VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) - End Select - End If + 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 If End If Catch ex As Exception @@ -4087,6 +4116,27 @@ Public Class frmStartOptions Return True 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 doAASVermerke_24h() End Sub