diff --git a/app/DD-Record-Organizer/Classes/ClassSAP.vb b/app/DD-Record-Organizer/Classes/ClassSAP.vb index 6a1edfe..76196b4 100644 --- a/app/DD-Record-Organizer/Classes/ClassSAP.vb +++ b/app/DD-Record-Organizer/Classes/ClassSAP.vb @@ -150,19 +150,23 @@ Public Class ClassSAP LOGGER.Error(ex) End Try End Sub - Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0) + Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, oRaisIncomPack As Boolean, RowLimit As Integer) Try Dim RESULT_TABLE As DataTable = New DataTable LOGGER.Debug("Get data from SAP Table", False) Dim oReadTable As New ERPConnect.Utils.ReadTable(SAP_CONNECTION) - oReadTable.PackageSize = 10000 - oReadTable.RaiseIncomingPackageEvent = True + If oRaisIncomPack = True Then + oReadTable.PackageSize = 10000 + oReadTable.RaiseIncomingPackageEvent = True + End If + NewDatatable = Nothing If where_clause <> "" Then oReadTable.WhereClause = where_clause End If oReadTable.TableName = tablename If RowLimit <> 0 Then + LOGGER.Debug("RowLimit included!") oReadTable.RowCount = RowLimit End If LOGGER.Debug("Table.Run executing.....") diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index c70a164..63aab44 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -230,7 +230,7 @@ Knoten umbenennen - 216, 26 + 212, 22 Knotentext: @@ -242,7 +242,7 @@ 152, 23 - 213, 6 + 209, 6 @@ -253,7 +253,7 @@ - 216, 26 + 212, 22 Auf dieser Ebene @@ -268,7 +268,7 @@ - 216, 26 + 212, 22 Unterhalb @@ -322,7 +322,7 @@ Suche Knoten - 225, 257 + 225, 235 cmsTreeView @@ -496,7 +496,7 @@ 0, 0 - 908, 237 + 910, 237 2 @@ -592,7 +592,7 @@ 0, 0 - 699, 231 + 699, 223 4 @@ -634,7 +634,7 @@ 0, 0 - 486, 206 + 488, 198 5 @@ -681,10 +681,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 206 + 0, 198 - 486, 25 + 488, 25 0 @@ -720,7 +720,7 @@ 1 - 1201, 235 + 1201, 227 1 @@ -896,7 +896,7 @@ 1 - 1201, 262 + 1201, 254 Detailansicht @@ -914,7 +914,7 @@ 0 - 1203, 290 + 1203, 282 3 @@ -926,7 +926,7 @@ 0, 27 - 1201, 227 + 1201, 237 0 @@ -1183,7 +1183,7 @@ - 1201, 254 + 1201, 264 Positionen @@ -1688,7 +1688,7 @@ 2 - 1201, 254 + 1201, 264 Wiedervorlage @@ -1790,7 +1790,7 @@ 5 - 1201, 227 + 1201, 237 90 @@ -1862,7 +1862,7 @@ 1 - 1201, 254 + 1201, 264 Vorgängervarianten @@ -1963,7 +1963,7 @@ 1 - 1203, 539 + 1203, 529 2 @@ -1987,7 +1987,7 @@ Fill - 0, 147 + 0, 158 Panel1 @@ -2020,7 +2020,7 @@ 1 - 1203, 539 + 1203, 529 4 @@ -3085,13 +3085,13 @@ Funktionen - 1203, 147 + 1203, 158 - 0, 686 + 0, 687 - 1203, 23 + 1203, 22 RibbonStatusBar1 diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb index b62c49e..329dd3f 100644 --- a/app/DD-Record-Organizer/frmNodeNavigation.vb +++ b/app/DD-Record-Organizer/frmNodeNavigation.vb @@ -2788,73 +2788,73 @@ Public Class frmNodeNavigation Private Sub GridViewDoc_Search_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridViewDoc_Search.RowStyle 'TODO: Refactor RowStyle maybe - 'If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then - ' e.Appearance.BackColor = Color.Yellow - 'Else - ' If e.RowHandle = -1 Then - ' Exit Sub - ' End If - ' Try - ' Dim rowCellValue = GridViewDoc_Search.GetRowCellValue(e.RowHandle, "in work?") - ' If Not IsNothing(rowCellValue) Then - ' Dim inwork = rowCellValue - ' If inwork = True Then - ' e.Appearance.BackColor = Color.Orchid - ' e.HighPriority = True - ' End If - ' End If - ' Catch ex As Exception - ' LOGGER.Warn("Unexpected Error in Checking Value In Work: " & ex.Message) - ' End Try + If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then + e.Appearance.BackColor = Color.Yellow + Else + If e.RowHandle = -1 Then + Exit Sub + End If + Try + Dim rowCellValue = GridViewDoc_Search.GetRowCellValue(e.RowHandle, "in work?") + If Not IsNothing(rowCellValue) Then + Dim inwork = rowCellValue + If inwork = True Then + e.Appearance.BackColor = Color.Orchid + e.HighPriority = True + End If + End If + Catch ex As Exception + LOGGER.Warn("Unexpected Error in Checking Value In Work: " & ex.Message) + End Try - ' Try - ' Dim DROPDOWN_VALUE - ' If Not IsNothing(DT_DOCRESULT_DROPDOWN_ITEMS) Then - ' 'Den ColumnTitle aus ConfigTableholen - ' If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then - ' For Each confrow As DataRow In DT_DOCRESULT_DROPDOWN_ITEMS.Rows - ' Dim CAPTION = confrow.Item("HEADER_CAPTION") - ' DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION) - ' If Not IsNothing(DROPDOWN_VALUE) Then - ' Exit For - ' End If - ' Next + Try + Dim DROPDOWN_VALUE + If Not IsNothing(DT_DOCRESULT_DROPDOWN_ITEMS) Then + 'Den ColumnTitle aus ConfigTableholen + If DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count > 0 Then + For Each confrow As DataRow In DT_DOCRESULT_DROPDOWN_ITEMS.Rows + Dim CAPTION = confrow.Item("HEADER_CAPTION") + DROPDOWN_VALUE = GridViewDoc_Search.GetRowCellValue(e.RowHandle, CAPTION) + If Not IsNothing(DROPDOWN_VALUE) Then + Exit For + End If + Next - ' If Not IsNothing(DROPDOWN_VALUE) Then - ' Dim ColorRow As Color - ' Dim expression As String = String.Format("VALUE = '{0}'", DROPDOWN_VALUE) - ' Dim matchingRows() As DataRow = DT_DOCRESULT_DROPDOWN_ITEMS.Select(expression, "SEQUENCE") - ' Dim rowcolorname As String = "" - ' 'Die Color für den value auswählen - ' For Each matchingRow As DataRow In matchingRows - ' rowcolorname = "" - ' If Not IsDBNull(matchingRow.Item("COLOR")) Then - ' rowcolorname = matchingRow.Item("COLOR") - ' End If + If Not IsNothing(DROPDOWN_VALUE) Then + Dim ColorRow As Color + Dim expression As String = String.Format("VALUE = '{0}'", DROPDOWN_VALUE) + Dim matchingRows() As DataRow = DT_DOCRESULT_DROPDOWN_ITEMS.Select(expression, "SEQUENCE") + Dim rowcolorname As String = "" + 'Die Color für den value auswählen + For Each matchingRow As DataRow In matchingRows + rowcolorname = "" + If Not IsDBNull(matchingRow.Item("COLOR")) Then + rowcolorname = matchingRow.Item("COLOR") + End If - ' If rowcolorname <> "" Then - ' Exit For - ' End If - ' Next - ' If rowcolorname <> "" Then - ' ColorRow = Color.FromName(rowcolorname) - ' e.Appearance.BackColor = ColorRow - ' e.HighPriority = True - ' End If + If rowcolorname <> "" Then + Exit For + End If + Next + If rowcolorname <> "" Then + ColorRow = Color.FromName(rowcolorname) + e.Appearance.BackColor = ColorRow + e.HighPriority = True + End If - ' 'Dim c As Color = DirectCast(rowCellValue, Color) + 'Dim c As Color = DirectCast(rowCellValue, Color) - ' End If - ' End If + End If + End If - ' End If - ' Catch ex As Exception - ' LOGGER.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message) - ' End Try + End If + Catch ex As Exception + LOGGER.Warn("Unexpected Error in RowStyle-Color Dropdown: " & ex.Message) + End Try - 'End If + End If End Sub Private Async Function BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Task Handles BbtnitmNodeReorder.ItemClick diff --git a/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb b/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb index bad3f91..6714f71 100644 --- a/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb +++ b/app/DD-Record-Organizer/frmSAP_FuBa.Designer.vb @@ -114,6 +114,7 @@ Partial Class frmSAP_FuBa Me.Label2 = New System.Windows.Forms.Label() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.Button3 = New System.Windows.Forms.Button() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.txtBARCODESendlist = New System.Windows.Forms.TextBox() Me.lblResultBAPI = New System.Windows.Forms.Label() @@ -279,7 +280,7 @@ Partial Class frmSAP_FuBa 'ADDED_WHOLabel ' ADDED_WHOLabel.AutoSize = True - ADDED_WHOLabel.Location = New System.Drawing.Point(310, 280) + ADDED_WHOLabel.Location = New System.Drawing.Point(310, 301) ADDED_WHOLabel.Name = "ADDED_WHOLabel" ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13) ADDED_WHOLabel.TabIndex = 25 @@ -288,7 +289,7 @@ Partial Class frmSAP_FuBa 'ADDED_WHENLabel ' ADDED_WHENLabel.AutoSize = True - ADDED_WHENLabel.Location = New System.Drawing.Point(452, 280) + ADDED_WHENLabel.Location = New System.Drawing.Point(452, 301) ADDED_WHENLabel.Name = "ADDED_WHENLabel" ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13) ADDED_WHENLabel.TabIndex = 27 @@ -297,7 +298,7 @@ Partial Class frmSAP_FuBa 'CHANGED_WHOLabel ' CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(586, 279) + CHANGED_WHOLabel.Location = New System.Drawing.Point(586, 300) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) CHANGED_WHOLabel.TabIndex = 29 @@ -306,7 +307,7 @@ Partial Class frmSAP_FuBa 'CHANGED_WHENLabel ' CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(727, 279) + CHANGED_WHENLabel.Location = New System.Drawing.Point(727, 300) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel.TabIndex = 31 @@ -315,7 +316,7 @@ Partial Class frmSAP_FuBa 'WHERE_CLAUSELabel ' WHERE_CLAUSELabel.AutoSize = True - WHERE_CLAUSELabel.Location = New System.Drawing.Point(310, 238) + WHERE_CLAUSELabel.Location = New System.Drawing.Point(310, 259) WHERE_CLAUSELabel.Name = "WHERE_CLAUSELabel" WHERE_CLAUSELabel.Size = New System.Drawing.Size(425, 13) WHERE_CLAUSELabel.TabIndex = 83 @@ -749,7 +750,7 @@ Partial Class frmSAP_FuBa Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBox.Enabled = False Me.ADDED_WHOTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(313, 296) + Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(313, 317) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(136, 22) Me.ADDED_WHOTextBox.TabIndex = 26 @@ -760,7 +761,7 @@ Partial Class frmSAP_FuBa Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "ADDED_WHEN", True)) Me.ADDED_WHENTextBox.Enabled = False Me.ADDED_WHENTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(455, 296) + Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(455, 317) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(130, 22) Me.ADDED_WHENTextBox.TabIndex = 28 @@ -771,7 +772,7 @@ Partial Class frmSAP_FuBa Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextBox.Enabled = False Me.CHANGED_WHOTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(589, 295) + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(589, 316) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(132, 22) Me.CHANGED_WHOTextBox.TabIndex = 30 @@ -782,7 +783,7 @@ Partial Class frmSAP_FuBa Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "CHANGED_WHEN", True)) Me.CHANGED_WHENTextBox.Enabled = False Me.CHANGED_WHENTextBox.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(730, 295) + Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(730, 316) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(147, 22) Me.CHANGED_WHENTextBox.TabIndex = 32 @@ -794,7 +795,7 @@ Partial Class frmSAP_FuBa Me.ListBox1.FormattingEnabled = True Me.ListBox1.Location = New System.Drawing.Point(11, 28) Me.ListBox1.Name = "ListBox1" - Me.ListBox1.Size = New System.Drawing.Size(240, 290) + Me.ListBox1.Size = New System.Drawing.Size(240, 316) Me.ListBox1.TabIndex = 33 ' 'btnERPConnect @@ -816,10 +817,10 @@ Partial Class frmSAP_FuBa Me.GridControl2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GridControl2.Location = New System.Drawing.Point(11, 340) + Me.GridControl2.Location = New System.Drawing.Point(11, 376) Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(1153, 223) + Me.GridControl2.Size = New System.Drawing.Size(1153, 187) Me.GridControl2.TabIndex = 83 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -842,7 +843,7 @@ Partial Class frmSAP_FuBa 'WHERE_CLAUSETextBox ' Me.WHERE_CLAUSETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_SAP_FUBABindingSource, "WHERE_CLAUSE", True)) - Me.WHERE_CLAUSETextBox.Location = New System.Drawing.Point(313, 254) + Me.WHERE_CLAUSETextBox.Location = New System.Drawing.Point(313, 275) Me.WHERE_CLAUSETextBox.Name = "WHERE_CLAUSETextBox" Me.WHERE_CLAUSETextBox.Size = New System.Drawing.Size(766, 21) Me.WHERE_CLAUSETextBox.TabIndex = 84 @@ -853,7 +854,7 @@ Partial Class frmSAP_FuBa Me.lblSave.BackColor = System.Drawing.Color.Yellow Me.lblSave.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) Me.lblSave.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSave.Location = New System.Drawing.Point(906, 299) + Me.lblSave.Location = New System.Drawing.Point(906, 320) Me.lblSave.Name = "lblSave" Me.lblSave.Size = New System.Drawing.Size(132, 13) Me.lblSave.TabIndex = 85 @@ -879,7 +880,7 @@ Partial Class frmSAP_FuBa Me.lblResult.BackColor = System.Drawing.Color.Yellow Me.lblResult.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold) Me.lblResult.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblResult.Location = New System.Drawing.Point(8, 324) + Me.lblResult.Location = New System.Drawing.Point(11, 360) Me.lblResult.Name = "lblResult" Me.lblResult.Size = New System.Drawing.Size(155, 13) Me.lblResult.TabIndex = 87 @@ -891,11 +892,11 @@ Partial Class frmSAP_FuBa Me.btnInsertData.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnInsertData.Image = Global.DD_Record_Organizer.My.Resources.Resources.InsertColumn_5626 Me.btnInsertData.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnInsertData.Location = New System.Drawing.Point(613, 161) + Me.btnInsertData.Location = New System.Drawing.Point(611, 164) Me.btnInsertData.Name = "btnInsertData" Me.btnInsertData.Size = New System.Drawing.Size(222, 24) Me.btnInsertData.TabIndex = 88 - Me.btnInsertData.Text = "Insert results in SQL Server Table" + Me.btnInsertData.Text = "Insert SQL Server Table" Me.btnInsertData.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnInsertData.UseVisualStyleBackColor = True ' @@ -967,11 +968,11 @@ Partial Class frmSAP_FuBa Me.btnGetResult.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnGetResult.Image = Global.DD_Record_Organizer.My.Resources.Resources.TableView_nameonly_263 Me.btnGetResult.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnGetResult.Location = New System.Drawing.Point(613, 203) + Me.btnGetResult.Location = New System.Drawing.Point(613, 189) Me.btnGetResult.Name = "btnGetResult" - Me.btnGetResult.Size = New System.Drawing.Size(176, 23) + Me.btnGetResult.Size = New System.Drawing.Size(220, 23) Me.btnGetResult.TabIndex = 95 - Me.btnGetResult.Text = "SAP Result testen (LIVE)" + Me.btnGetResult.Text = "Test SAP Result to GRID (LIVE)" Me.btnGetResult.UseVisualStyleBackColor = True ' 'FuBa_SplitCharacterTextBox @@ -1015,6 +1016,7 @@ Partial Class frmSAP_FuBa ' 'XtraTabPage1 ' + Me.XtraTabPage1.Controls.Add(Me.Button3) Me.XtraTabPage1.Controls.Add(Me.TBPMO_SAP_FUBABindingNavigator) Me.XtraTabPage1.Controls.Add(Me.GridControl2) Me.XtraTabPage1.Controls.Add(Me.TempTableNameTextBox) @@ -1069,6 +1071,15 @@ Partial Class frmSAP_FuBa Me.XtraTabPage1.Size = New System.Drawing.Size(1192, 568) Me.XtraTabPage1.Text = "Fuba- und Table-Configurations" ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(839, 167) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(121, 23) + Me.Button3.TabIndex = 99 + Me.Button3.Text = "DEV - No packages" + Me.Button3.UseVisualStyleBackColor = True + ' 'XtraTabPage2 ' Me.XtraTabPage2.Controls.Add(Label21) @@ -1451,4 +1462,5 @@ Partial Class frmSAP_FuBa Friend WithEvents lblresultFunction As System.Windows.Forms.Label Friend WithEvents lblResultBAPI As System.Windows.Forms.Label Friend WithEvents txtBARCODESendlist As System.Windows.Forms.TextBox + Friend WithEvents Button3 As Button End Class diff --git a/app/DD-Record-Organizer/frmSAP_FuBa.resx b/app/DD-Record-Organizer/frmSAP_FuBa.resx index c71d83a..a9e691c 100644 --- a/app/DD-Record-Organizer/frmSAP_FuBa.resx +++ b/app/DD-Record-Organizer/frmSAP_FuBa.resx @@ -238,7 +238,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + vwAADr8BOAVTJAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -250,7 +250,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + vwAADr8BOAVTJAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -262,7 +262,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + vwAADr8BOAVTJAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -273,7 +273,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + vwAADr8BOAVTJAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -282,7 +282,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + vwAADr8BOAVTJAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -291,7 +291,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + vwAADr8BOAVTJAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -302,7 +302,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + vwAADr8BOAVTJAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= diff --git a/app/DD-Record-Organizer/frmSAP_FuBa.vb b/app/DD-Record-Organizer/frmSAP_FuBa.vb index 1847ed9..043cb60 100644 --- a/app/DD-Record-Organizer/frmSAP_FuBa.vb +++ b/app/DD-Record-Organizer/frmSAP_FuBa.vb @@ -126,20 +126,20 @@ Public Class frmSAP_FuBa If txtLimitRows.Text <> "" Then rowlimit = txtLimitRows.Text End If - Dim SAPResulttable As DataTable = New DataTable + Dim oSAPResulttable As New DataTable If rbTable.Checked = True Then - Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, rowlimit) + Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, True, rowlimit) If Not IsNothing(result) Then - SAPResulttable = result + oSAPResulttable = result End If End If If rBFuba.Checked = True Then Dim result = ClassSAP.FuBa_Returndatatable_Seperated(TableNameTextBox.Text, FuBa_SplitCharacterTextBox.Text, rowlimit) If Not IsNothing(result) Then - SAPResulttable = result + oSAPResulttable = result End If End If - If SAPResulttable Is Nothing Then + If oSAPResulttable Is Nothing Then ClassSAP.SAP_CONNECTION.Close() lblResult.Visible = False Me.Cursor = Cursors.Default @@ -148,6 +148,10 @@ Public Class frmSAP_FuBa GridView2.Columns.Clear() LOGGER.Warn("SAPResulttable is nothing") Exit Sub + Else + GridControl2.DataSource = Nothing + GridView2.Columns.Clear() + lblResult.Text = "" End If '###### Dim i = 0 @@ -155,7 +159,7 @@ Public Class frmSAP_FuBa MYDB_ECM.ExecuteNonQuery("DROP TABLE " & oTablename) Dim createtablesql = "CREATE TABLE " & oTablename & " ( " - For Each col As System.Data.DataColumn In SAPResulttable.Columns + For Each col As System.Data.DataColumn In oSAPResulttable.Columns If i = 0 Then createtablesql += "[" & col.ColumnName & "] [varchar](250)" Else @@ -189,16 +193,15 @@ Public Class frmSAP_FuBa Using bulkCopy As SqlBulkCopy = New SqlBulkCopy(SQLconnect) bulkCopy.DestinationTableName = oTablename Try - ' Write from the source to the destination. - bulkCopy.WriteToServer(SAPResulttable) + bulkCopy.WriteToServer(oSAPResulttable) Catch ex As Exception MsgBox("Unexpected Error in BulkCopy SQL: " & ex.Message, MsgBoxStyle.Critical) End Try End Using SQLconnect.Close() Me.Cursor = Cursors.Default - LOGGER.Debug("Create table from SAP FuBa was successfull " & SAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!") - MsgBox("Create table was successfull! " & vbNewLine & SAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!", MsgBoxStyle.Information) + LOGGER.Debug("Create table from SAP was successfull " & oSAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!") + MsgBox("Create table was successfull! " & vbNewLine & oSAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!", MsgBoxStyle.Information) Catch ex As Exception MsgBox("Unexpected Error in SQL bulkCopy: " & ex.Message, MsgBoxStyle.Critical) Me.Cursor = Cursors.Default @@ -250,7 +253,7 @@ Public Class frmSAP_FuBa End If If rbTable.Checked = True Then - Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, rowlimit) + Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, True, rowlimit) If Not IsNothing(result) Then SAPResulttable = result End If @@ -291,9 +294,9 @@ Public Class frmSAP_FuBa elapsed = sw.Elapsed.TotalSeconds sw.Stop() If rowlimit <> 0 And SAPResulttable.Rows.Count >= rowlimit Then - lblResult.Text = "Result (limited to " & rowlimit.ToString & " rows) - Duration: " & Format(elapsed, "0.00") & " seconds" + lblResult.Text = "Result (limited to " & rowlimit.ToString & " rows) - Duration: " & Format(elapsed, "0.00") & " seconds - " & Now.ToShortTimeString Else - lblResult.Text = "Result (unlimited) >> " & SAPResulttable.Rows.Count & " rows retrieved - Duration: " & Format(elapsed, "0.00") & " seconds" + lblResult.Text = "Result (unlimited) >> " & SAPResulttable.Rows.Count & " rows retrieved - Duration: " & Format(elapsed, "0.00") & " seconds - " & Now.ToShortTimeString End If lblResult.Visible = True Me.Cursor = Cursors.Default @@ -364,4 +367,106 @@ Public Class frmSAP_FuBa End If Me.Cursor = Cursors.Default End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + If TempTableNameTextBox.Text <> "" Then + Me.Cursor = Cursors.WaitCursor + If ClassSAP.ConnectionInit(HostTextBox.Text, SystemNumberTextBox.Text, UserNameTextBox.Text, PasswordTextBox.Text, ClientTextBox.Text, LanguageTextBox.Text) = True Then + lblConnectionopen.Visible = True + Else + lblConnectionopen.Visible = False + Me.Cursor = Cursors.Default + lblResult.Visible = False + GridControl2.DataSource = Nothing + GridView2.Columns.Clear() + lblSave.Visible = False + Exit Sub + End If + Dim rowlimit As Integer = 0 + If txtLimitRows.Text <> "" Then + rowlimit = txtLimitRows.Text + End If + Dim oSAPResulttable As New DataTable + If rbTable.Checked = True Then + Dim result = ClassSAP.Return_Datatable_for_Table(TableNameTextBox.Text, WHERE_CLAUSETextBox.Text, False, rowlimit) + If Not IsNothing(result) Then + oSAPResulttable = result + End If + End If + If rBFuba.Checked = True Then + Dim result = ClassSAP.FuBa_Returndatatable_Seperated(TableNameTextBox.Text, FuBa_SplitCharacterTextBox.Text, rowlimit) + If Not IsNothing(result) Then + oSAPResulttable = result + End If + End If + If oSAPResulttable Is Nothing Then + ClassSAP.SAP_CONNECTION.Close() + lblResult.Visible = False + Me.Cursor = Cursors.Default + lblSave.Visible = False + GridControl2.DataSource = Nothing + GridView2.Columns.Clear() + LOGGER.Warn("SAPResulttable is nothing") + Exit Sub + Else + GridControl2.DataSource = Nothing + GridView2.Columns.Clear() + lblResult.Text = "" + End If + '###### + Dim i = 0 + Dim oTablename = "[TBPMO_SAP_" & TempTableNameTextBox.Text & "]" + MYDB_ECM.ExecuteNonQuery("DROP TABLE " & oTablename) + + Dim createtablesql = "CREATE TABLE " & oTablename & " ( " + For Each col As System.Data.DataColumn In oSAPResulttable.Columns + If i = 0 Then + createtablesql += "[" & col.ColumnName & "] [varchar](250)" + Else + createtablesql += ", [" & col.ColumnName & "] [varchar](250)" + End If + i += 1 + Next + createtablesql += ", [ADDED_WHEN] DATETIME NOT NULL DEFAULT GETDATE()" + createtablesql += ")" + ''Die Tabelle anlegen + LOGGER.Debug("Create Table: " & createtablesql) + If MYDB_ECM.ExecuteNonQuery(createtablesql) = False Then + MsgBox("Error in creating TempTable: Check log", MsgBoxStyle.Critical) + Exit Sub + End If + LOGGER.Debug("table has been created") + + Dim alter = String.Format("ALTER TABLE {0} ADD GUID INTEGER NOT NULL IDENTITY(1,1)", oTablename) + MYDB_ECM.ExecuteNonQuery(alter) + alter = String.Format("ALTER TABLE {0} ADD ADDED_WHEN DATETIME NOT NULL DEFAULT GETDATE()", oTablename) + MYDB_ECM.ExecuteNonQuery(alter) + Try + 'Dim OwnerCS As String + 'OwnerCS = ClassDatabase.GetConnectionString(1) + Dim SQLconnect As New SqlClient.SqlConnection + SQLconnect.ConnectionString = MYDB_ECM.CurrentConnectionString + SQLconnect.Open() + ' Note that the column positions in the source DataTable + ' match the column positions in the destination table, + ' so there is no need to map columns. + Using bulkCopy As SqlBulkCopy = New SqlBulkCopy(SQLconnect) + bulkCopy.DestinationTableName = oTablename + Try + bulkCopy.WriteToServer(oSAPResulttable) + Catch ex As Exception + MsgBox("Unexpected Error in BulkCopy SQL: " & ex.Message, MsgBoxStyle.Critical) + End Try + End Using + SQLconnect.Close() + Me.Cursor = Cursors.Default + LOGGER.Debug("Create table from SAP was successfull " & oSAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!") + MsgBox("Create table was successfull! " & vbNewLine & oSAPResulttable.Rows.Count & " Rows were inserted to table '" & oTablename & "'!", MsgBoxStyle.Information) + Catch ex As Exception + MsgBox("Unexpected Error in SQL bulkCopy: " & ex.Message, MsgBoxStyle.Critical) + Me.Cursor = Cursors.Default + End Try + '###### + End If + End Sub End Class \ No newline at end of file