diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 8eddb4b..6fb6165 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -629,6 +629,12 @@ UserControl + + usrCntlDatenarchiv.vb + + + UserControl + usrCntlERS.vb @@ -830,6 +836,9 @@ usrCntlProgramme.vb + + usrCntlDatenarchiv.vb + usrCntlERS.vb diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index b1f853b..c0bf175 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/frmAPIEinstellungen.Designer.vb b/UID/frmAPIEinstellungen.Designer.vb index ed63a06..77dbb0f 100644 --- a/UID/frmAPIEinstellungen.Designer.vb +++ b/UID/frmAPIEinstellungen.Designer.vb @@ -28,6 +28,7 @@ Partial Class frmAPIEinstellungen Me.DataGridView = New System.Windows.Forms.DataGridView() Me.Label1 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() + Me.cbxProduktivsystem = New System.Windows.Forms.CheckBox() CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -88,11 +89,22 @@ Partial Class frmAPIEinstellungen Me.Label3.TabIndex = 24 Me.Label3.Text = "Token:Für Authentifizierung werden Token verwendet!" ' + 'cbxProduktivsystem + ' + Me.cbxProduktivsystem.AutoSize = True + Me.cbxProduktivsystem.Location = New System.Drawing.Point(213, 26) + Me.cbxProduktivsystem.Name = "cbxProduktivsystem" + Me.cbxProduktivsystem.Size = New System.Drawing.Size(109, 17) + Me.cbxProduktivsystem.TabIndex = 25 + Me.cbxProduktivsystem.Text = "Produktivsysteme" + Me.cbxProduktivsystem.UseVisualStyleBackColor = True + ' 'frmAPIEinstellungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1158, 485) + Me.Controls.Add(Me.cbxProduktivsystem) Me.Controls.Add(Me.Label3) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label2) @@ -113,4 +125,5 @@ Partial Class frmAPIEinstellungen Friend WithEvents DataGridView As DataGridView Friend WithEvents Label1 As Label Friend WithEvents Label3 As Label + Friend WithEvents cbxProduktivsystem As CheckBox End Class diff --git a/UID/frmAPIEinstellungen.vb b/UID/frmAPIEinstellungen.vb index fc16c9b..91442af 100644 --- a/UID/frmAPIEinstellungen.vb +++ b/UID/frmAPIEinstellungen.vb @@ -29,10 +29,10 @@ Public Class frmAPIEinstellungen If sqlwhere = "" Then - APIBind.initBinding("SELECT [api_active],[api_productive], [api_program],[api_id],[api_url] ,[api_user],[api_password] ,[api_UseToken],[api_token] ,[api_description] FROM " & table, table) + APIBind.initBinding("SELECT [api_active],[api_productive], [api_program],[api_id],[api_url] ,[api_user],[api_password] ,[api_UseToken],[api_token] ,[api_description] FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0"), table) Else - APIBind.initBinding("SELECT [api_active],[api_productive], [api_program], [api_id],[api_url] ,[api_user],[api_password] ,[api_useToken],[api_token] ,[api_description] FROM " & table & " WHERE " & sqlwhere, table) + APIBind.initBinding("Select [api_active], [api_productive], [api_program], [api_id], [api_url], [api_user], [api_password], [api_useToken], [api_token], [api_description] FROM " & table & " WHERE api_productive = " & IIf(cbxProduktivsystem.Checked, "1", "0") & sqlwhere, table) End If @@ -62,29 +62,32 @@ Public Class frmAPIEinstellungen .Columns("api_description").HeaderText = "Beschreibung" .Columns("api_description").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill - Dim c As New DataGridViewImageColumn - c.Name = "isRunning" : c.HeaderText = "Online" - c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom - c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White - c.DefaultCellStyle.Tag = "Online" - .Columns.Add(c) + If .Columns("isRunning") Is Nothing Then + Dim c As New DataGridViewImageColumn + c.Name = "isRunning" : c.HeaderText = "Online" + c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + c.DefaultCellStyle.Tag = "Online" + .Columns.Add(c) + + End If For Each r As DataGridViewRow In .Rows - If r.Cells("api_url").Value Is DBNull.Value Then - r.DefaultCellStyle.ForeColor = Color.Gray - ElseIf CBool(r.Cells("api_active").Value) = False Then - r.DefaultCellStyle.ForeColor = Color.Gray - End If + If r.Cells("api_url").Value Is DBNull.Value Then + r.DefaultCellStyle.ForeColor = Color.Gray + ElseIf CBool(r.Cells("api_active").Value) = False Then + r.DefaultCellStyle.ForeColor = Color.Gray + End If - If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value) Then - DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok - Else - DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del - End If - Next - End If + If r.Cells("api_url").Value IsNot DBNull.Value AndAlso CheckAddress(r.Cells("api_url").Value) Then + DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.ok + Else + DirectCast(r.Cells("isRunning"), DataGridViewImageCell).Value = My.Resources.del + End If + Next + End If End With @@ -139,9 +142,6 @@ Public Class frmAPIEinstellungen Private Sub Button1_Click(sender As Object, e As EventArgs) If DataGridView.SelectedRows.Count = 0 Then Exit Sub - - - End Sub Private Function CheckAddress(url As String) As Boolean @@ -156,14 +156,29 @@ Public Class frmAPIEinstellungen End Function Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown + Dim sqladdon As String = "" + If e.KeyCode = Keys.Enter Then If txtSuche.Text <> "" Then - sqladdon &= " [api_program] like '%" & txtSuche.Text & "%' or [api_url] like '%" & txtSuche.Text & "%'" + sqladdon &= " [api_program] Like '%" & txtSuche.Text & "%' or [api_url] like '%" & txtSuche.Text & "%'" End If loadDGV(sqladdon) End If End Sub + + Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxProduktivsystem.CheckedChanged + Dim sqladdon As String = "" + If txtSuche.Text <> "" Then + sqladdon &= " [api_program] Like '%" & txtSuche.Text & "%' or [api_url] like '%" & txtSuche.Text & "%'" + End If + loadDGV(sqladdon) + + End Sub + + Private Sub DataGridView_CellContentDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView.CellContentDoubleClick + + End Sub End Class \ No newline at end of file diff --git a/UID/frmMain.Designer.vb b/UID/frmMain.Designer.vb index be451bc..d42022e 100644 --- a/UID/frmMain.Designer.vb +++ b/UID/frmMain.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmMain Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager() Me.pnlMain = New System.Windows.Forms.Panel() Me.Panel3 = New System.Windows.Forms.Panel() + Me.Button2 = New System.Windows.Forms.Button() Me.btnFehler = New System.Windows.Forms.Button() Me.btnAPI = New System.Windows.Forms.Button() Me.btnHomepage = New System.Windows.Forms.Button() @@ -108,6 +109,7 @@ Partial Class frmMain 'Panel3 ' Me.Panel3.BackColor = System.Drawing.Color.White + Me.Panel3.Controls.Add(Me.Button2) Me.Panel3.Controls.Add(Me.btnFehler) Me.Panel3.Controls.Add(Me.btnAPI) Me.Panel3.Controls.Add(Me.btnHomepage) @@ -125,6 +127,18 @@ Partial Class frmMain Me.Panel3.Size = New System.Drawing.Size(137, 801) Me.Panel3.TabIndex = 32 ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button2.Location = New System.Drawing.Point(12, 319) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(94, 33) + Me.Button2.TabIndex = 41 + Me.Button2.Text = "Datenarchiv" + Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button2.UseVisualStyleBackColor = True + ' 'btnFehler ' Me.btnFehler.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -315,4 +329,5 @@ Partial Class frmMain Friend WithEvents btnHomepage As System.Windows.Forms.Button Friend WithEvents btnFehler As Button Friend WithEvents btnAPI As Button + Friend WithEvents Button2 As Button End Class diff --git a/UID/frmMain.vb b/UID/frmMain.vb index c9b996f..f5c2253 100644 --- a/UID/frmMain.vb +++ b/UID/frmMain.vb @@ -214,4 +214,12 @@ Public Class frmMain usrCntl.Dock = DockStyle.Fill button_Click(sender) End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + clrPnlMain() + Dim usrCntl As New usrCntlDatenarchiv("tblPartnersystem_Paramter", "FMZOLL") + pnlMain.Controls.Add(usrCntl) + usrCntl.Dock = DockStyle.Fill + button_Click(sender) + End Sub End Class diff --git a/UID/usrCntlAPI.vb b/UID/usrCntlAPI.vb index a7d9b60..c7fe6c1 100644 --- a/UID/usrCntlAPI.vb +++ b/UID/usrCntlAPI.vb @@ -7,10 +7,10 @@ Public Class usrCntlAPI Dim MONAT As Date = CDate("01." & Now.Month & "." & Now.Year) '.AddMonths(-1) Dim srcTAG As Date = CDate(Now.ToShortDateString) - Dim JAHR As Date = CDate("01.01." & Now.Year) Private Sub usrCntlAPI_Load(sender As Object, e As EventArgs) Handles Me.Load + txtAbfertDat.Text = Now.ToShortDateString 'CDate("01." & Now.ToString("MM.yyyy")).AddMonths(-1).txtAbfertDatBisToShortDateString txtAbfertDatBis.Text = Now.ToShortDateString @@ -31,10 +31,14 @@ Public Class usrCntlAPI cboDatum.changeItem("ADat") cboInOut.Items.Clear() - cboInOut.fillWithSQL("SELECT distinct([api_InOut]) FROM [tblAPI] ", False, "ADMIN", True) + 'cboInOut.fillWithSQL("SELECT distinct([api_InOut]) FROM [tblAPI] ", False, "ADMIN", True) + cboInOut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("IN", "IN")) + cboInOut.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("OUT", "OUT")) cboType.Items.Clear() - cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True) + 'cboType.fillWithSQL("SELECT distinct(api_Type) FROM [tblAPI] ", False, "ADMIN", True) + cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("FTP", "FTP")) + cboType.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("MAIL", "MAIL")) cboAPIArt.Items.Clear() cboAPIArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) @@ -51,11 +55,11 @@ Public Class usrCntlAPI cboFirma.Items.Clear() cboFirma.fillWithSQL("SELECT distinct([api_Firma]) FROM [tblAPI] where api_Firma is not null ", False, "ADMIN", True) + cboProgram.Items.Clear() cboProgram.fillWithSQL("SELECT distinct([api_progName]) FROM [tblAPI] where api_progName is not null ", False, "ADMIN", True) - End Sub Private Sub DateTimePicker1_ValueChanged(sender As Object, e As EventArgs) Handles DateTimePicker1.ValueChanged diff --git a/UID/usrCntlDatenarchiv.Designer.vb b/UID/usrCntlDatenarchiv.Designer.vb new file mode 100644 index 0000000..fd40187 --- /dev/null +++ b/UID/usrCntlDatenarchiv.Designer.vb @@ -0,0 +1,346 @@ + +Partial Class usrCntlDatenarchiv + Inherits System.Windows.Forms.UserControl + + 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Me.SplitContainer = New System.Windows.Forms.SplitContainer() + Me.pnlSearch = New System.Windows.Forms.Panel() + Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.cbxTestsystem = New System.Windows.Forms.CheckBox() + Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label8 = New System.Windows.Forms.Label() + Me.btnSuche = New System.Windows.Forms.Button() + Me.cboFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.pnlAnzeige = New System.Windows.Forms.Panel() + Me.DataGridView = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblErgebnis = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.txtMaxSrch = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Button10 = New System.Windows.Forms.Button() + Me.Button11 = New System.Windows.Forms.Button() + Me.btnSave = New System.Windows.Forms.Button() + CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer.Panel1.SuspendLayout() + Me.SplitContainer.Panel2.SuspendLayout() + Me.SplitContainer.SuspendLayout() + Me.pnlSearch.SuspendLayout() + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainer1.Panel1.SuspendLayout() + Me.SplitContainer1.SuspendLayout() + Me.pnlAnzeige.SuspendLayout() + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + Me.SuspendLayout() + ' + 'SplitContainer + ' + Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1 + Me.SplitContainer.IsSplitterFixed = True + Me.SplitContainer.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer.Name = "SplitContainer" + Me.SplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainer.Panel1 + ' + Me.SplitContainer.Panel1.Controls.Add(Me.pnlSearch) + ' + 'SplitContainer.Panel2 + ' + Me.SplitContainer.Panel2.Controls.Add(Me.pnlAnzeige) + Me.SplitContainer.Size = New System.Drawing.Size(1020, 687) + Me.SplitContainer.SplitterDistance = 80 + Me.SplitContainer.SplitterWidth = 2 + Me.SplitContainer.TabIndex = 3 + ' + 'pnlSearch + ' + Me.pnlSearch.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.pnlSearch.BackColor = System.Drawing.Color.White + Me.pnlSearch.Controls.Add(Me.SplitContainer1) + Me.pnlSearch.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnlSearch.Location = New System.Drawing.Point(0, 0) + Me.pnlSearch.Name = "pnlSearch" + Me.pnlSearch.Size = New System.Drawing.Size(1020, 80) + Me.pnlSearch.TabIndex = 0 + ' + 'SplitContainer1 + ' + Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1 + Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer1.Name = "SplitContainer1" + Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal + ' + 'SplitContainer1.Panel1 + ' + Me.SplitContainer1.Panel1.Controls.Add(Me.cbxTestsystem) + Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem) + Me.SplitContainer1.Panel1.Controls.Add(Me.Label8) + Me.SplitContainer1.Panel1.Controls.Add(Me.btnSuche) + Me.SplitContainer1.Panel1.Controls.Add(Me.cboFirma) + Me.SplitContainer1.Panel1.Controls.Add(Me.Label12) + Me.SplitContainer1.Panel2Collapsed = True + Me.SplitContainer1.Size = New System.Drawing.Size(1020, 80) + Me.SplitContainer1.SplitterDistance = 55 + Me.SplitContainer1.TabIndex = 0 + ' + 'cbxTestsystem + ' + Me.cbxTestsystem.AutoSize = True + Me.cbxTestsystem.Location = New System.Drawing.Point(129, 9) + Me.cbxTestsystem.Name = "cbxTestsystem" + Me.cbxTestsystem.Size = New System.Drawing.Size(79, 17) + Me.cbxTestsystem.TabIndex = 55 + Me.cbxTestsystem.Text = "Testsystem" + Me.cbxTestsystem.UseVisualStyleBackColor = True + ' + 'cboPartnersystem + ' + Me.cboPartnersystem._allowedValuesFreiText = Nothing + Me.cboPartnersystem._allowFreiText = False + Me.cboPartnersystem._value = "" + Me.cboPartnersystem.DropDownWidth = 250 + Me.cboPartnersystem.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboPartnersystem.FormattingEnabled = True + Me.cboPartnersystem.Location = New System.Drawing.Point(18, 24) + Me.cboPartnersystem.Name = "cboPartnersystem" + Me.cboPartnersystem.Size = New System.Drawing.Size(73, 22) + Me.cboPartnersystem.TabIndex = 54 + ' + 'Label8 + ' + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(15, 9) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(90, 13) + Me.Label8.TabIndex = 45 + Me.Label8.Text = "Partnersystem:" + ' + 'btnSuche + ' + Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSuche.Location = New System.Drawing.Point(850, 9) + Me.btnSuche.Name = "btnSuche" + Me.btnSuche.Size = New System.Drawing.Size(162, 52) + Me.btnSuche.TabIndex = 28 + Me.btnSuche.Text = "Ergebnisse laden" + Me.btnSuche.UseVisualStyleBackColor = True + ' + 'cboFirma + ' + Me.cboFirma._allowedValuesFreiText = Nothing + Me.cboFirma._allowFreiText = False + Me.cboFirma._value = "" + Me.cboFirma.DropDownWidth = 250 + Me.cboFirma.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboFirma.FormattingEnabled = True + Me.cboFirma.Location = New System.Drawing.Point(234, 28) + Me.cboFirma.Name = "cboFirma" + Me.cboFirma.Size = New System.Drawing.Size(104, 22) + Me.cboFirma.TabIndex = 20 + Me.cboFirma.Visible = False + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label12.Location = New System.Drawing.Point(231, 10) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(37, 13) + Me.Label12.TabIndex = 6 + Me.Label12.Text = "Firma" + Me.Label12.Visible = False + ' + 'pnlAnzeige + ' + Me.pnlAnzeige.BackColor = System.Drawing.Color.White + Me.pnlAnzeige.Controls.Add(Me.DataGridView) + Me.pnlAnzeige.Controls.Add(Me.Panel1) + Me.pnlAnzeige.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnlAnzeige.Location = New System.Drawing.Point(0, 0) + Me.pnlAnzeige.Name = "pnlAnzeige" + Me.pnlAnzeige.Size = New System.Drawing.Size(1020, 605) + Me.pnlAnzeige.TabIndex = 0 + ' + 'DataGridView + ' + Me.DataGridView.AKTUALISIERUNGS_INTERVALL = -1 + Me.DataGridView.AllowUserToAddRows = False + Me.DataGridView.AllowUserToDeleteRows = False + Me.DataGridView.AllowUserToOrderColumns = True + Me.DataGridView.AllowUserToResizeRows = False + Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill + Me.DataGridView.Location = New System.Drawing.Point(0, 0) + Me.DataGridView.Name = "DataGridView" + Me.DataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect + Me.DataGridView.Size = New System.Drawing.Size(1020, 561) + Me.DataGridView.TabIndex = 0 + ' + 'Panel1 + ' + Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel1.Controls.Add(Me.btnSave) + Me.Panel1.Controls.Add(Me.lblErgebnis) + Me.Panel1.Controls.Add(Me.Label4) + Me.Panel1.Controls.Add(Me.txtMaxSrch) + Me.Panel1.Controls.Add(Me.Button10) + Me.Panel1.Controls.Add(Me.Button11) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel1.Location = New System.Drawing.Point(0, 561) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1020, 44) + Me.Panel1.TabIndex = 1 + ' + 'lblErgebnis + ' + Me.lblErgebnis.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblErgebnis.Location = New System.Drawing.Point(864, 25) + Me.lblErgebnis.Name = "lblErgebnis" + Me.lblErgebnis.Size = New System.Drawing.Size(152, 13) + Me.lblErgebnis.TabIndex = 45 + Me.lblErgebnis.Text = "Max:" + Me.lblErgebnis.TextAlign = System.Drawing.ContentAlignment.TopRight + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(930, 5) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(30, 13) + Me.Label4.TabIndex = 43 + Me.Label4.Text = "Max:" + ' + 'txtMaxSrch + ' + Me.txtMaxSrch._DateTimeOnly = False + Me.txtMaxSrch._numbersOnly = True + Me.txtMaxSrch._numbersOnlyKommastellen = "" + Me.txtMaxSrch._numbersOnlyTrennzeichen = True + Me.txtMaxSrch._Prozent = False + Me.txtMaxSrch._ShortDateNew = False + Me.txtMaxSrch._ShortDateOnly = False + Me.txtMaxSrch._TimeOnly = False + Me.txtMaxSrch._TimeOnly_Seconds = False + Me.txtMaxSrch._value = "" + Me.txtMaxSrch._Waehrung = False + Me.txtMaxSrch._WaehrungZeichen = True + Me.txtMaxSrch.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtMaxSrch.ForeColor = System.Drawing.Color.Black + Me.txtMaxSrch.Location = New System.Drawing.Point(966, 2) + Me.txtMaxSrch.MaxLineLength = -1 + Me.txtMaxSrch.MaxLines_Warning = "" + Me.txtMaxSrch.MaxLines_Warning_Label = Nothing + Me.txtMaxSrch.Name = "txtMaxSrch" + Me.txtMaxSrch.Size = New System.Drawing.Size(51, 20) + Me.txtMaxSrch.TabIndex = 44 + Me.txtMaxSrch.Text = "1000" + Me.txtMaxSrch.TextAlign = System.Windows.Forms.HorizontalAlignment.Right + ' + 'Button10 + ' + Me.Button10.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button10.Location = New System.Drawing.Point(1117, 1) + Me.Button10.Name = "Button10" + Me.Button10.Size = New System.Drawing.Size(41, 34) + Me.Button10.TabIndex = 3 + Me.Button10.UseVisualStyleBackColor = True + ' + 'Button11 + ' + Me.Button11.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Button11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Button11.ForeColor = System.Drawing.Color.Black + Me.Button11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button11.Location = New System.Drawing.Point(1164, 1) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(41, 34) + Me.Button11.TabIndex = 4 + Me.Button11.UseVisualStyleBackColor = True + ' + 'btnSave + ' + Me.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnSave.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnSave.Location = New System.Drawing.Point(789, 5) + Me.btnSave.Name = "btnSave" + Me.btnSave.Size = New System.Drawing.Size(118, 26) + Me.btnSave.TabIndex = 56 + Me.btnSave.Text = "speichern" + Me.btnSave.UseVisualStyleBackColor = True + ' + 'usrCntlDatenarchiv + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Controls.Add(Me.SplitContainer) + Me.Name = "usrCntlDatenarchiv" + Me.Size = New System.Drawing.Size(1020, 687) + Me.SplitContainer.Panel1.ResumeLayout(False) + Me.SplitContainer.Panel2.ResumeLayout(False) + CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer.ResumeLayout(False) + Me.pnlSearch.ResumeLayout(False) + Me.SplitContainer1.Panel1.ResumeLayout(False) + Me.SplitContainer1.Panel1.PerformLayout() + CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainer1.ResumeLayout(False) + Me.pnlAnzeige.ResumeLayout(False) + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents SplitContainer As SplitContainer + Friend WithEvents pnlSearch As Panel + Friend WithEvents SplitContainer1 As SplitContainer + Friend WithEvents btnSuche As Button + Friend WithEvents pnlAnzeige As Panel + Friend WithEvents DataGridView As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Panel1 As Panel + Friend WithEvents Label4 As Label + Friend WithEvents txtMaxSrch As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button10 As Button + Friend WithEvents Button11 As Button + Friend WithEvents Label8 As Label + Friend WithEvents lblErgebnis As Label + Friend WithEvents cboPartnersystem As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents cboFirma As VERAG_PROG_ALLGEMEIN.MyComboBox + Friend WithEvents Label12 As Label + Friend WithEvents cbxTestsystem As CheckBox + Friend WithEvents btnSave As Button +End Class diff --git a/UID/usrCntlDatenarchiv.resx b/UID/usrCntlDatenarchiv.resx new file mode 100644 index 0000000..732373b --- /dev/null +++ b/UID/usrCntlDatenarchiv.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/UID/usrCntlDatenarchiv.vb b/UID/usrCntlDatenarchiv.vb new file mode 100644 index 0000000..7d57b2a --- /dev/null +++ b/UID/usrCntlDatenarchiv.vb @@ -0,0 +1,185 @@ +Imports System.ComponentModel +Imports System.IO +Imports System.Windows.Documents +Imports VERAG_PROG_ALLGEMEIN + +Public Class usrCntlDatenarchiv + + + Dim DatenarchivBind As cEasyBinding + Public table + Public BIND_DB + Private EditRow As Integer = -1 + Sub New(table, BIND_DB) + Me.table = table + Me.BIND_DB = BIND_DB + InitializeComponent() + End Sub + + + Private Sub usrCntlDatenarchiv_Load(sender As Object, e As EventArgs) Handles Me.Load + + loaddgv() + + cboPartnersystem.Items.Clear() + Dim distinctDT As DataTable = DatenarchivBind.bindingdataTable.DefaultView.ToTable(True, "Param_system") + + For Each d As DataRow In distinctDT.Rows + cboPartnersystem.Items.Add(d.Item(0)) + Next + + + End Sub + + Private Sub btnSuche_Click(sender As Object, e As EventArgs) Handles btnSuche.Click + Me.Cursor = Cursors.WaitCursor + + loaddgv() + + Me.Cursor = Cursors.Default + End Sub + + Function getAPIList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + + Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) + + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Param_system", cboPartnersystem._value)) + + Return list + + End Function + + Function getDatenarchivwhere() As String + + Dim sqlstr = "" + If cboPartnersystem._value <> "" Then sqlstr &= " AND [Param_system] = '" & cboPartnersystem._value & "'" + + Return sqlstr + End Function + + + Private Sub DataGridView_CellDoubleClick(sender As Object, e As DataGridViewCellEventArgs) Handles DataGridView.CellDoubleClick + Me.Cursor = Cursors.WaitCursor + Dim tmprowindex As Integer = e.RowIndex + If DataGridView.Columns(e.ColumnIndex).Name = "open" Then + + If DataGridView.CurrentRow.Cells("Param_value").Value IsNot DBNull.Value AndAlso DataGridView.CurrentRow.Cells("Param_value").Value.ToString.StartsWith("\\") Then + Process.Start(DataGridView.CurrentRow.Cells("Param_value").Value) + End If + Else + + End If + Me.Cursor = Cursors.Default + End Sub + + Private Sub cbxProduktivsystem_CheckedChanged(sender As Object, e As EventArgs) Handles cbxTestsystem.CheckedChanged + + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked + + Me.usrCntlDatenarchiv_Load(sender, e) + + End Sub + + Private Sub cboPartnersystem_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboPartnersystem.SelectedIndexChanged + btnSuche_Click(sender, e) + End Sub + + + Public Sub loaddgv() + + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked + + Try + DatenarchivBind = New cEasyBinding(BIND_DB) + + + Dim sqlstr As String = "" + Dim TopMax = If(IsNumeric(txtMaxSrch.Text), " TOP " & txtMaxSrch.Text, "") + + + DatenarchivBind.initBinding("SELECT " & TopMax & " [Param_name],[Param_value], [Param_system] FROM " & table & " WHERE 1 = 1 " & getDatenarchivwhere(), table) + + DataGridView.DataSource = DatenarchivBind.bindingdataTable + + + With DataGridView + + If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub + .RowHeadersVisible = False + .ReadOnly = False + '.SelectionMode = DataGridViewSelectionMode.FullRowSelect + .MultiSelect = False + + + For Each cc As DataGridViewColumn In .Columns + If cc.Name.ToLower.Contains("param_") Then + cc.HeaderText = cc.Name.Replace("Param_", "") + If cc.Name.ToLower.Contains("value") Then + cc.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + Else + cc.Width = 200 + End If + End If + Next + + + lblErgebnis.Text = "Ergebnisse: " & .RowCount + + + If .Columns("open") Is Nothing Then + + Dim c As New DataGridViewImageColumn + c.Name = "open" : c.HeaderText = "open" + c.Image = My.Resources.wait : c.ImageLayout = DataGridViewImageCellLayout.Zoom + c.Width = 40 : c.DefaultCellStyle.Padding = New Padding(2) : c.DefaultCellStyle.BackColor = Color.White + c.DefaultCellStyle.Tag = "open" + .Columns.Add(c) + + End If + + For Each r As DataGridViewRow In .Rows + + If r.Cells("Param_value").Value IsNot DBNull.Value AndAlso r.Cells("Param_value").Value.ToString.StartsWith("\\") Then + DirectCast(r.Cells("open"), DataGridViewImageCell).Value = My.Resources.stift + Else + DirectCast(r.Cells("open"), DataGridViewImageCell).Value = My.Resources.del + End If + Next + + + End With + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + + End Sub + + Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnSave.Click + + If DataGridView.Columns.Count = 0 Or DataGridView.SelectedRows.Count = 0 Then 'alles gelöscht oder markierte Zeile gelöscht + DatenarchivBind.updateBinding() + Exit Sub + End If + + If DataGridView.CurrentRow.Cells("Param_name").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("Param_value").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("Param_system").ToString <> "" AndAlso EditRow >= 0 Then + DatenarchivBind.updateBinding() + End If + + End Sub + + + Private Sub DataGridView_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles DataGridView.EditingControlShowing + EditRow = DataGridView.CurrentRow.Index + End Sub + + Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged + If EditRow >= 0 Then + Dim new_row As Integer = EditRow + EditRow = -1 + DataGridView.CurrentCell = DataGridView.Rows(new_row).Cells( + DataGridView.CurrentCell.ColumnIndex) + End If + End Sub + +End Class diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index 2cc9527..db9428f 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -636,9 +636,9 @@ Public Class frmMDMNachrichtenVerarbeitung '''''''''''' If PLOSE.SAVE() Then - End If - End If + + End If End Select cnt += 1 diff --git a/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.Designer.vb b/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.Designer.vb index 796e72b..854d04e 100644 --- a/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.Designer.vb +++ b/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.Designer.vb @@ -23,11 +23,15 @@ Partial Class frmRMCNachrichtenVerarbeitung Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAsfinag_NachrichtenVerabeitung)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmRMCNachrichtenVerarbeitung)) Me.btn = New System.Windows.Forms.Button() Me.pnl = New System.Windows.Forms.Panel() + Me.lblFTP = New System.Windows.Forms.Label() Me.lblTestsystem = New System.Windows.Forms.Label() Me.lblDatenCnt = New System.Windows.Forms.Label() + Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Label9 = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() Me.Label7 = New System.Windows.Forms.Label() @@ -38,10 +42,6 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.btnOK = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.dgvEinarbeitung = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnArt = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Column1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.lblFTP = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.dgvEinarbeitung, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -87,6 +87,16 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.pnl.Size = New System.Drawing.Size(456, 319) Me.pnl.TabIndex = 1 ' + 'lblFTP + ' + Me.lblFTP.AutoSize = True + Me.lblFTP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblFTP.ForeColor = System.Drawing.Color.Red + Me.lblFTP.Location = New System.Drawing.Point(121, 34) + Me.lblFTP.Name = "lblFTP" + Me.lblFTP.Size = New System.Drawing.Size(0, 13) + Me.lblFTP.TabIndex = 21 + ' 'lblTestsystem ' Me.lblTestsystem.AutoSize = True @@ -110,6 +120,35 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.lblDatenCnt.Text = "0" Me.lblDatenCnt.Visible = False ' + 'dgvEinarbeitung + ' + Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvEinarbeitung.AllowUserToAddRows = False + Me.dgvEinarbeitung.AllowUserToDeleteRows = False + Me.dgvEinarbeitung.AllowUserToOrderColumns = True + Me.dgvEinarbeitung.AllowUserToResizeColumns = False + Me.dgvEinarbeitung.AllowUserToResizeRows = False + Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White + Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1}) + Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164) + Me.dgvEinarbeitung.Name = "dgvEinarbeitung" + Me.dgvEinarbeitung.RowHeadersVisible = False + Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145) + Me.dgvEinarbeitung.TabIndex = 18 + ' + 'clmnArt + ' + Me.clmnArt.HeaderText = "Dateiname" + Me.clmnArt.Name = "clmnArt" + Me.clmnArt.Width = 150 + ' + 'Column1 + ' + Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.Column1.HeaderText = "Status" + Me.Column1.Name = "Column1" + ' 'Label9 ' Me.Label9.AutoSize = True @@ -197,9 +236,9 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.Location = New System.Drawing.Point(8, 8) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(231, 13) + Me.Label2.Size = New System.Drawing.Size(220, 13) Me.Label2.TabIndex = 8 - Me.Label2.Text = "Einarbeitung der Nachrichtendaten von Asfinag" + Me.Label2.Text = "Einarbeitung der Nachrichtendaten von RMC" ' 'Label1 ' @@ -211,46 +250,7 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.Label1.TabIndex = 8 Me.Label1.Text = "Einarbeitung:" ' - 'dgvEinarbeitung - ' - Me.dgvEinarbeitung.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvEinarbeitung.AllowUserToAddRows = False - Me.dgvEinarbeitung.AllowUserToDeleteRows = False - Me.dgvEinarbeitung.AllowUserToOrderColumns = True - Me.dgvEinarbeitung.AllowUserToResizeColumns = False - Me.dgvEinarbeitung.AllowUserToResizeRows = False - Me.dgvEinarbeitung.BackgroundColor = System.Drawing.Color.White - Me.dgvEinarbeitung.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvEinarbeitung.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnArt, Me.Column1}) - Me.dgvEinarbeitung.Location = New System.Drawing.Point(12, 164) - Me.dgvEinarbeitung.Name = "dgvEinarbeitung" - Me.dgvEinarbeitung.RowHeadersVisible = False - Me.dgvEinarbeitung.Size = New System.Drawing.Size(291, 145) - Me.dgvEinarbeitung.TabIndex = 18 - ' - 'clmnArt - ' - Me.clmnArt.HeaderText = "Dateiname" - Me.clmnArt.Name = "clmnArt" - Me.clmnArt.Width = 150 - ' - 'Column1 - ' - Me.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.Column1.HeaderText = "Status" - Me.Column1.Name = "Column1" - ' - 'lblFTP - ' - Me.lblFTP.AutoSize = True - Me.lblFTP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFTP.ForeColor = System.Drawing.Color.Red - Me.lblFTP.Location = New System.Drawing.Point(121, 34) - Me.lblFTP.Name = "lblFTP" - Me.lblFTP.Size = New System.Drawing.Size(0, 13) - Me.lblFTP.TabIndex = 21 - ' - 'frmAsfinag_NachrichtenVerabeitung + 'frmRMCNachrichtenVerarbeitung ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -258,7 +258,7 @@ Partial Class frmRMCNachrichtenVerarbeitung Me.Controls.Add(Me.pnl) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.Name = "frmAsfinag_NachrichtenVerabeitung" + Me.Name = "frmRMCNachrichtenVerarbeitung" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "DY NachrichtenVerarbeitung" Me.pnl.ResumeLayout(False) diff --git a/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.vb index 77ab8e6..4202466 100644 --- a/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmRMCNachrichtenVerarbeitung.vb @@ -1,7 +1,10 @@ Imports System.IO Imports System.Net +Imports System.Runtime.Remoting Imports System.Text +Imports System.Text.RegularExpressions Imports System.Xml +Imports DocumentFormat.OpenXml.Office2010.Excel Imports VERAG_PROG_ALLGEMEIN Public Class frmRMCNachrichtenVerarbeitung @@ -10,28 +13,32 @@ Public Class frmRMCNachrichtenVerarbeitung Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim allowClose = False Dim rmc As New cRMC + Dim programName As String Dim Dateiname = "" - Sub New() + Sub New(programName As String) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + Me.programName = programName ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub - Sub New(allowClose) 'autostart + Sub New(programName As String, allowClose As Boolean) 'autostart ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + Me.programName = programName Me.allowClose = allowClose ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub Private Sub frmDYNachrichtenVerarbeitung_Load(sender As Object, e As EventArgs) Handles Me.Load - rmc.initImportPfade() + rmc.initImportPfade(programName) + lblFTP.Text = programName For Each d In System.IO.Directory.GetFiles(rmc.VERARBEITUNG_PFAD) ListBox3.Items.Add(frmStartOptions.cut_file(d)) Me.Refresh() @@ -74,7 +81,7 @@ Public Class frmRMCNachrichtenVerarbeitung Dim cnt = 0 Try - DownloadFtpDirectory(rmc.API_STRING & "/"c & "out/", New NetworkCredential(rmc.API.Rows(0).Item("api_user").ToString, rmc.API.Rows(0).Item("api_pw").ToString), "", cnt, False) + DownloadFtpDirectory(rmc.API_STRING & "/", New NetworkCredential(rmc.API.Rows(0).Item("api_user").ToString, rmc.API.Rows(0).Item("api_password").ToString), "", cnt, False) Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -95,6 +102,7 @@ Public Class frmRMCNachrichtenVerarbeitung Using listResponse As FtpWebResponse = listRequest.GetResponse(), listStream As Stream = listResponse.GetResponseStream(), listReader As StreamReader = New StreamReader(listStream) + While Not listReader.EndOfStream lines.Add(listReader.ReadLine()) End While @@ -109,65 +117,57 @@ Public Class frmRMCNachrichtenVerarbeitung Dim localFilePath As String = Path.Combine(localPath, name) Dim fileUrl As String = url + name - If permissions(0) = "d" Then 'Ordner - If Not Directory.Exists(localFilePath) Then - Directory.CreateDirectory(localFilePath) - End If - DownloadFtpDirectory(fileUrl + "/", credentials, localFilePath, cnt, deleteAfterDownload) + If permissions(0) <> "d" Then 'in keine Unterorder suchen, nur die erste Ebene - Else + Dim downloadRequest As FtpWebRequest = WebRequest.Create(fileUrl) + downloadRequest.Method = WebRequestMethods.Ftp.DownloadFile + downloadRequest.Credentials = credentials - If True Then + Dim fileDateTmp As Date = ServerDateFile(credentials, fileUrl) - Dim downloadRequest As FtpWebRequest = WebRequest.Create(fileUrl) - downloadRequest.Method = WebRequestMethods.Ftp.DownloadFile - downloadRequest.Credentials = credentials + name = name.Replace(".csv", "_RGDAT_" & fileDateTmp.ToShortDateString & ".csv") - Dim fileDateTmp As Date = ServerDateFile(credentials, fileUrl) + Dim destFilenameTMP = rmc.VERARBEITUNG_PFAD & "." & If(IO.File.Exists(rmc.VERARBEITUNG_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) - name = name.Replace(".csv", "_RGDAT_" & fileDateTmp.ToShortDateString & ".csv") - - Dim destFilenameTMP = rmc.VERARBEITUNG_PFAD & "." & If(io.File.Exists(rmc.VERARBEITUNG_PFAD & "." & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) - - Using downloadResponse As FtpWebResponse = downloadRequest.GetResponse(), + Using downloadResponse As FtpWebResponse = downloadRequest.GetResponse(), sourceStream As Stream = downloadResponse.GetResponseStream(), targetStream As Stream = File.OpenWrite(destFilenameTMP) - Dim buffer As Byte() = New Byte(10240 - 1) {} - Dim read As Integer - Do - read = sourceStream.Read(buffer, 0, buffer.Length) - If read > 0 Then - targetStream.Write(buffer, 0, read) - End If - Loop While read > 0 - - sourceStream.Dispose() - targetStream.Dispose() - downloadResponse.Dispose() - - Dim destFilename = rmc.VERARBEITUNG_PFAD & If(io.File.Exists(rmc.VERARBEITUNG_PFAD & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) - - io.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen - - - Dim fi As FileInfo = New FileInfo(destFilename) - ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen - cnt += 1 - - - 'Datei nach download löschen - If deleteAfterDownload Then - Dim ftpReq As FtpWebRequest = WebRequest.Create(fileUrl) - ftpReq.Method = WebRequestMethods.Ftp.DeleteFile - ftpReq.Credentials = credentials - Dim ftpResp As FtpWebResponse = ftpReq.GetResponse - ftpResp.Close() + Dim buffer As Byte() = New Byte(10240 - 1) {} + Dim read As Integer + Do + read = sourceStream.Read(buffer, 0, buffer.Length) + If read > 0 Then + targetStream.Write(buffer, 0, read) End If + Loop While read > 0 - End Using - End If + sourceStream.Dispose() + targetStream.Dispose() + downloadResponse.Dispose() + + Dim destFilename = rmc.VERARBEITUNG_PFAD & If(IO.File.Exists(rmc.VERARBEITUNG_PFAD & name), name.Replace(".csv", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".csv", name) + + IO.File.Move(destFilenameTMP, destFilename) 'Datei umbenennen + + + Dim fi As FileInfo = New FileInfo(destFilename) + ListBox3.Items.Add(frmStartOptions.cut_file(fi.Name)) 'zur Liste hinzufügen + cnt += 1 + + + 'Datei nach download löschen + If deleteAfterDownload Then + Dim ftpReq As FtpWebRequest = WebRequest.Create(fileUrl) + ftpReq.Method = WebRequestMethods.Ftp.DeleteFile + ftpReq.Credentials = credentials + Dim ftpResp As FtpWebResponse = ftpReq.GetResponse + ftpResp.Close() + End If + + End Using End If + 'End If Next End Sub @@ -186,7 +186,7 @@ Public Class frmRMCNachrichtenVerarbeitung Return ServerDate Catch ex As WebException - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "PLOSE GET DATE FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "RMC GET DATE FILE: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) End Try Return ServerDate @@ -194,8 +194,6 @@ Public Class frmRMCNachrichtenVerarbeitung Sub DatenEinlesen() - Exit Sub 'under development - VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL If ListBox3.Items.Count = 0 Then @@ -216,8 +214,6 @@ Public Class frmRMCNachrichtenVerarbeitung Dim alreadyMoved = False - - Select Case i Case 1 '------------------------------------------ @@ -236,6 +232,7 @@ Public Class frmRMCNachrichtenVerarbeitung '------------------ PDF ------------------ '------------------------------------------ If fi.Extension.ToLower = ".pdf" Then + found = False If Not IO.Directory.Exists(rmc.ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(rmc.ZIEL_PFAD & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") @@ -243,10 +240,10 @@ Public Class frmRMCNachrichtenVerarbeitung 'File in Datenarchiv sichern: Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "RMC", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d)) - DS.uploadDataToDATENSERVER(d) - - 'DatenArchiv-Id in tblPLOSE_Inv_Data Tabelle eintragen (über PDF-Name) : - SQL.doSQL("Update [tblPLOSE_Inv_Data] SET [plInv_daId]='" & DS.da_id & "' where [plInv_PdfFileName] = '" & DS.da_name & "' and [plInv_Einlesedatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") + DS.uploadDataToDATENSERVER(d,,,,,, True) + If fi.Name.ToString.StartsWith("invoice_") Then + SQL.doSQL("Update [tblRMCImport] SET [rmc_daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL") + End If frmStartOptions.moveFile_DateBack(d, rmc.ZIEL_PFAD & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") @@ -256,9 +253,7 @@ Public Class frmRMCNachrichtenVerarbeitung 'Eintrag End If - Case 5 - frmStartOptions.moveFile_DateBack(d, rmc.ERROR_PFAD) - dsNichtErkannt += 1 + End Select If True Then @@ -305,145 +300,64 @@ Public Class frmRMCNachrichtenVerarbeitung Function readRMC(d As String) As String Try - Dim KdnR = "" - - Dim plose_RechnungsJahr = "" - Dim plose_RechnungsLieferantCode = "" - Dim plose_RechnungsNr = "" - - Dim plose_RechnungsDat = Nothing - Dim plose_Lieferant = Nothing - Dim fi As FileInfo = New FileInfo(d) - If fi.Name.Length > 8 Then - ''Dim plose_RechnungsNr = fi.Name.Substring(0, 8) + Dim kdNr = "" - 'plose_RechnungsJahr = fi.Name.Substring(0, 2) - 'plose_RechnungsLieferantCode = fi.Name.Substring(2, 1) - '' plose_RechnungsNr = fi.Name.Substring(3, 5) + Dim filetimestamp = Regex.Replace(fi.Name, "[^\d]", "") 'entferne alle nicht numerischen Werte! + Dim fileNr = filetimestamp.Substring(0, IIf(filetimestamp.Length > 8, filetimestamp.Length - 8, filetimestamp.Length)) + Dim fileType = IIf(fi.Name.ToLower.Contains("nto"), "netto", "brutto") + + Dim dt As New DataTable + dt.Columns.Add("KundenNr", GetType(String)) + dt.Columns.Add("Kunde", GetType(String)) + dt.Columns.Add("UID", GetType(String)) + Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(d, Encoding.GetEncoding(1252)) - End If - - Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(d, Encoding.UTF8) MyReader.TextFieldType = FileIO.FieldType.Delimited MyReader.SetDelimiters(";") Dim currentRow As String() + + Dim cnt = 0 - If True Then + Dim firstLine = True - While Not MyReader.EndOfData - Try + While Not MyReader.EndOfData + Try - currentRow = MyReader.ReadFields() - - If True Then 'fi.Name.Length > 8 Then - - - Select Case currentRow(0) - Case "TR1" - 'RECHNUGNSDATUM - If currentRow.Length > 1 AndAlso currentRow(1).ToString.Length = 8 Then - Dim datumParse = DateTime.ParseExact(currentRow(1), "yyyyMMdd", Nothing) - plose_RechnungsDat = datumParse 'Rechnungsdatum aus TR1 Datensatz, überschreibt den Wert aus der Dateierstellung - End If - 'RECHNUGNSNR - If currentRow.Length > 2 Then 'AndAlso currentRow(1).ToString.Length = 8 Then - plose_RechnungsNr = SQL.isleernothing(currentRow(2)) 'Rechnungsdatum aus TR1 Datensatz, überschreibt den Wert aus der Dateierstellung - End If - - Case "TR5" - If currentRow.Length > 24 AndAlso currentRow(12) <> "839160" Then 'KDNR <> VERAG --> Die Kosten bleiben uns - - Dim RMC As New VERAG_PROG_ALLGEMEIN.cRMC - - 'PLOSE.plose_Dateiname = fi.Name - 'PLOSE.plose_RechnungsNr = plose_RechnungsNr - 'PLOSE.plose_Lieferant = plose_Lieferant - 'PLOSE.plose_LieferantCode = plose_RechnungsLieferantCode - 'PLOSE.plose_RechnungsJahr = plose_RechnungsJahr - 'If plose_RechnungsDat IsNot Nothing Then PLOSE.plose_RechnungsDatum = plose_RechnungsDat - 'PLOSE.plose_Datensatztyp = SQL.isleernothing(currentRow(0)) - 'PLOSE.plose_KodexMautTankstelle = SQL.isleernothing(currentRow(1)) - 'PLOSE.plose_BeschreibungMautTankstelle = SQL.isleernothing(currentRow(2)) - 'PLOSE.plose_KodexEinfahrt = SQL.isleernothing(currentRow(3)) - 'PLOSE.plose_BeschreibungEinfahrt = SQL.isleernothing(currentRow(4)) - 'PLOSE.plose_KodexAusfahrt = SQL.isleernothing(currentRow(5)) - 'PLOSE.plose_BeschreibungAusfahrt = SQL.isleernothing(currentRow(6)) - 'PLOSE.plose_Kartenkodex = SQL.isleernothing(currentRow(7)) - 'PLOSE.plose_Kontonummer = SQL.isleernothing(currentRow(8)) - 'PLOSE.plose_NummerKarteGeraet = SQL.isleernothing(currentRow(9)) - 'PLOSE.plose_Kennzeichen = SQL.isleernothing(currentRow(10)) - 'PLOSE.plose_InterneNrFahrzeug = SQL.isleernothing(currentRow(11)) - 'PLOSE.plose_POLSEKundennummer = SQL.isleernothing(currentRow(12)) - 'PLOSE.plose_Firmenname = SQL.isleernothing(currentRow(13)) - 'PLOSE.plose_DatumTransaktion = SQL.isleernothingDateFormatstring(currentRow(14)) - 'PLOSE.plose_Produktbeschreibung = SQL.isleernothing(currentRow(15)) - 'PLOSE.plose_Menge = SQL.isNullNothingDbl(currentRow(16)) - 'PLOSE.plose_Preis = SQL.isNullNothingDbl(currentRow(17)) - 'PLOSE.Einheitsrabatt = SQL.isleernothing(currentRow(18)) - 'PLOSE.plose_NettobetragTransaktion = SQL.isNullNothingDbl(currentRow(19)) - 'PLOSE.plose_MWSTBetrag = SQL.isNullNothingDbl(currentRow(20)) - 'PLOSE.plose_BruttobetragTransaktion = SQL.isNullNothingDbl(currentRow(21)) - 'PLOSE.plose_NettobetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(22)) - 'PLOSE.plose_MWSTBetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(23)) - 'PLOSE.plose_BruttobetragWaehrungAbbuchung = SQL.isNullNothingDbl(currentRow(24)) - 'PLOSE.plose_WaehrungLandDiesntleistung = SQL.isleernothing(currentRow(25)) - 'PLOSE.plose_WaehrungAbbuchung = SQL.isleernothing(currentRow(26)) - 'PLOSE.plose_DokumentNrQuittungUhrzeit = SQL.isleernothing(currentRow(27)) - 'PLOSE.plose_ArtTransaktion = SQL.isleernothing(currentRow(28)) - 'PLOSE.plose_Fahrzeugklasse = SQL.isleernothing(currentRow(29)) - 'PLOSE.plose_KlassenidentifikationEURO = SQL.isleernothing(currentRow(30)) - 'PLOSE.plose_ProduktbeschreibungShort = SQL.isleernothing(currentRow(31)) - 'PLOSE.plose_DokumentNrQuittungUhrzeit = SQL.isleernothing(currentRow(32)) - 'PLOSE.plose_Geraetetyp = SQL.isleernothing(currentRow(33)) - 'PLOSE.plose_ProduktCode = SQL.isleernothing(currentRow(34)) - 'PLOSE.plose_ReferenzenBuchungMaut = SQL.isleernothing(currentRow(35)) - - - If RMC.SAVE() Then - - End If - - End If - End Select - - cnt += 1 + currentRow = MyReader.ReadFields() + If firstLine Then + If SQL.isleernothing(currentRow(0)) = "KundenNr" Then + firstLine = False + Else + createRMC(fi, fileNr, filetimestamp, currentRow, fileType, kdNr, cnt, dt) End If + Else + createRMC(fi, fileNr, filetimestamp, currentRow, fileType, kdNr, cnt, dt) - 'For Each currentField In currentRow - 'Next - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - End While + End If - - 'Label30.Text = (cnt + 1) & " / " & LineCount - 'Label31.Visible = True - readRMC = "Zeilen: " & cnt - Else - MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") - End If + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) + End Try + End While + readRMC = "Zeilen: " & cnt End Using + addDGVEinarbeitung("RMC: Detail" & kdNr, readRMC) + If dt.Rows.Count > 0 Then + Dim filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt,,,,, False,) + If filepath <> "" Then + Dim anhenge As New List(Of String) + anhenge.Add(filepath) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("juricevic@verag.ag", "Wölfl-UIDNr", "Im Anhang die zu prüfenden Kunden von WÖLFL " & vbNewLine & vbNewLine & "*Automatic generated e-mail*",,,,, "d.breimaier@verag.ag", anhenge) + End If - - Try - ' System.IO.File.Delete(p) - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - End Try - - addDGVEinarbeitung("PLOSE: Detail" & KdnR, readRMC) - - ' End Using - - 'End If + End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) @@ -452,108 +366,6 @@ Public Class frmRMCNachrichtenVerarbeitung End Try End Function - - 'Function readPLOSE_INVData(d As String) As String - ' Try - ' Dim cnt = 0 - ' readPLOSE_INVData = "" - - - ' Using MyReader As New Microsoft.VisualBasic.FileIO.TextFieldParser(d, Encoding.UTF8) - ' MyReader.TextFieldType = FileIO.FieldType.Delimited - ' MyReader.SetDelimiters(";") - ' Dim currentRow As String() - - - ' Dim fi As FileInfo = New FileInfo(d) - - ' While Not MyReader.EndOfData - ' Try - ' currentRow = MyReader.ReadFields() - - ' If currentRow(0) <> "PloseCode" Then ' Header - ' If currentRow.Length >= 15 Then - ' Dim PLOSE_INV As New MDM_Worker.cPLOSE_Inv_Data - ' ' MsgBox(SQL.isleernothingDateFormatstring(currentRow(7))) - ' ' MsgBox(currentRow(7)) - ' PLOSE_INV.plInv_SupplierRechnungsDatum = SQL.isleernothingDateFormatstring(currentRow(7)) - ' ' MsgBox(PLOSE_INV.plInv_SupplierRechnungsDatum) - ' PLOSE_INV.plInv_SupplierRechnungsNr = SQL.isleernothing(currentRow(8)) - ' PLOSE_INV.plInv_SupplierCountry = SQL.isleernothing(currentRow(6)) - ' PLOSE_INV.plInv_Lieferant = SQL.isleernothing(currentRow(4)) - ' PLOSE_INV.plInv_LieferantCode = SQL.isleernothing(currentRow(3)) - ' PLOSE_INV.plInv_LieferantUID = SQL.isleernothing(currentRow(5)) - ' 'PLOSE_INV.plInv_RechnungsJahr = SQL.isleernothing(currentRow(7)) --> JAHR - ' PLOSE_INV.plInv_PdfFileName = SQL.isleernothing(currentRow(14)) - ' If If(PLOSE_INV.plInv_PdfFileName, "") <> "" Then - ' If Not PLOSE_INV.plInv_PdfFileName.ToString.ToLower.EndsWith(".pdf") Then PLOSE_INV.plInv_PdfFileName += ".pdf" ' Falls Endung nciht .pdf --> anfügen - ' End If - ' PLOSE_INV.plInv_Einlesedatum = Now.ToShortDateString - ' PLOSE_INV.plInv_Datensatztyp = "PDF" - ' PLOSE_INV.plInv_PLOSEKundennummer = SQL.isleernothing(currentRow(0)) - ' PLOSE_INV.plInv_Firmenname = SQL.isleernothing(currentRow(1)) - ' ' PLOSE_INV.plInv_DatumTransaktion = SQL.isleernothing(currentRow(0)) - ' ' PLOSE_INV.plInv_Produktbeschreibung = SQL.isleernothing(currentRow(0)) - ' PLOSE_INV.plInv_Services = SQL.isleernothing(currentRow(13)) - - ' PLOSE_INV.plInv_Nettobetrag = CDbl(CDbl(SQL.isNullReturnValue(currentRow(9), 0).replace(".", ",")) + CDbl(SQL.isNullReturnValue(currentRow(11), 0).replace(".", ","))) - ' PLOSE_INV.plInv_MWSTBetrag = CDbl(SQL.isNullReturnValue(currentRow(10), 0).replace(".", ",")) - ' PLOSE_INV.plInv_Bruttobetrag = CDbl(SQL.isNullReturnValue(currentRow(12), 0).replace(".", ",")) - - ' ' [plInv_daId] - - ' 'If If(PLOSE_INV.plInv_PdfFileName, "") <> "" Then 'And PLOSE_INV.plInv_daId Is Nothing Then - ' ' PLOSE_INV.plInv_daId = SQL.getValueTxtBySql("SELECT TOP (1) [da_id] FROM [tblDatenarchiv] where da_kategorie = 'MDM' AND da_ordner='MDM_DATEN' and da_name='" & PLOSE_INV.plInv_PdfFileName & "' order by da_id desc", "FMZOLL",,, Nothing) - ' 'End If - - - ' PLOSE_INV.plInv_Dateiname = fi.Name - - ' '''''''''''' - ' If PLOSE_INV.SAVE() Then - - ' ' UPDATE tblPLOSE_Details: - ' SQL.doSQL("UPDATE [tblPLOSE_Details] SET [plose_plInvId] ='" & PLOSE_INV.plInv_Id & "' where plose_SupplierRechnungsNr='" & PLOSE_INV.plInv_SupplierRechnungsNr & "' AND plose_SupplierRechnungsDatum='" & PLOSE_INV.plInv_SupplierRechnungsDatum & "'", "FMZOLL") - ' End If - - ' End If - ' End If - - ' cnt += 1 - - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' End Try - ' End While - - - ' readPLOSE_INVData = "Zeilen: " & cnt - - ' End Using - - - - - ' Try - ' ' System.IO.File.Delete(p) - ' Catch ex As Exception - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - ' End Try - - ' addDGVEinarbeitung("PLOSE: INV_DATA (" & cnt & ")", readPLOSE_INVData) - - ' ' End Using - - ' 'End If - - ' 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_INVData = "" - ' End Try - 'End Function - - Private Sub dgvEinarbeitung_SelectionChanged(sender As Object, e As EventArgs) Handles dgvEinarbeitung.SelectionChanged dgvEinarbeitung.ClearSelection() @@ -573,5 +385,46 @@ Public Class frmRMCNachrichtenVerarbeitung End If End Sub + Private Sub createRMC(fi As FileInfo, filenr As Integer, filetimestamp As String, currentRow As String(), fileType As String, ByRef kdNr As String, cnt As Integer, dt As DataTable) + + Dim RMC As New VERAG_PROG_ALLGEMEIN.cRMC + RMC.rmc_file = fi.Name + RMC.rmc_version = filetimestamp + RMC.rmc_fileNr = filenr + RMC.rmc_kdNr = SQL.isleernothing(currentRow(0)) + RMC.rmc_kdName = SQL.isleernothing(currentRow(1)) + RMC.rmc_fibuNr = SQL.isleernothing(currentRow(2)) + RMC.rmc_UID = SQL.isleernothing(currentRow(3)) + RMC.rmc_landKZ = SQL.isleernothing(currentRow(4)) + RMC.rmc_landBezeichnung = SQL.isleernothing(currentRow(5)) + RMC.rmc_reDatum = SQL.isleernothing(currentRow(6)) + RMC.rmc_sammelReNr = SQL.isleernothing(currentRow(7)) + RMC.rmc_reNr = SQL.isleernothing(currentRow(8)) + RMC.rmc_betragNetto = SQL.isleernothing(currentRow(9)) + RMC.rmc_betragMWST = SQL.isleernothing(currentRow(10)) + RMC.rmc_betragBrutto = SQL.isleernothing(currentRow(11)) + RMC.rmc_waehrung = SQL.isleernothing(currentRow(12)) + RMC.rmc_euroBrutto = SQL.isleernothing(currentRow(13)) + RMC.rmc_pdfFileName = "invoice_" & RMC.rmc_kdNr & "_" & filenr & "_" & RMC.rmc_sammelReNr & IIf(fileType = "netto", "_nto_e_verag.pdf", "_bto_e_verag.pdf") + + If RMC.SAVE() Then + If kdNr <> RMC.rmc_kdNr Then + Dim adress As New VERAG_PROG_ALLGEMEIN.cAdressen(RMC.rmc_UID, RMC.rmc_kdNr) + If Not adress.hasEntry Then + Dim R As DataRow = dt.NewRow + R("KundenNr") = RMC.rmc_kdNr + R("Kunde") = RMC.rmc_kdName + R("UID") = RMC.rmc_UID + dt.Rows.Add(R) + End If + 'If adress IsNot Nothing Then adress.UpdateSpecialField("WölflKundenNr", RMC.rmc_kdNr) -> nicht updaten, sondern nur info ausgeben! + End If + + kdNr = RMC.rmc_kdNr + cnt += 1 + End If + + End Sub + End Class diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 6f259bd..0d48416 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -28,7 +28,6 @@ Partial Class frmStartOptions Me.buchungenAMBAR = New System.Windows.Forms.Button() Me.PictureBox23 = New System.Windows.Forms.PictureBox() Me.Label27 = New System.Windows.Forms.Label() - Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel51 = New System.Windows.Forms.LinkLabel() Me.PictureBox22 = New System.Windows.Forms.PictureBox() Me.Button22 = New System.Windows.Forms.Button() @@ -46,20 +45,16 @@ Partial Class frmStartOptions Me.Label20 = New System.Windows.Forms.Label() Me.Label19 = New System.Windows.Forms.Label() Me.Label18 = New System.Windows.Forms.Label() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel36 = New System.Windows.Forms.LinkLabel() Me.Button13 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() Me.cbxSyskaWdh = New System.Windows.Forms.CheckBox() - Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button10 = New System.Windows.Forms.Button() Me.piceZollAnh = New System.Windows.Forms.PictureBox() - Me.txtEZOLLAnhDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.lblEZOLLDat = New System.Windows.Forms.LinkLabel() Me.Button6 = New System.Windows.Forms.Button() Me.CheckBox6 = New System.Windows.Forms.CheckBox() Me.Button7 = New System.Windows.Forms.Button() - Me.cboSYSKAFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.CheckBox7 = New System.Windows.Forms.CheckBox() Me.Label16 = New System.Windows.Forms.Label() Me.LinkLabel33 = New System.Windows.Forms.LinkLabel() @@ -68,7 +63,6 @@ Partial Class frmStartOptions Me.Button4 = New System.Windows.Forms.Button() Me.CheckBox5 = New System.Windows.Forms.CheckBox() Me.Button3 = New System.Windows.Forms.Button() - Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.CheckBox4 = New System.Windows.Forms.CheckBox() Me.Label13 = New System.Windows.Forms.Label() Me.CheckBox3 = New System.Windows.Forms.CheckBox() @@ -145,15 +139,6 @@ Partial Class frmStartOptions Me.Label6 = New System.Windows.Forms.Label() Me.PictureBox15 = New System.Windows.Forms.PictureBox() Me.PictureBox14 = New System.Windows.Forms.PictureBox() - Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) - Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtVRGOut_AbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() - Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.LinkLabel50 = New System.Windows.Forms.LinkLabel() Me.Label26 = New System.Windows.Forms.Label() @@ -169,6 +154,10 @@ 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.LinkLabel52 = New System.Windows.Forms.LinkLabel() + Me.Label30 = New System.Windows.Forms.Label() + Me.Label29 = New System.Windows.Forms.Label() + Me.Label28 = New System.Windows.Forms.Label() Me.LinkLabel49 = New System.Windows.Forms.LinkLabel() Me.Label25 = New System.Windows.Forms.Label() Me.cbxTestFTP = New System.Windows.Forms.CheckBox() @@ -184,8 +173,6 @@ Partial Class frmStartOptions Me.LinkLabel43 = New System.Windows.Forms.LinkLabel() Me.LinkLabel44 = New System.Windows.Forms.LinkLabel() Me.Label24 = New System.Windows.Forms.Label() - Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.LinkLabel25 = New System.Windows.Forms.LinkLabel() Me.CheckBox1 = New System.Windows.Forms.CheckBox() @@ -193,7 +180,6 @@ Partial Class frmStartOptions Me.cbxKd = New System.Windows.Forms.CheckBox() Me.Button9 = New System.Windows.Forms.Button() Me.Label3 = New System.Windows.Forms.Label() - Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.PictureBox12 = New System.Windows.Forms.PictureBox() Me.LinkLabel20 = New System.Windows.Forms.LinkLabel() Me.PictureBox11 = New System.Windows.Forms.PictureBox() @@ -209,12 +195,27 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() - Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button21 = New System.Windows.Forms.Button() - Me.Label28 = New System.Windows.Forms.Label() - Me.Label29 = New System.Windows.Forms.Label() - Me.Label30 = New System.Windows.Forms.Label() - Me.LinkLabel52 = New System.Windows.Forms.LinkLabel() + Me.MyTextBox3 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtSyskaWdhDateiname = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtEZOLLAnhDat = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cboSYSKAFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboBMDUnispedFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.dgvMRN = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.clmnMRN = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.txtVRGOut_MRN = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVRGOut_FilialenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtVRGOut_AbfertigungsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox2 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOutEZA_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtVRGOut_BezugsNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.cbxRMC = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.txtTBLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtTWLNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.MyTextBox1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.pnl.SuspendLayout() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() @@ -238,7 +239,6 @@ Partial Class frmStartOptions Me.TabPage2.SuspendLayout() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage3.SuspendLayout() Me.TabPage4.SuspendLayout() CType(Me.PictureBox21, System.ComponentModel.ISupportInitialize).BeginInit() @@ -248,6 +248,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'pnl @@ -364,29 +365,6 @@ Partial Class frmStartOptions Me.Label27.TabIndex = 87 Me.Label27.Text = "älter als Tage" ' - 'MyTextBox3 - ' - Me.MyTextBox3._DateTimeOnly = False - Me.MyTextBox3._numbersOnly = True - Me.MyTextBox3._numbersOnlyKommastellen = "" - Me.MyTextBox3._numbersOnlyTrennzeichen = True - Me.MyTextBox3._Prozent = False - Me.MyTextBox3._ShortDateNew = False - Me.MyTextBox3._ShortDateOnly = False - Me.MyTextBox3._TimeOnly = False - Me.MyTextBox3._TimeOnly_Seconds = False - Me.MyTextBox3._value = "" - Me.MyTextBox3._Waehrung = False - Me.MyTextBox3._WaehrungZeichen = True - Me.MyTextBox3.ForeColor = System.Drawing.Color.Red - Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) - Me.MyTextBox3.MaxLineLength = -1 - Me.MyTextBox3.MaxLines_Warning = "" - Me.MyTextBox3.MaxLines_Warning_Label = Nothing - Me.MyTextBox3.Name = "MyTextBox3" - Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox3.TabIndex = 86 - ' 'LinkLabel51 ' Me.LinkLabel51.AutoSize = True @@ -576,29 +554,6 @@ Partial Class frmStartOptions Me.Label18.TabIndex = 64 Me.Label18.Text = "Max" ' - 'MyTextBox2 - ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = True - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._numbersOnlyTrennzeichen = True - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._TimeOnly_Seconds = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Red - Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox2.TabIndex = 63 - ' 'LinkLabel36 ' Me.LinkLabel36.AutoSize = True @@ -645,30 +600,6 @@ Partial Class frmStartOptions Me.cbxSyskaWdh.Text = "Buchungen wiederh." Me.cbxSyskaWdh.UseVisualStyleBackColor = True ' - 'txtSyskaWdhDateiname - ' - Me.txtSyskaWdhDateiname._DateTimeOnly = False - Me.txtSyskaWdhDateiname._numbersOnly = False - Me.txtSyskaWdhDateiname._numbersOnlyKommastellen = "" - Me.txtSyskaWdhDateiname._numbersOnlyTrennzeichen = True - Me.txtSyskaWdhDateiname._Prozent = False - Me.txtSyskaWdhDateiname._ShortDateNew = False - Me.txtSyskaWdhDateiname._ShortDateOnly = False - Me.txtSyskaWdhDateiname._TimeOnly = False - Me.txtSyskaWdhDateiname._TimeOnly_Seconds = False - Me.txtSyskaWdhDateiname._value = "" - Me.txtSyskaWdhDateiname._Waehrung = False - Me.txtSyskaWdhDateiname._WaehrungZeichen = True - Me.txtSyskaWdhDateiname.ForeColor = System.Drawing.Color.Black - Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(692, 318) - Me.txtSyskaWdhDateiname.MaxLength = 50 - Me.txtSyskaWdhDateiname.MaxLineLength = -1 - Me.txtSyskaWdhDateiname.MaxLines_Warning = "" - Me.txtSyskaWdhDateiname.MaxLines_Warning_Label = Nothing - Me.txtSyskaWdhDateiname.Name = "txtSyskaWdhDateiname" - Me.txtSyskaWdhDateiname.Size = New System.Drawing.Size(136, 20) - Me.txtSyskaWdhDateiname.TabIndex = 58 - ' 'Button10 ' Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -693,30 +624,6 @@ Partial Class frmStartOptions Me.piceZollAnh.TabStop = False Me.piceZollAnh.Visible = False ' - 'txtEZOLLAnhDat - ' - Me.txtEZOLLAnhDat._DateTimeOnly = False - Me.txtEZOLLAnhDat._numbersOnly = False - Me.txtEZOLLAnhDat._numbersOnlyKommastellen = "" - Me.txtEZOLLAnhDat._numbersOnlyTrennzeichen = True - Me.txtEZOLLAnhDat._Prozent = False - Me.txtEZOLLAnhDat._ShortDateNew = True - Me.txtEZOLLAnhDat._ShortDateOnly = False - Me.txtEZOLLAnhDat._TimeOnly = False - Me.txtEZOLLAnhDat._TimeOnly_Seconds = False - Me.txtEZOLLAnhDat._value = "" - Me.txtEZOLLAnhDat._Waehrung = False - Me.txtEZOLLAnhDat._WaehrungZeichen = True - Me.txtEZOLLAnhDat.ForeColor = System.Drawing.Color.Black - Me.txtEZOLLAnhDat.Location = New System.Drawing.Point(408, 190) - Me.txtEZOLLAnhDat.MaxLength = 10 - Me.txtEZOLLAnhDat.MaxLineLength = -1 - Me.txtEZOLLAnhDat.MaxLines_Warning = "" - Me.txtEZOLLAnhDat.MaxLines_Warning_Label = Nothing - Me.txtEZOLLAnhDat.Name = "txtEZOLLAnhDat" - Me.txtEZOLLAnhDat.Size = New System.Drawing.Size(87, 20) - Me.txtEZOLLAnhDat.TabIndex = 55 - ' 'lblEZOLLDat ' Me.lblEZOLLDat.AutoSize = True @@ -765,17 +672,6 @@ Partial Class frmStartOptions Me.Button7.Text = "Buchungen --> Syska" Me.Button7.UseVisualStyleBackColor = True ' - 'cboSYSKAFirma - ' - Me.cboSYSKAFirma._allowedValuesFreiText = Nothing - Me.cboSYSKAFirma._allowFreiText = False - Me.cboSYSKAFirma._value = "" - Me.cboSYSKAFirma.FormattingEnabled = True - Me.cboSYSKAFirma.Location = New System.Drawing.Point(564, 299) - Me.cboSYSKAFirma.Name = "cboSYSKAFirma" - Me.cboSYSKAFirma.Size = New System.Drawing.Size(129, 21) - Me.cboSYSKAFirma.TabIndex = 51 - ' 'CheckBox7 ' Me.CheckBox7.AutoSize = True @@ -868,17 +764,6 @@ Partial Class frmStartOptions Me.Button3.Text = "Buchungen --> BMD" Me.Button3.UseVisualStyleBackColor = True ' - 'cboBMDUnispedFirma - ' - Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing - Me.cboBMDUnispedFirma._allowFreiText = False - Me.cboBMDUnispedFirma._value = "" - Me.cboBMDUnispedFirma.FormattingEnabled = True - Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(268, 276) - Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" - Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(124, 21) - Me.cboBMDUnispedFirma.TabIndex = 42 - ' 'CheckBox4 ' Me.CheckBox4.AutoSize = True @@ -1798,165 +1683,6 @@ Partial Class frmStartOptions Me.PictureBox14.TabStop = False Me.PictureBox14.Visible = False ' - 'dgvMRN - ' - Me.dgvMRN.AKTUALISIERUNGS_INTERVALL = -1 - Me.dgvMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvMRN.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMRN}) - Me.dgvMRN.Location = New System.Drawing.Point(637, 63) - Me.dgvMRN.Name = "dgvMRN" - Me.dgvMRN.RowHeadersWidth = 62 - Me.dgvMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvMRN.Size = New System.Drawing.Size(207, 134) - Me.dgvMRN.TabIndex = 75 - ' - 'clmnMRN - ' - Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.clmnMRN.HeaderText = "MRN" - Me.clmnMRN.MinimumWidth = 8 - Me.clmnMRN.Name = "clmnMRN" - ' - 'txtVRGOut_MRN - ' - Me.txtVRGOut_MRN._DateTimeOnly = False - Me.txtVRGOut_MRN._numbersOnly = False - Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" - Me.txtVRGOut_MRN._numbersOnlyTrennzeichen = True - Me.txtVRGOut_MRN._Prozent = False - Me.txtVRGOut_MRN._ShortDateNew = False - Me.txtVRGOut_MRN._ShortDateOnly = False - Me.txtVRGOut_MRN._TimeOnly = False - Me.txtVRGOut_MRN._TimeOnly_Seconds = False - Me.txtVRGOut_MRN._value = "" - Me.txtVRGOut_MRN._Waehrung = False - Me.txtVRGOut_MRN._WaehrungZeichen = False - Me.txtVRGOut_MRN.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_MRN.Location = New System.Drawing.Point(359, 84) - Me.txtVRGOut_MRN.MaxLineLength = -1 - Me.txtVRGOut_MRN.MaxLines_Warning = "" - Me.txtVRGOut_MRN.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_MRN.Name = "txtVRGOut_MRN" - Me.txtVRGOut_MRN.Size = New System.Drawing.Size(153, 20) - Me.txtVRGOut_MRN.TabIndex = 73 - ' - 'txtVRGOut_FilialenNr - ' - Me.txtVRGOut_FilialenNr._DateTimeOnly = False - Me.txtVRGOut_FilialenNr._numbersOnly = False - Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_FilialenNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_FilialenNr._Prozent = False - Me.txtVRGOut_FilialenNr._ShortDateNew = False - Me.txtVRGOut_FilialenNr._ShortDateOnly = False - Me.txtVRGOut_FilialenNr._TimeOnly = False - Me.txtVRGOut_FilialenNr._TimeOnly_Seconds = False - Me.txtVRGOut_FilialenNr._value = "" - Me.txtVRGOut_FilialenNr._Waehrung = False - Me.txtVRGOut_FilialenNr._WaehrungZeichen = False - Me.txtVRGOut_FilialenNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_FilialenNr.Location = New System.Drawing.Point(398, 176) - Me.txtVRGOut_FilialenNr.MaxLineLength = -1 - Me.txtVRGOut_FilialenNr.MaxLines_Warning = "" - Me.txtVRGOut_FilialenNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_FilialenNr.Multiline = True - Me.txtVRGOut_FilialenNr.Name = "txtVRGOut_FilialenNr" - Me.txtVRGOut_FilialenNr.Size = New System.Drawing.Size(56, 21) - Me.txtVRGOut_FilialenNr.TabIndex = 71 - ' - 'txtVRGOut_AbfertigungsNr - ' - Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False - Me.txtVRGOut_AbfertigungsNr._numbersOnly = False - Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_AbfertigungsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_AbfertigungsNr._Prozent = False - Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False - Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False - Me.txtVRGOut_AbfertigungsNr._TimeOnly = False - Me.txtVRGOut_AbfertigungsNr._TimeOnly_Seconds = False - Me.txtVRGOut_AbfertigungsNr._value = "" - Me.txtVRGOut_AbfertigungsNr._Waehrung = False - Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False - Me.txtVRGOut_AbfertigungsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_AbfertigungsNr.Location = New System.Drawing.Point(453, 176) - Me.txtVRGOut_AbfertigungsNr.MaxLineLength = -1 - Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning = "" - Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_AbfertigungsNr.Multiline = True - Me.txtVRGOut_AbfertigungsNr.Name = "txtVRGOut_AbfertigungsNr" - Me.txtVRGOut_AbfertigungsNr.Size = New System.Drawing.Size(137, 21) - Me.txtVRGOut_AbfertigungsNr.TabIndex = 70 - ' - 'MyComboBox2 - ' - Me.MyComboBox2._allowedValuesFreiText = Nothing - Me.MyComboBox2._allowFreiText = False - Me.MyComboBox2._value = "" - Me.MyComboBox2.FormattingEnabled = True - Me.MyComboBox2.Location = New System.Drawing.Point(298, 252) - Me.MyComboBox2.Name = "MyComboBox2" - Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox2.TabIndex = 64 - ' - 'txtVRGOutEZA_BezugsNr - ' - Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnly = False - Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOutEZA_BezugsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOutEZA_BezugsNr._Prozent = False - Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False - Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False - Me.txtVRGOutEZA_BezugsNr._TimeOnly = False - Me.txtVRGOutEZA_BezugsNr._TimeOnly_Seconds = False - Me.txtVRGOutEZA_BezugsNr._value = "" - Me.txtVRGOutEZA_BezugsNr._Waehrung = False - Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False - Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 252) - Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOutEZA_BezugsNr.Multiline = True - Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" - Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(153, 21) - Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 - ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) - Me.MyComboBox1.TabIndex = 4 - ' - 'txtVRGOut_BezugsNr - ' - Me.txtVRGOut_BezugsNr._DateTimeOnly = False - Me.txtVRGOut_BezugsNr._numbersOnly = False - Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" - Me.txtVRGOut_BezugsNr._numbersOnlyTrennzeichen = True - Me.txtVRGOut_BezugsNr._Prozent = False - Me.txtVRGOut_BezugsNr._ShortDateNew = False - Me.txtVRGOut_BezugsNr._ShortDateOnly = False - Me.txtVRGOut_BezugsNr._TimeOnly = False - Me.txtVRGOut_BezugsNr._TimeOnly_Seconds = False - Me.txtVRGOut_BezugsNr._value = "" - Me.txtVRGOut_BezugsNr._Waehrung = False - Me.txtVRGOut_BezugsNr._WaehrungZeichen = False - Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red - Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) - Me.txtVRGOut_BezugsNr.MaxLineLength = -1 - Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" - Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing - Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" - Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) - Me.txtVRGOut_BezugsNr.TabIndex = 5 - ' 'TabPage3 ' Me.TabPage3.Controls.Add(Me.LinkLabel50) @@ -2117,6 +1843,7 @@ Partial Class frmStartOptions ' 'TabPage4 ' + Me.TabPage4.Controls.Add(Me.cbxRMC) Me.TabPage4.Controls.Add(Me.LinkLabel52) Me.TabPage4.Controls.Add(Me.Label30) Me.TabPage4.Controls.Add(Me.Label29) @@ -2145,6 +1872,49 @@ Partial Class frmStartOptions Me.TabPage4.Text = "VERAG 360" Me.TabPage4.UseVisualStyleBackColor = True ' + 'LinkLabel52 + ' + Me.LinkLabel52.AutoSize = True + Me.LinkLabel52.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.LinkLabel52.Location = New System.Drawing.Point(238, 111) + Me.LinkLabel52.Name = "LinkLabel52" + Me.LinkLabel52.Size = New System.Drawing.Size(109, 13) + Me.LinkLabel52.TabIndex = 84 + Me.LinkLabel52.TabStop = True + Me.LinkLabel52.Text = "CSV+PDF importieren" + ' + 'Label30 + ' + Me.Label30.AutoSize = True + Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label30.Location = New System.Drawing.Point(238, 87) + Me.Label30.Name = "Label30" + Me.Label30.Size = New System.Drawing.Size(42, 13) + Me.Label30.TabIndex = 83 + Me.Label30.Text = "Import" + ' + 'Label29 + ' + Me.Label29.AutoSize = True + Me.Label29.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label29.ForeColor = System.Drawing.Color.Red + Me.Label29.Location = New System.Drawing.Point(238, 61) + Me.Label29.Name = "Label29" + Me.Label29.Size = New System.Drawing.Size(40, 16) + Me.Label29.TabIndex = 82 + Me.Label29.Text = "RMC" + ' + 'Label28 + ' + Me.Label28.AutoSize = True + Me.Label28.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label28.ForeColor = System.Drawing.Color.Red + Me.Label28.Location = New System.Drawing.Point(18, 61) + Me.Label28.Name = "Label28" + Me.Label28.Size = New System.Drawing.Size(72, 16) + Me.Label28.TabIndex = 81 + Me.Label28.Text = "ASFINAG" + ' 'LinkLabel49 ' Me.LinkLabel49.AutoSize = True @@ -2171,7 +1941,7 @@ Partial Class frmStartOptions Me.cbxTestFTP.Checked = True Me.cbxTestFTP.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxTestFTP.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTestFTP.Location = New System.Drawing.Point(19, 54) + Me.cbxTestFTP.Location = New System.Drawing.Point(19, 31) Me.cbxTestFTP.Name = "cbxTestFTP" Me.cbxTestFTP.Size = New System.Drawing.Size(123, 17) Me.cbxTestFTP.TabIndex = 77 @@ -2184,7 +1954,7 @@ Partial Class frmStartOptions Me.cbxTestsystem.Checked = True Me.cbxTestsystem.CheckState = System.Windows.Forms.CheckState.Checked Me.cbxTestsystem.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxTestsystem.Location = New System.Drawing.Point(19, 31) + Me.cbxTestsystem.Location = New System.Drawing.Point(19, 8) Me.cbxTestsystem.Name = "cbxTestsystem" Me.cbxTestsystem.Size = New System.Drawing.Size(122, 17) Me.cbxTestsystem.TabIndex = 76 @@ -2309,54 +2079,6 @@ Partial Class frmStartOptions Me.Label24.TabIndex = 30 Me.Label24.Text = "Import" ' - 'txtTBLNr - ' - Me.txtTBLNr._DateTimeOnly = False - Me.txtTBLNr._numbersOnly = True - Me.txtTBLNr._numbersOnlyKommastellen = "" - Me.txtTBLNr._numbersOnlyTrennzeichen = False - Me.txtTBLNr._Prozent = False - Me.txtTBLNr._ShortDateNew = False - Me.txtTBLNr._ShortDateOnly = False - Me.txtTBLNr._TimeOnly = False - Me.txtTBLNr._TimeOnly_Seconds = False - Me.txtTBLNr._value = "" - Me.txtTBLNr._Waehrung = False - Me.txtTBLNr._WaehrungZeichen = True - Me.txtTBLNr.ForeColor = System.Drawing.Color.Red - Me.txtTBLNr.Location = New System.Drawing.Point(165, 268) - Me.txtTBLNr.MaxLineLength = -1 - Me.txtTBLNr.MaxLines_Warning = "" - Me.txtTBLNr.MaxLines_Warning_Label = Nothing - Me.txtTBLNr.Name = "txtTBLNr" - Me.txtTBLNr.ReadOnly = True - Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTBLNr.TabIndex = 79 - ' - 'txtTWLNr - ' - Me.txtTWLNr._DateTimeOnly = False - Me.txtTWLNr._numbersOnly = True - Me.txtTWLNr._numbersOnlyKommastellen = "" - Me.txtTWLNr._numbersOnlyTrennzeichen = False - Me.txtTWLNr._Prozent = False - Me.txtTWLNr._ShortDateNew = False - Me.txtTWLNr._ShortDateOnly = False - Me.txtTWLNr._TimeOnly = False - Me.txtTWLNr._TimeOnly_Seconds = False - Me.txtTWLNr._value = "" - Me.txtTWLNr._Waehrung = False - Me.txtTWLNr._WaehrungZeichen = True - Me.txtTWLNr.ForeColor = System.Drawing.Color.Red - Me.txtTWLNr.Location = New System.Drawing.Point(165, 240) - Me.txtTWLNr.MaxLineLength = -1 - Me.txtTWLNr.MaxLines_Warning = "" - Me.txtTWLNr.MaxLines_Warning_Label = Nothing - Me.txtTWLNr.Name = "txtTWLNr" - Me.txtTWLNr.ReadOnly = True - Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) - Me.txtTWLNr.TabIndex = 78 - ' 'CheckBox2 ' Me.CheckBox2.AutoSize = True @@ -2435,30 +2157,6 @@ Partial Class frmStartOptions Me.Label3.TabIndex = 14 Me.Label3.Text = "Routine Manager IMEX" ' - 'MyTextBox1 - ' - Me.MyTextBox1._DateTimeOnly = False - Me.MyTextBox1._numbersOnly = True - Me.MyTextBox1._numbersOnlyKommastellen = "" - Me.MyTextBox1._numbersOnlyTrennzeichen = True - Me.MyTextBox1._Prozent = False - Me.MyTextBox1._ShortDateNew = False - Me.MyTextBox1._ShortDateOnly = False - Me.MyTextBox1._TimeOnly = False - Me.MyTextBox1._TimeOnly_Seconds = False - Me.MyTextBox1._value = "100000" - Me.MyTextBox1._Waehrung = False - Me.MyTextBox1._WaehrungZeichen = True - Me.MyTextBox1.ForeColor = System.Drawing.Color.Black - Me.MyTextBox1.Location = New System.Drawing.Point(151, 132) - Me.MyTextBox1.MaxLineLength = -1 - Me.MyTextBox1.MaxLines_Warning = "" - Me.MyTextBox1.MaxLines_Warning_Label = Nothing - Me.MyTextBox1.Name = "MyTextBox1" - Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox1.TabIndex = 11 - Me.MyTextBox1.Text = "100000" - ' 'PictureBox12 ' Me.PictureBox12.BackgroundImage = CType(resources.GetObject("PictureBox12.BackgroundImage"), System.Drawing.Image) @@ -2627,6 +2325,376 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' + 'Button21 + ' + 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 + ' + 'MyTextBox3 + ' + Me.MyTextBox3._DateTimeOnly = False + Me.MyTextBox3._numbersOnly = True + Me.MyTextBox3._numbersOnlyKommastellen = "" + Me.MyTextBox3._numbersOnlyTrennzeichen = True + Me.MyTextBox3._Prozent = False + Me.MyTextBox3._ShortDateNew = False + Me.MyTextBox3._ShortDateOnly = False + Me.MyTextBox3._TimeOnly = False + Me.MyTextBox3._TimeOnly_Seconds = False + Me.MyTextBox3._value = "" + Me.MyTextBox3._Waehrung = False + Me.MyTextBox3._WaehrungZeichen = True + Me.MyTextBox3.ForeColor = System.Drawing.Color.Red + Me.MyTextBox3.Location = New System.Drawing.Point(127, 208) + Me.MyTextBox3.MaxLineLength = -1 + Me.MyTextBox3.MaxLines_Warning = "" + Me.MyTextBox3.MaxLines_Warning_Label = Nothing + Me.MyTextBox3.Name = "MyTextBox3" + Me.MyTextBox3.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox3.TabIndex = 86 + ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = True + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._numbersOnlyTrennzeichen = True + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Red + Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox2.TabIndex = 63 + ' + 'txtSyskaWdhDateiname + ' + Me.txtSyskaWdhDateiname._DateTimeOnly = False + Me.txtSyskaWdhDateiname._numbersOnly = False + Me.txtSyskaWdhDateiname._numbersOnlyKommastellen = "" + Me.txtSyskaWdhDateiname._numbersOnlyTrennzeichen = True + Me.txtSyskaWdhDateiname._Prozent = False + Me.txtSyskaWdhDateiname._ShortDateNew = False + Me.txtSyskaWdhDateiname._ShortDateOnly = False + Me.txtSyskaWdhDateiname._TimeOnly = False + Me.txtSyskaWdhDateiname._TimeOnly_Seconds = False + Me.txtSyskaWdhDateiname._value = "" + Me.txtSyskaWdhDateiname._Waehrung = False + Me.txtSyskaWdhDateiname._WaehrungZeichen = True + Me.txtSyskaWdhDateiname.ForeColor = System.Drawing.Color.Black + Me.txtSyskaWdhDateiname.Location = New System.Drawing.Point(692, 318) + Me.txtSyskaWdhDateiname.MaxLength = 50 + Me.txtSyskaWdhDateiname.MaxLineLength = -1 + Me.txtSyskaWdhDateiname.MaxLines_Warning = "" + Me.txtSyskaWdhDateiname.MaxLines_Warning_Label = Nothing + Me.txtSyskaWdhDateiname.Name = "txtSyskaWdhDateiname" + Me.txtSyskaWdhDateiname.Size = New System.Drawing.Size(136, 20) + Me.txtSyskaWdhDateiname.TabIndex = 58 + ' + 'txtEZOLLAnhDat + ' + Me.txtEZOLLAnhDat._DateTimeOnly = False + Me.txtEZOLLAnhDat._numbersOnly = False + Me.txtEZOLLAnhDat._numbersOnlyKommastellen = "" + Me.txtEZOLLAnhDat._numbersOnlyTrennzeichen = True + Me.txtEZOLLAnhDat._Prozent = False + Me.txtEZOLLAnhDat._ShortDateNew = True + Me.txtEZOLLAnhDat._ShortDateOnly = False + Me.txtEZOLLAnhDat._TimeOnly = False + Me.txtEZOLLAnhDat._TimeOnly_Seconds = False + Me.txtEZOLLAnhDat._value = "" + Me.txtEZOLLAnhDat._Waehrung = False + Me.txtEZOLLAnhDat._WaehrungZeichen = True + Me.txtEZOLLAnhDat.ForeColor = System.Drawing.Color.Black + Me.txtEZOLLAnhDat.Location = New System.Drawing.Point(408, 190) + Me.txtEZOLLAnhDat.MaxLength = 10 + Me.txtEZOLLAnhDat.MaxLineLength = -1 + Me.txtEZOLLAnhDat.MaxLines_Warning = "" + Me.txtEZOLLAnhDat.MaxLines_Warning_Label = Nothing + Me.txtEZOLLAnhDat.Name = "txtEZOLLAnhDat" + Me.txtEZOLLAnhDat.Size = New System.Drawing.Size(87, 20) + Me.txtEZOLLAnhDat.TabIndex = 55 + ' + 'cboSYSKAFirma + ' + Me.cboSYSKAFirma._allowedValuesFreiText = Nothing + Me.cboSYSKAFirma._allowFreiText = False + Me.cboSYSKAFirma._value = "" + Me.cboSYSKAFirma.FormattingEnabled = True + Me.cboSYSKAFirma.Location = New System.Drawing.Point(564, 299) + Me.cboSYSKAFirma.Name = "cboSYSKAFirma" + Me.cboSYSKAFirma.Size = New System.Drawing.Size(129, 21) + Me.cboSYSKAFirma.TabIndex = 51 + ' + 'cboBMDUnispedFirma + ' + Me.cboBMDUnispedFirma._allowedValuesFreiText = Nothing + Me.cboBMDUnispedFirma._allowFreiText = False + Me.cboBMDUnispedFirma._value = "" + Me.cboBMDUnispedFirma.FormattingEnabled = True + Me.cboBMDUnispedFirma.Location = New System.Drawing.Point(268, 276) + Me.cboBMDUnispedFirma.Name = "cboBMDUnispedFirma" + Me.cboBMDUnispedFirma.Size = New System.Drawing.Size(124, 21) + Me.cboBMDUnispedFirma.TabIndex = 42 + ' + 'dgvMRN + ' + Me.dgvMRN.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvMRN.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvMRN.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMRN}) + Me.dgvMRN.Location = New System.Drawing.Point(637, 63) + Me.dgvMRN.Name = "dgvMRN" + Me.dgvMRN.RowHeadersWidth = 62 + Me.dgvMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvMRN.Size = New System.Drawing.Size(207, 134) + Me.dgvMRN.TabIndex = 75 + ' + 'clmnMRN + ' + Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnMRN.HeaderText = "MRN" + Me.clmnMRN.MinimumWidth = 8 + Me.clmnMRN.Name = "clmnMRN" + ' + 'txtVRGOut_MRN + ' + Me.txtVRGOut_MRN._DateTimeOnly = False + Me.txtVRGOut_MRN._numbersOnly = False + Me.txtVRGOut_MRN._numbersOnlyKommastellen = "" + Me.txtVRGOut_MRN._numbersOnlyTrennzeichen = True + Me.txtVRGOut_MRN._Prozent = False + Me.txtVRGOut_MRN._ShortDateNew = False + Me.txtVRGOut_MRN._ShortDateOnly = False + Me.txtVRGOut_MRN._TimeOnly = False + Me.txtVRGOut_MRN._TimeOnly_Seconds = False + Me.txtVRGOut_MRN._value = "" + Me.txtVRGOut_MRN._Waehrung = False + Me.txtVRGOut_MRN._WaehrungZeichen = False + Me.txtVRGOut_MRN.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_MRN.Location = New System.Drawing.Point(359, 84) + Me.txtVRGOut_MRN.MaxLineLength = -1 + Me.txtVRGOut_MRN.MaxLines_Warning = "" + Me.txtVRGOut_MRN.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_MRN.Name = "txtVRGOut_MRN" + Me.txtVRGOut_MRN.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_MRN.TabIndex = 73 + ' + 'txtVRGOut_FilialenNr + ' + Me.txtVRGOut_FilialenNr._DateTimeOnly = False + Me.txtVRGOut_FilialenNr._numbersOnly = False + Me.txtVRGOut_FilialenNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_FilialenNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_FilialenNr._Prozent = False + Me.txtVRGOut_FilialenNr._ShortDateNew = False + Me.txtVRGOut_FilialenNr._ShortDateOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly_Seconds = False + Me.txtVRGOut_FilialenNr._value = "" + Me.txtVRGOut_FilialenNr._Waehrung = False + Me.txtVRGOut_FilialenNr._WaehrungZeichen = False + Me.txtVRGOut_FilialenNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_FilialenNr.Location = New System.Drawing.Point(398, 176) + Me.txtVRGOut_FilialenNr.MaxLineLength = -1 + Me.txtVRGOut_FilialenNr.MaxLines_Warning = "" + Me.txtVRGOut_FilialenNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_FilialenNr.Multiline = True + Me.txtVRGOut_FilialenNr.Name = "txtVRGOut_FilialenNr" + Me.txtVRGOut_FilialenNr.Size = New System.Drawing.Size(56, 21) + Me.txtVRGOut_FilialenNr.TabIndex = 71 + ' + 'txtVRGOut_AbfertigungsNr + ' + Me.txtVRGOut_AbfertigungsNr._DateTimeOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnly = False + Me.txtVRGOut_AbfertigungsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_AbfertigungsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_AbfertigungsNr._Prozent = False + Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False + Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly_Seconds = False + Me.txtVRGOut_AbfertigungsNr._value = "" + Me.txtVRGOut_AbfertigungsNr._Waehrung = False + Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False + Me.txtVRGOut_AbfertigungsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_AbfertigungsNr.Location = New System.Drawing.Point(453, 176) + Me.txtVRGOut_AbfertigungsNr.MaxLineLength = -1 + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning = "" + Me.txtVRGOut_AbfertigungsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_AbfertigungsNr.Multiline = True + Me.txtVRGOut_AbfertigungsNr.Name = "txtVRGOut_AbfertigungsNr" + Me.txtVRGOut_AbfertigungsNr.Size = New System.Drawing.Size(137, 21) + Me.txtVRGOut_AbfertigungsNr.TabIndex = 70 + ' + 'MyComboBox2 + ' + Me.MyComboBox2._allowedValuesFreiText = Nothing + Me.MyComboBox2._allowFreiText = False + Me.MyComboBox2._value = "" + Me.MyComboBox2.FormattingEnabled = True + Me.MyComboBox2.Location = New System.Drawing.Point(298, 252) + Me.MyComboBox2.Name = "MyComboBox2" + Me.MyComboBox2.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox2.TabIndex = 64 + ' + 'txtVRGOutEZA_BezugsNr + ' + Me.txtVRGOutEZA_BezugsNr._DateTimeOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnly = False + Me.txtVRGOutEZA_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOutEZA_BezugsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOutEZA_BezugsNr._Prozent = False + Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False + Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly_Seconds = False + Me.txtVRGOutEZA_BezugsNr._value = "" + Me.txtVRGOutEZA_BezugsNr._Waehrung = False + Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False + Me.txtVRGOutEZA_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOutEZA_BezugsNr.Location = New System.Drawing.Point(359, 252) + Me.txtVRGOutEZA_BezugsNr.MaxLineLength = -1 + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOutEZA_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOutEZA_BezugsNr.Multiline = True + Me.txtVRGOutEZA_BezugsNr.Name = "txtVRGOutEZA_BezugsNr" + Me.txtVRGOutEZA_BezugsNr.Size = New System.Drawing.Size(153, 21) + Me.txtVRGOutEZA_BezugsNr.TabIndex = 65 + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(298, 62) + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(62, 21) + Me.MyComboBox1.TabIndex = 4 + ' + 'txtVRGOut_BezugsNr + ' + Me.txtVRGOut_BezugsNr._DateTimeOnly = False + Me.txtVRGOut_BezugsNr._numbersOnly = False + Me.txtVRGOut_BezugsNr._numbersOnlyKommastellen = "" + Me.txtVRGOut_BezugsNr._numbersOnlyTrennzeichen = True + Me.txtVRGOut_BezugsNr._Prozent = False + Me.txtVRGOut_BezugsNr._ShortDateNew = False + Me.txtVRGOut_BezugsNr._ShortDateOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly_Seconds = False + Me.txtVRGOut_BezugsNr._value = "" + Me.txtVRGOut_BezugsNr._Waehrung = False + Me.txtVRGOut_BezugsNr._WaehrungZeichen = False + Me.txtVRGOut_BezugsNr.ForeColor = System.Drawing.Color.Red + Me.txtVRGOut_BezugsNr.Location = New System.Drawing.Point(359, 62) + Me.txtVRGOut_BezugsNr.MaxLineLength = -1 + Me.txtVRGOut_BezugsNr.MaxLines_Warning = "" + Me.txtVRGOut_BezugsNr.MaxLines_Warning_Label = Nothing + Me.txtVRGOut_BezugsNr.Name = "txtVRGOut_BezugsNr" + Me.txtVRGOut_BezugsNr.Size = New System.Drawing.Size(153, 20) + Me.txtVRGOut_BezugsNr.TabIndex = 5 + ' + 'cbxRMC + ' + Me.cbxRMC._allowedValuesFreiText = Nothing + Me.cbxRMC._allowFreiText = False + Me.cbxRMC._value = "" + Me.cbxRMC.FormattingEnabled = True + Me.cbxRMC.Location = New System.Drawing.Point(241, 127) + Me.cbxRMC.Name = "cbxRMC" + Me.cbxRMC.Size = New System.Drawing.Size(80, 21) + Me.cbxRMC.TabIndex = 90 + ' + 'txtTBLNr + ' + Me.txtTBLNr._DateTimeOnly = False + Me.txtTBLNr._numbersOnly = True + Me.txtTBLNr._numbersOnlyKommastellen = "" + Me.txtTBLNr._numbersOnlyTrennzeichen = False + Me.txtTBLNr._Prozent = False + Me.txtTBLNr._ShortDateNew = False + Me.txtTBLNr._ShortDateOnly = False + Me.txtTBLNr._TimeOnly = False + Me.txtTBLNr._TimeOnly_Seconds = False + Me.txtTBLNr._value = "" + Me.txtTBLNr._Waehrung = False + Me.txtTBLNr._WaehrungZeichen = True + Me.txtTBLNr.ForeColor = System.Drawing.Color.Red + Me.txtTBLNr.Location = New System.Drawing.Point(165, 268) + Me.txtTBLNr.MaxLineLength = -1 + Me.txtTBLNr.MaxLines_Warning = "" + Me.txtTBLNr.MaxLines_Warning_Label = Nothing + Me.txtTBLNr.Name = "txtTBLNr" + Me.txtTBLNr.ReadOnly = True + Me.txtTBLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTBLNr.TabIndex = 79 + ' + 'txtTWLNr + ' + Me.txtTWLNr._DateTimeOnly = False + Me.txtTWLNr._numbersOnly = True + Me.txtTWLNr._numbersOnlyKommastellen = "" + Me.txtTWLNr._numbersOnlyTrennzeichen = False + Me.txtTWLNr._Prozent = False + Me.txtTWLNr._ShortDateNew = False + Me.txtTWLNr._ShortDateOnly = False + Me.txtTWLNr._TimeOnly = False + Me.txtTWLNr._TimeOnly_Seconds = False + Me.txtTWLNr._value = "" + Me.txtTWLNr._Waehrung = False + Me.txtTWLNr._WaehrungZeichen = True + Me.txtTWLNr.ForeColor = System.Drawing.Color.Red + Me.txtTWLNr.Location = New System.Drawing.Point(165, 240) + Me.txtTWLNr.MaxLineLength = -1 + Me.txtTWLNr.MaxLines_Warning = "" + Me.txtTWLNr.MaxLines_Warning_Label = Nothing + Me.txtTWLNr.Name = "txtTWLNr" + Me.txtTWLNr.ReadOnly = True + Me.txtTWLNr.Size = New System.Drawing.Size(53, 20) + Me.txtTWLNr.TabIndex = 78 + ' + 'MyTextBox1 + ' + Me.MyTextBox1._DateTimeOnly = False + Me.MyTextBox1._numbersOnly = True + Me.MyTextBox1._numbersOnlyKommastellen = "" + Me.MyTextBox1._numbersOnlyTrennzeichen = True + Me.MyTextBox1._Prozent = False + Me.MyTextBox1._ShortDateNew = False + Me.MyTextBox1._ShortDateOnly = False + Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False + Me.MyTextBox1._value = "100000" + Me.MyTextBox1._Waehrung = False + Me.MyTextBox1._WaehrungZeichen = True + Me.MyTextBox1.ForeColor = System.Drawing.Color.Black + Me.MyTextBox1.Location = New System.Drawing.Point(151, 132) + Me.MyTextBox1.MaxLineLength = -1 + Me.MyTextBox1.MaxLines_Warning = "" + Me.MyTextBox1.MaxLines_Warning_Label = Nothing + Me.MyTextBox1.Name = "MyTextBox1" + Me.MyTextBox1.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox1.TabIndex = 11 + Me.MyTextBox1.Text = "100000" + ' 'txtGJ_UNISPED ' Me.txtGJ_UNISPED._DateTimeOnly = False @@ -2651,57 +2719,6 @@ Partial Class frmStartOptions Me.txtGJ_UNISPED.Size = New System.Drawing.Size(53, 20) Me.txtGJ_UNISPED.TabIndex = 68 ' - 'Button21 - ' - 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 - ' - 'Label28 - ' - Me.Label28.AutoSize = True - Me.Label28.Location = New System.Drawing.Point(18, 7) - Me.Label28.Name = "Label28" - Me.Label28.Size = New System.Drawing.Size(53, 13) - Me.Label28.TabIndex = 81 - Me.Label28.Text = "ASFINAG" - ' - 'Label29 - ' - Me.Label29.AutoSize = True - Me.Label29.Location = New System.Drawing.Point(238, 7) - Me.Label29.Name = "Label29" - Me.Label29.Size = New System.Drawing.Size(31, 13) - Me.Label29.TabIndex = 82 - Me.Label29.Text = "RMC" - ' - 'Label30 - ' - Me.Label30.AutoSize = True - Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label30.Location = New System.Drawing.Point(238, 87) - Me.Label30.Name = "Label30" - Me.Label30.Size = New System.Drawing.Size(42, 13) - Me.Label30.TabIndex = 83 - Me.Label30.Text = "Import" - ' - 'LinkLabel52 - ' - Me.LinkLabel52.AutoSize = True - Me.LinkLabel52.LinkColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.LinkLabel52.Location = New System.Drawing.Point(238, 111) - Me.LinkLabel52.Name = "LinkLabel52" - Me.LinkLabel52.Size = New System.Drawing.Size(109, 13) - Me.LinkLabel52.TabIndex = 84 - Me.LinkLabel52.TabStop = True - Me.LinkLabel52.Text = "CSV+PDF importieren" - ' 'frmStartOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2741,7 +2758,6 @@ Partial Class frmStartOptions Me.TabPage2.PerformLayout() CType(Me.PictureBox15, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox14, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage3.ResumeLayout(False) Me.TabPage3.PerformLayout() Me.TabPage4.ResumeLayout(False) @@ -2753,6 +2769,7 @@ Partial Class frmStartOptions CType(Me.PictureBox11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dgvMRN, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -2946,5 +2963,6 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel52 As LinkLabel Friend WithEvents Label30 As Label Friend WithEvents Label29 As Label + Friend WithEvents cbxRMC As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents Label28 As Label End Class diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index f800888..cce3971 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -80,6 +80,11 @@ Public Class frmStartOptions cboSYSKAFirma.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("VERAG 360 GmbH", "19")) cboSYSKAFirma.changeItem("") + cbxRMC.Items.Clear() + cbxRMC.fillWithSQL("SELECT api_program FROM tblAPIEinstellungen WHERE api_program like 'RMC%'", False, "ADMIN", True) + cbxRMC.changeItem("") + + txtGJ_UNISPED.Text = Now.Year txtEZOLLAnhDat._value = Now.ToShortDateString @@ -3703,6 +3708,7 @@ Public Class frmStartOptions End If Case "buchungenAMBAR" + VERAG_PROG_ALLGEMEIN.cSyska_Interface.genDatensatz_Buchungen(24, CheckBox7.Checked, If(cbxSyskaWdh.Checked, txtSyskaWdhDateiname.Text, ""), True) End Select @@ -4360,5 +4366,11 @@ Public Class frmStartOptions Private Sub LinkLabel52_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel52.LinkClicked + Me.Visible = False + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked + If cbxRMC._value = "" Then Exit Sub + Dim f As New frmRMCNachrichtenVerarbeitung(cbxRMC._value) + f.ShowDialog() + Me.Visible = True End Sub End Class \ No newline at end of file