diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d669d1e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+################################################################################
+# Diese .gitignore-Datei wurde von Microsoft(R) Visual Studio automatisch erstellt.
+################################################################################
+
+/.vs/MC_SUPPLYWATCH/v15/Server/sqlite3
diff --git a/.vs/MC_SUPPLYWATCH/DesignTimeBuild/.dtbcache b/.vs/MC_SUPPLYWATCH/DesignTimeBuild/.dtbcache
new file mode 100644
index 0000000..d006879
Binary files /dev/null and b/.vs/MC_SUPPLYWATCH/DesignTimeBuild/.dtbcache differ
diff --git a/.vs/MC_SUPPLYWATCH/v15/.suo b/.vs/MC_SUPPLYWATCH/v15/.suo
index b702b4a..f0f0ea3 100644
Binary files a/.vs/MC_SUPPLYWATCH/v15/.suo and b/.vs/MC_SUPPLYWATCH/v15/.suo differ
diff --git a/.vs/Supplywatch/v15/.suo b/.vs/Supplywatch/v15/.suo
index 4e1b923..48e2c6f 100644
Binary files a/.vs/Supplywatch/v15/.suo and b/.vs/Supplywatch/v15/.suo differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index dd57552..8c5f137 100644
Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ
diff --git a/Supplywatch/ClassDatabase.vb b/Supplywatch/ClassDatabase.vb
index 99378e0..901970e 100644
--- a/Supplywatch/ClassDatabase.vb
+++ b/Supplywatch/ClassDatabase.vb
@@ -15,16 +15,18 @@
' End Try
'End Function
- Public Shared Function Return_Datatable(Select_anweisung As String, Optional userInput As Boolean = False)
+ Public Shared Function Return_Datatable(Select_anweisung As String, Optional userInput As Boolean = False, Optional _TO As Integer = 500)
Try
Dim SQLconnect As New SqlClient.SqlConnection
- Dim SQLcommand As SqlClient.SqlCommand
+ Dim SQLcommand As New SqlClient.SqlCommand
+ SQLcommand.CommandTimeout = _TO
SQLconnect.ConnectionString = My.Settings.ConfigConnectionString
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
SQLcommand.CommandText = Select_anweisung
Dim adapter1 As SqlClient.SqlDataAdapter = New SqlClient.SqlDataAdapter(SQLcommand)
+
Dim dt As DataTable = New DataTable()
adapter1.Fill(dt)
SQLconnect.Close()
diff --git a/Supplywatch/FMMain.Designer.vb b/Supplywatch/FMMain.Designer.vb
index d141a35..a4bce58 100644
--- a/Supplywatch/FMMain.Designer.vb
+++ b/Supplywatch/FMMain.Designer.vb
@@ -50,7 +50,6 @@ Partial Class FMMain
Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
- Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Me.VWRPT_SUPPLIES_TOORDERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.MyDataset = New SUPPLYWATCH.MyDataset()
Me.VWGERAET_ORDERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -145,32 +144,16 @@ Partial Class FMMain
Me.tsbtn_setBack2Besterford = New System.Windows.Forms.ToolStripButton()
Me.tsbtnSet2BestelltManually = New System.Windows.Forms.ToolStripButton()
Me.tpBestellungen = New System.Windows.Forms.TabPage()
+ Me.pnlGridOrders = New System.Windows.Forms.Panel()
Me.GridControlBestellungen = New DevExpress.XtraGrid.GridControl()
- Me.TBSUPPLY_BESTELLUNGViewBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.GridViewBestellUebersicht = New DevExpress.XtraGrid.Views.Grid.GridView()
- Me.colBestellID = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colGERAET1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colSERIEN_NR1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colSUPPLY_BEZEICHNUNG1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colMENGE1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colMENGE_ORIGIN = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colBESTELLNR = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colMARKT1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colMANUELL1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colBESTELLT_WANN1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colBESTELLT_WER1 = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.colFILE_ORDER_CONFIRM = New DevExpress.XtraGrid.Columns.GridColumn()
- Me.GroupBox6 = New System.Windows.Forms.GroupBox()
- Me.chkbDatumfilterOrder = New System.Windows.Forms.CheckBox()
- Me.dtpOrder_bis = New System.Windows.Forms.DateTimePicker()
- Me.Label12 = New System.Windows.Forms.Label()
- Me.dtpOrder_von = New System.Windows.Forms.DateTimePicker()
+ Me.pnlOrderDateSelector = New System.Windows.Forms.Panel()
Me.Label13 = New System.Windows.Forms.Label()
- Me.chbFilterMarkt_Bestellungen = New System.Windows.Forms.CheckBox()
- Me.DGTBWH_Markt_Bestellungen = New System.Windows.Forms.DataGridView()
- Me.DataGridViewTextBoxColumn15 = New System.Windows.Forms.DataGridViewTextBoxColumn()
- Me.TBWH_MARKTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
+ Me.DateTimePickerOrdervon = New System.Windows.Forms.DateTimePicker()
+ Me.DateTimePickerOrderbis = New System.Windows.Forms.DateTimePicker()
+ Me.Label12 = New System.Windows.Forms.Label()
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.BindingNavigatorCountItem3 = New System.Windows.Forms.ToolStripLabel()
Me.BindingNavigatorMoveFirstItem3 = New System.Windows.Forms.ToolStripButton()
Me.BindingNavigatorMovePreviousItem3 = New System.Windows.Forms.ToolStripButton()
@@ -182,10 +165,17 @@ Partial Class FMMain
Me.BindingNavigatorSeparator11 = New System.Windows.Forms.ToolStripSeparator()
Me.tsbRefresh_Bestellungen = New System.Windows.Forms.ToolStripButton()
Me.tsbExel_bestellungen = New System.Windows.Forms.ToolStripButton()
+ Me.tsbtOrderSelectDate = New System.Windows.Forms.ToolStripButton()
Me.TabPageBestell_Import = New System.Windows.Forms.TabPage()
- Me.chkLogData = New System.Windows.Forms.CheckBox()
Me.DataGridView2 = New System.Windows.Forms.DataGridView()
+ Me.GroupBox10 = New System.Windows.Forms.GroupBox()
Me.btnImportBestellungen = New System.Windows.Forms.Button()
+ Me.GroupBox5 = New System.Windows.Forms.GroupBox()
+ Me.btnTSR_open = New System.Windows.Forms.Button()
+ Me.Label22 = New System.Windows.Forms.Label()
+ Me.cmbMandant = New System.Windows.Forms.ComboBox()
+ Me.TBMANDANTENBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+ Me.chkLogData = New System.Windows.Forms.CheckBox()
Me.DataGridView3 = New System.Windows.Forms.DataGridView()
Me.MELDEDATUMDataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.SUPPLYLEVELDataGridViewTextBoxColumn = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -383,6 +373,7 @@ Partial Class FMMain
Me.chbFilterMarktNV = New System.Windows.Forms.CheckBox()
Me.DGVTBWH_MARKT_VF = New System.Windows.Forms.DataGridView()
Me.clmMarkt = New System.Windows.Forms.DataGridViewTextBoxColumn()
+ Me.TBWH_MARKTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.tsbtnSupplyverfolgung = New System.Windows.Forms.ToolStrip()
Me.ToolStripButton30 = New System.Windows.Forms.ToolStripButton()
Me.ToolStripButton10 = New System.Windows.Forms.ToolStripButton()
@@ -448,7 +439,6 @@ Partial Class FMMain
Me.ToolStripButton27 = New System.Windows.Forms.ToolStripButton()
Me.GroupBox12 = New System.Windows.Forms.GroupBox()
Me.FILTERTextBox = New System.Windows.Forms.TextBox()
- Me.TBMANDANTENBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBMANDANTENDataGridView = New System.Windows.Forms.DataGridView()
Me.DataGridViewTextBoxColumn21 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.DataGridViewTextBoxColumn22 = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -650,6 +640,7 @@ Partial Class FMMain
Me.ViewSUPPLY_STATUS_VERFOLGUNGTableAdapter = New SUPPLYWATCH.MyDatasetTableAdapters.ViewSUPPLY_STATUS_VERFOLGUNGTableAdapter()
Me.VWSUPPLIES_BESTELLUNG_GESENDETTableAdapter = New SUPPLYWATCH.MyDatasetTableAdapters.VWSUPPLIES_BESTELLUNG_GESENDETTableAdapter()
Me.VWSUPPLIES_2_ORDERTableAdapter = New SUPPLYWATCH.MyDatasetTableAdapters.VWSUPPLIES_2_ORDERTableAdapter()
+ Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
GEAENDERTWANNLabel = New System.Windows.Forms.Label()
GEAENDERTWERLabel = New System.Windows.Forms.Label()
STATUS_SDLabel = New System.Windows.Forms.Label()
@@ -696,16 +687,18 @@ Partial Class FMMain
CType(Me.BindingNavigator4, System.ComponentModel.ISupportInitialize).BeginInit()
Me.BindingNavigator4.SuspendLayout()
Me.tpBestellungen.SuspendLayout()
+ Me.pnlGridOrders.SuspendLayout()
CType(Me.GridControlBestellungen, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.TBSUPPLY_BESTELLUNGViewBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridViewBestellUebersicht, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.GroupBox6.SuspendLayout()
- CType(Me.DGTBWH_Markt_Bestellungen, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.TBWH_MARKTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.TBSUPPLY_BESTELLUNGViewBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.SuspendLayout()
+ Me.pnlOrderDateSelector.SuspendLayout()
+ CType(Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.SuspendLayout()
+ CType(Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPageBestell_Import.SuspendLayout()
CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.GroupBox10.SuspendLayout()
+ Me.GroupBox5.SuspendLayout()
+ CType(Me.TBMANDANTENBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DataGridView3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.VWSUPPLY_VERFOLGUNGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.BindingNavigator3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -759,6 +752,7 @@ Partial Class FMMain
Me.Panel2.SuspendLayout()
Me.GroupBox7.SuspendLayout()
CType(Me.DGVTBWH_MARKT_VF, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TBWH_MARKTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tsbtnSupplyverfolgung.SuspendLayout()
Me.tpEinstellungen.SuspendLayout()
Me.TabControlEinstellungen.SuspendLayout()
@@ -774,7 +768,6 @@ Partial Class FMMain
CType(Me.TBSUPPLY_DEFINITIONBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TBSUPPLY_DEFINITIONBindingNavigator.SuspendLayout()
Me.GroupBox12.SuspendLayout()
- CType(Me.TBMANDANTENBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBMANDANTENDataGridView, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBMANDANTENBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TBMANDANTENBindingNavigator.SuspendLayout()
@@ -1834,9 +1827,9 @@ Partial Class FMMain
'tpBestellungen
'
Me.tpBestellungen.AutoScroll = True
- Me.tpBestellungen.Controls.Add(Me.GridControlBestellungen)
- Me.tpBestellungen.Controls.Add(Me.GroupBox6)
- Me.tpBestellungen.Controls.Add(Me.TBSUPPLY_BESTELLUNGViewBindingNavigator)
+ Me.tpBestellungen.Controls.Add(Me.pnlGridOrders)
+ Me.tpBestellungen.Controls.Add(Me.pnlOrderDateSelector)
+ Me.tpBestellungen.Controls.Add(Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator)
Me.tpBestellungen.Location = New System.Drawing.Point(4, 22)
Me.tpBestellungen.Name = "tpBestellungen"
Me.tpBestellungen.Padding = New System.Windows.Forms.Padding(3)
@@ -1845,22 +1838,25 @@ Partial Class FMMain
Me.tpBestellungen.Text = "Bestell-Übersichten"
Me.tpBestellungen.UseVisualStyleBackColor = True
'
+ 'pnlGridOrders
+ '
+ Me.pnlGridOrders.Controls.Add(Me.GridControlBestellungen)
+ Me.pnlGridOrders.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.pnlGridOrders.Location = New System.Drawing.Point(3, 69)
+ Me.pnlGridOrders.Name = "pnlGridOrders"
+ Me.pnlGridOrders.Size = New System.Drawing.Size(1269, 234)
+ Me.pnlGridOrders.TabIndex = 7
+ '
'GridControlBestellungen
'
- Me.GridControlBestellungen.DataSource = Me.TBSUPPLY_BESTELLUNGViewBindingSource
Me.GridControlBestellungen.Dock = System.Windows.Forms.DockStyle.Fill
- Me.GridControlBestellungen.Location = New System.Drawing.Point(332, 28)
+ Me.GridControlBestellungen.Location = New System.Drawing.Point(0, 0)
Me.GridControlBestellungen.MainView = Me.GridViewBestellUebersicht
Me.GridControlBestellungen.Name = "GridControlBestellungen"
- Me.GridControlBestellungen.Size = New System.Drawing.Size(940, 275)
+ Me.GridControlBestellungen.Size = New System.Drawing.Size(1269, 234)
Me.GridControlBestellungen.TabIndex = 4
Me.GridControlBestellungen.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewBestellUebersicht})
'
- 'TBSUPPLY_BESTELLUNGViewBindingSource
- '
- Me.TBSUPPLY_BESTELLUNGViewBindingSource.DataMember = "VWSUPPLY_BESTELLUNG_FRONTEND"
- Me.TBSUPPLY_BESTELLUNGViewBindingSource.DataSource = Me.MyDataset
- '
'GridViewBestellUebersicht
'
Me.GridViewBestellUebersicht.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
@@ -1869,7 +1865,6 @@ Partial Class FMMain
Me.GridViewBestellUebersicht.Appearance.OddRow.Options.UseBackColor = True
Me.GridViewBestellUebersicht.Appearance.SelectedRow.BackColor = System.Drawing.Color.Magenta
Me.GridViewBestellUebersicht.Appearance.SelectedRow.Options.UseBackColor = True
- Me.GridViewBestellUebersicht.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBestellID, Me.colGERAET1, Me.colSERIEN_NR1, Me.colSUPPLY_BEZEICHNUNG1, Me.colMENGE1, Me.colMENGE_ORIGIN, Me.colBESTELLNR, Me.colMARKT1, Me.colMANUELL1, Me.colBESTELLT_WANN1, Me.colBESTELLT_WER1, Me.colFILE_ORDER_CONFIRM})
Me.GridViewBestellUebersicht.GridControl = Me.GridControlBestellungen
Me.GridViewBestellUebersicht.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always
Me.GridViewBestellUebersicht.Name = "GridViewBestellUebersicht"
@@ -1883,245 +1878,75 @@ Partial Class FMMain
Me.GridViewBestellUebersicht.OptionsView.EnableAppearanceOddRow = True
Me.GridViewBestellUebersicht.OptionsView.ShowAutoFilterRow = True
'
- 'colBestellID
+ 'pnlOrderDateSelector
'
- Me.colBestellID.Caption = "Bestell-ID"
- Me.colBestellID.FieldName = "GUID"
- Me.colBestellID.Name = "colBestellID"
- Me.colBestellID.OptionsColumn.AllowEdit = False
- Me.colBestellID.Visible = True
- Me.colBestellID.VisibleIndex = 0
- '
- 'colGERAET1
- '
- Me.colGERAET1.Caption = "Gerät"
- Me.colGERAET1.FieldName = "GERAET"
- Me.colGERAET1.Name = "colGERAET1"
- Me.colGERAET1.OptionsColumn.AllowEdit = False
- Me.colGERAET1.Visible = True
- Me.colGERAET1.VisibleIndex = 1
- '
- 'colSERIEN_NR1
- '
- Me.colSERIEN_NR1.Caption = "Serial"
- Me.colSERIEN_NR1.FieldName = "SERIEN_NR"
- Me.colSERIEN_NR1.Name = "colSERIEN_NR1"
- Me.colSERIEN_NR1.OptionsColumn.AllowEdit = False
- Me.colSERIEN_NR1.Visible = True
- Me.colSERIEN_NR1.VisibleIndex = 2
- '
- 'colSUPPLY_BEZEICHNUNG1
- '
- Me.colSUPPLY_BEZEICHNUNG1.Caption = "Supply"
- Me.colSUPPLY_BEZEICHNUNG1.FieldName = "SUPPLY_BEZEICHNUNG"
- Me.colSUPPLY_BEZEICHNUNG1.Name = "colSUPPLY_BEZEICHNUNG1"
- Me.colSUPPLY_BEZEICHNUNG1.OptionsColumn.AllowEdit = False
- Me.colSUPPLY_BEZEICHNUNG1.Visible = True
- Me.colSUPPLY_BEZEICHNUNG1.VisibleIndex = 3
- '
- 'colMENGE1
- '
- Me.colMENGE1.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.colMENGE1.AppearanceCell.Options.UseBackColor = True
- Me.colMENGE1.Caption = "Menge"
- Me.colMENGE1.FieldName = "MENGE"
- Me.colMENGE1.Name = "colMENGE1"
- Me.colMENGE1.Visible = True
- Me.colMENGE1.VisibleIndex = 4
- '
- 'colMENGE_ORIGIN
- '
- Me.colMENGE_ORIGIN.Caption = "Menge Orig."
- Me.colMENGE_ORIGIN.FieldName = "MENGE_ORIGIN"
- Me.colMENGE_ORIGIN.Name = "colMENGE_ORIGIN"
- Me.colMENGE_ORIGIN.Visible = True
- Me.colMENGE_ORIGIN.VisibleIndex = 5
- '
- 'colBESTELLNR
- '
- Me.colBESTELLNR.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.colBESTELLNR.AppearanceCell.Options.UseBackColor = True
- Me.colBESTELLNR.Caption = "Bestell Nr"
- Me.colBESTELLNR.FieldName = "BESTELLNR"
- Me.colBESTELLNR.Name = "colBESTELLNR"
- Me.colBESTELLNR.Visible = True
- Me.colBESTELLNR.VisibleIndex = 6
- '
- 'colMARKT1
- '
- Me.colMARKT1.Caption = "Markt"
- Me.colMARKT1.FieldName = "MARKT"
- Me.colMARKT1.Name = "colMARKT1"
- Me.colMARKT1.OptionsColumn.AllowEdit = False
- Me.colMARKT1.Visible = True
- Me.colMARKT1.VisibleIndex = 7
- '
- 'colMANUELL1
- '
- Me.colMANUELL1.Caption = "Manuell"
- Me.colMANUELL1.FieldName = "MANUELL"
- Me.colMANUELL1.Name = "colMANUELL1"
- Me.colMANUELL1.OptionsColumn.AllowEdit = False
- Me.colMANUELL1.Visible = True
- Me.colMANUELL1.VisibleIndex = 8
- '
- 'colBESTELLT_WANN1
- '
- Me.colBESTELLT_WANN1.Caption = "Bestellt wann"
- Me.colBESTELLT_WANN1.FieldName = "BESTELLT_WANN"
- Me.colBESTELLT_WANN1.Name = "colBESTELLT_WANN1"
- Me.colBESTELLT_WANN1.OptionsColumn.AllowEdit = False
- Me.colBESTELLT_WANN1.Visible = True
- Me.colBESTELLT_WANN1.VisibleIndex = 10
- '
- 'colBESTELLT_WER1
- '
- Me.colBESTELLT_WER1.Caption = "Bestellt wer"
- Me.colBESTELLT_WER1.FieldName = "BESTELLT_WER"
- Me.colBESTELLT_WER1.Name = "colBESTELLT_WER1"
- Me.colBESTELLT_WER1.OptionsColumn.AllowEdit = False
- Me.colBESTELLT_WER1.Visible = True
- Me.colBESTELLT_WER1.VisibleIndex = 9
- '
- 'colFILE_ORDER_CONFIRM
- '
- Me.colFILE_ORDER_CONFIRM.Caption = "File-Order"
- Me.colFILE_ORDER_CONFIRM.FieldName = "FILE_ORDER_CONFIRM"
- Me.colFILE_ORDER_CONFIRM.Name = "colFILE_ORDER_CONFIRM"
- Me.colFILE_ORDER_CONFIRM.OptionsColumn.AllowEdit = False
- Me.colFILE_ORDER_CONFIRM.Visible = True
- Me.colFILE_ORDER_CONFIRM.VisibleIndex = 11
- '
- 'GroupBox6
- '
- Me.GroupBox6.Controls.Add(Me.chkbDatumfilterOrder)
- Me.GroupBox6.Controls.Add(Me.dtpOrder_bis)
- Me.GroupBox6.Controls.Add(Me.Label12)
- Me.GroupBox6.Controls.Add(Me.dtpOrder_von)
- Me.GroupBox6.Controls.Add(Me.Label13)
- Me.GroupBox6.Controls.Add(Me.chbFilterMarkt_Bestellungen)
- Me.GroupBox6.Controls.Add(Me.DGTBWH_Markt_Bestellungen)
- Me.GroupBox6.Dock = System.Windows.Forms.DockStyle.Left
- Me.GroupBox6.Location = New System.Drawing.Point(3, 28)
- Me.GroupBox6.Name = "GroupBox6"
- Me.GroupBox6.Size = New System.Drawing.Size(329, 275)
- Me.GroupBox6.TabIndex = 2
- Me.GroupBox6.TabStop = False
- Me.GroupBox6.Text = "Märkte und Datumsfilter:"
- '
- 'chkbDatumfilterOrder
- '
- Me.chkbDatumfilterOrder.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.chkbDatumfilterOrder.AutoSize = True
- Me.chkbDatumfilterOrder.Location = New System.Drawing.Point(6, 166)
- Me.chkbDatumfilterOrder.Name = "chkbDatumfilterOrder"
- Me.chkbDatumfilterOrder.Size = New System.Drawing.Size(89, 17)
- Me.chkbDatumfilterOrder.TabIndex = 12
- Me.chkbDatumfilterOrder.Text = "Datumsfilter"
- Me.chkbDatumfilterOrder.UseVisualStyleBackColor = True
- '
- 'dtpOrder_bis
- '
- Me.dtpOrder_bis.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.dtpOrder_bis.Enabled = False
- Me.dtpOrder_bis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
- Me.dtpOrder_bis.Location = New System.Drawing.Point(6, 249)
- Me.dtpOrder_bis.Name = "dtpOrder_bis"
- Me.dtpOrder_bis.Size = New System.Drawing.Size(118, 22)
- Me.dtpOrder_bis.TabIndex = 11
- '
- 'Label12
- '
- Me.Label12.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.Label12.AutoSize = True
- Me.Label12.Location = New System.Drawing.Point(3, 233)
- Me.Label12.Name = "Label12"
- Me.Label12.Size = New System.Drawing.Size(95, 13)
- Me.Label12.TabIndex = 10
- Me.Label12.Text = "Bestelldatum bis:"
- '
- 'dtpOrder_von
- '
- Me.dtpOrder_von.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
- Me.dtpOrder_von.Enabled = False
- Me.dtpOrder_von.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
- Me.dtpOrder_von.Location = New System.Drawing.Point(6, 205)
- Me.dtpOrder_von.Name = "dtpOrder_von"
- Me.dtpOrder_von.Size = New System.Drawing.Size(118, 22)
- Me.dtpOrder_von.TabIndex = 9
+ Me.pnlOrderDateSelector.Controls.Add(Me.Label13)
+ Me.pnlOrderDateSelector.Controls.Add(Me.DateTimePickerOrdervon)
+ Me.pnlOrderDateSelector.Controls.Add(Me.DateTimePickerOrderbis)
+ Me.pnlOrderDateSelector.Controls.Add(Me.Label12)
+ Me.pnlOrderDateSelector.Dock = System.Windows.Forms.DockStyle.Top
+ Me.pnlOrderDateSelector.Location = New System.Drawing.Point(3, 28)
+ Me.pnlOrderDateSelector.Name = "pnlOrderDateSelector"
+ Me.pnlOrderDateSelector.Size = New System.Drawing.Size(1269, 41)
+ Me.pnlOrderDateSelector.TabIndex = 6
+ Me.pnlOrderDateSelector.Visible = False
'
'Label13
'
- Me.Label13.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
Me.Label13.AutoSize = True
- Me.Label13.Location = New System.Drawing.Point(3, 189)
+ Me.Label13.Location = New System.Drawing.Point(155, 14)
Me.Label13.Name = "Label13"
- Me.Label13.Size = New System.Drawing.Size(99, 13)
- Me.Label13.TabIndex = 8
- Me.Label13.Text = "Bestelldatum von:"
+ Me.Label13.Size = New System.Drawing.Size(59, 13)
+ Me.Label13.TabIndex = 3
+ Me.Label13.Text = "Datum bis"
'
- 'chbFilterMarkt_Bestellungen
+ 'DateTimePickerOrdervon
'
- Me.chbFilterMarkt_Bestellungen.AutoSize = True
- Me.chbFilterMarkt_Bestellungen.Location = New System.Drawing.Point(6, 21)
- Me.chbFilterMarkt_Bestellungen.Name = "chbFilterMarkt_Bestellungen"
- Me.chbFilterMarkt_Bestellungen.Size = New System.Drawing.Size(79, 17)
- Me.chbFilterMarkt_Bestellungen.TabIndex = 2
- Me.chbFilterMarkt_Bestellungen.Text = "Filter aktiv"
- Me.chbFilterMarkt_Bestellungen.UseVisualStyleBackColor = True
+ Me.DateTimePickerOrdervon.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+ Me.DateTimePickerOrdervon.Location = New System.Drawing.Point(72, 11)
+ Me.DateTimePickerOrdervon.Name = "DateTimePickerOrdervon"
+ Me.DateTimePickerOrdervon.Size = New System.Drawing.Size(77, 22)
+ Me.DateTimePickerOrdervon.TabIndex = 0
'
- 'DGTBWH_Markt_Bestellungen
+ 'DateTimePickerOrderbis
'
- Me.DGTBWH_Markt_Bestellungen.AllowUserToAddRows = False
- Me.DGTBWH_Markt_Bestellungen.AllowUserToDeleteRows = False
- DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
- Me.DGTBWH_Markt_Bestellungen.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
- Me.DGTBWH_Markt_Bestellungen.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.DGTBWH_Markt_Bestellungen.AutoGenerateColumns = False
- Me.DGTBWH_Markt_Bestellungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.DGTBWH_Markt_Bestellungen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn15})
- Me.DGTBWH_Markt_Bestellungen.DataSource = Me.TBWH_MARKTBindingSource
- Me.DGTBWH_Markt_Bestellungen.Location = New System.Drawing.Point(6, 44)
- Me.DGTBWH_Markt_Bestellungen.Name = "DGTBWH_Markt_Bestellungen"
- Me.DGTBWH_Markt_Bestellungen.ReadOnly = True
- Me.DGTBWH_Markt_Bestellungen.RowHeadersVisible = False
- Me.DGTBWH_Markt_Bestellungen.Size = New System.Drawing.Size(316, 116)
- Me.DGTBWH_Markt_Bestellungen.TabIndex = 1
- Me.DGTBWH_Markt_Bestellungen.Visible = False
+ Me.DateTimePickerOrderbis.Format = System.Windows.Forms.DateTimePickerFormat.[Short]
+ Me.DateTimePickerOrderbis.Location = New System.Drawing.Point(220, 11)
+ Me.DateTimePickerOrderbis.Name = "DateTimePickerOrderbis"
+ Me.DateTimePickerOrderbis.Size = New System.Drawing.Size(89, 22)
+ Me.DateTimePickerOrderbis.TabIndex = 1
'
- 'DataGridViewTextBoxColumn15
+ 'Label12
'
- Me.DataGridViewTextBoxColumn15.DataPropertyName = "MARKT"
- Me.DataGridViewTextBoxColumn15.HeaderText = "Markt"
- Me.DataGridViewTextBoxColumn15.Name = "DataGridViewTextBoxColumn15"
- Me.DataGridViewTextBoxColumn15.ReadOnly = True
- Me.DataGridViewTextBoxColumn15.Width = 220
+ Me.Label12.AutoSize = True
+ Me.Label12.Location = New System.Drawing.Point(3, 14)
+ Me.Label12.Name = "Label12"
+ Me.Label12.Size = New System.Drawing.Size(63, 13)
+ Me.Label12.TabIndex = 2
+ Me.Label12.Text = "Datum von"
'
- 'TBWH_MARKTBindingSource
+ 'VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator
'
- Me.TBWH_MARKTBindingSource.DataMember = "TBWH_MARKT"
- Me.TBWH_MARKTBindingSource.DataSource = Me.MyDataset
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.AddNewItem = Nothing
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.BindingSource = Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingSource
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.CountItem = Me.BindingNavigatorCountItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.CountItemFormat = "von {0} Bestellungen"
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.DeleteItem = Nothing
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.tsbRefresh_Bestellungen, Me.tsbExel_bestellungen, Me.tsbtOrderSelectDate})
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Location = New System.Drawing.Point(3, 3)
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Name = "VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator"
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Size = New System.Drawing.Size(1269, 25)
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.TabIndex = 0
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.Text = "BindingNavigator1"
'
- 'TBSUPPLY_BESTELLUNGViewBindingNavigator
+ 'VWSUPPLY_BESTELLUNG_FRONTENDBindingSource
'
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.AddNewItem = Nothing
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.BindingSource = Me.TBSUPPLY_BESTELLUNGViewBindingSource
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.CountItem = Me.BindingNavigatorCountItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.CountItemFormat = "von {0} Bestellungen"
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.DeleteItem = Nothing
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem3, Me.BindingNavigatorMovePreviousItem3, Me.BindingNavigatorSeparator9, Me.BindingNavigatorPositionItem3, Me.BindingNavigatorCountItem3, Me.BindingNavigatorSeparator10, Me.BindingNavigatorMoveNextItem3, Me.BindingNavigatorMoveLastItem3, Me.BindingNavigatorSeparator11, Me.tsbRefresh_Bestellungen, Me.tsbExel_bestellungen})
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.Location = New System.Drawing.Point(3, 3)
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.Name = "TBSUPPLY_BESTELLUNGViewBindingNavigator"
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem3
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.Size = New System.Drawing.Size(1269, 25)
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.TabIndex = 0
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.Text = "BindingNavigator1"
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingSource.AllowNew = False
'
'BindingNavigatorCountItem3
'
@@ -2208,55 +2033,131 @@ Partial Class FMMain
Me.tsbExel_bestellungen.Size = New System.Drawing.Size(23, 22)
Me.tsbExel_bestellungen.Text = "Export Excel"
'
+ 'tsbtOrderSelectDate
+ '
+ Me.tsbtOrderSelectDate.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+ Me.tsbtOrderSelectDate.CheckOnClick = True
+ Me.tsbtOrderSelectDate.Image = CType(resources.GetObject("tsbtOrderSelectDate.Image"), System.Drawing.Image)
+ Me.tsbtOrderSelectDate.ImageTransparentColor = System.Drawing.Color.Magenta
+ Me.tsbtOrderSelectDate.Name = "tsbtOrderSelectDate"
+ Me.tsbtOrderSelectDate.Size = New System.Drawing.Size(146, 22)
+ Me.tsbtOrderSelectDate.Text = "Datumseinschränkung"
+ '
'TabPageBestell_Import
'
- Me.TabPageBestell_Import.Controls.Add(Me.chkLogData)
Me.TabPageBestell_Import.Controls.Add(Me.DataGridView2)
- Me.TabPageBestell_Import.Controls.Add(Me.btnImportBestellungen)
+ Me.TabPageBestell_Import.Controls.Add(Me.GroupBox10)
+ Me.TabPageBestell_Import.Controls.Add(Me.GroupBox5)
+ Me.TabPageBestell_Import.Controls.Add(Me.chkLogData)
Me.TabPageBestell_Import.Location = New System.Drawing.Point(4, 22)
Me.TabPageBestell_Import.Name = "TabPageBestell_Import"
Me.TabPageBestell_Import.Padding = New System.Windows.Forms.Padding(3)
Me.TabPageBestell_Import.Size = New System.Drawing.Size(1275, 306)
Me.TabPageBestell_Import.TabIndex = 3
- Me.TabPageBestell_Import.Text = "Import Bestellungen-Reports"
+ Me.TabPageBestell_Import.Text = "Import Reports"
Me.TabPageBestell_Import.UseVisualStyleBackColor = True
'
- 'chkLogData
- '
- Me.chkLogData.AutoSize = True
- Me.chkLogData.Location = New System.Drawing.Point(859, 42)
- Me.chkLogData.Name = "chkLogData"
- Me.chkLogData.Size = New System.Drawing.Size(119, 17)
- Me.chkLogData.TabIndex = 3
- Me.chkLogData.Text = "Log Excel cell data"
- Me.chkLogData.UseVisualStyleBackColor = True
- '
'DataGridView2
'
Me.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
- Me.DataGridView2.Location = New System.Drawing.Point(7, 66)
+ Me.DataGridView2.Location = New System.Drawing.Point(385, 56)
Me.DataGridView2.Name = "DataGridView2"
- Me.DataGridView2.Size = New System.Drawing.Size(971, 150)
- Me.DataGridView2.TabIndex = 2
+ Me.DataGridView2.Size = New System.Drawing.Size(825, 225)
+ Me.DataGridView2.TabIndex = 7
+ '
+ 'GroupBox10
+ '
+ Me.GroupBox10.Controls.Add(Me.btnImportBestellungen)
+ Me.GroupBox10.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox10.Location = New System.Drawing.Point(6, 6)
+ Me.GroupBox10.Name = "GroupBox10"
+ Me.GroupBox10.Size = New System.Drawing.Size(239, 84)
+ Me.GroupBox10.TabIndex = 6
+ Me.GroupBox10.TabStop = False
+ Me.GroupBox10.Text = "Bestell-Report"
'
'btnImportBestellungen
'
+ Me.btnImportBestellungen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnImportBestellungen.Image = Global.SUPPLYWATCH.My.Resources.Resources.fghfgh
Me.btnImportBestellungen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnImportBestellungen.Location = New System.Drawing.Point(6, 6)
+ Me.btnImportBestellungen.Location = New System.Drawing.Point(6, 21)
Me.btnImportBestellungen.Name = "btnImportBestellungen"
- Me.btnImportBestellungen.Size = New System.Drawing.Size(185, 53)
+ Me.btnImportBestellungen.Size = New System.Drawing.Size(221, 53)
Me.btnImportBestellungen.TabIndex = 1
Me.btnImportBestellungen.Text = "Import Bestellungen"
Me.btnImportBestellungen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
Me.btnImportBestellungen.UseVisualStyleBackColor = True
'
+ 'GroupBox5
+ '
+ Me.GroupBox5.Controls.Add(Me.btnTSR_open)
+ Me.GroupBox5.Controls.Add(Me.Label22)
+ Me.GroupBox5.Controls.Add(Me.cmbMandant)
+ Me.GroupBox5.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox5.Location = New System.Drawing.Point(6, 96)
+ Me.GroupBox5.Name = "GroupBox5"
+ Me.GroupBox5.Size = New System.Drawing.Size(239, 133)
+ Me.GroupBox5.TabIndex = 5
+ Me.GroupBox5.TabStop = False
+ Me.GroupBox5.Text = "Toner Shipment Report"
+ '
+ 'btnTSR_open
+ '
+ Me.btnTSR_open.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btnTSR_open.Image = Global.SUPPLYWATCH.My.Resources.Resources.fghfgh
+ Me.btnTSR_open.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+ Me.btnTSR_open.Location = New System.Drawing.Point(6, 70)
+ Me.btnTSR_open.Name = "btnTSR_open"
+ Me.btnTSR_open.Size = New System.Drawing.Size(221, 53)
+ Me.btnTSR_open.TabIndex = 4
+ Me.btnTSR_open.Text = "Auswahl Datei und Start"
+ Me.btnTSR_open.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+ Me.btnTSR_open.UseVisualStyleBackColor = True
+ '
+ 'Label22
+ '
+ Me.Label22.AutoSize = True
+ Me.Label22.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label22.Location = New System.Drawing.Point(6, 23)
+ Me.Label22.Name = "Label22"
+ Me.Label22.Size = New System.Drawing.Size(116, 13)
+ Me.Label22.TabIndex = 7
+ Me.Label22.Text = "Mandant auswählen:"
+ '
+ 'cmbMandant
+ '
+ Me.cmbMandant.DataSource = Me.TBMANDANTENBindingSource
+ Me.cmbMandant.DisplayMember = "NAME"
+ Me.cmbMandant.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.cmbMandant.FormattingEnabled = True
+ Me.cmbMandant.Location = New System.Drawing.Point(6, 39)
+ Me.cmbMandant.Name = "cmbMandant"
+ Me.cmbMandant.Size = New System.Drawing.Size(179, 21)
+ Me.cmbMandant.TabIndex = 6
+ Me.cmbMandant.ValueMember = "GUID"
+ '
+ 'TBMANDANTENBindingSource
+ '
+ Me.TBMANDANTENBindingSource.DataMember = "TBMANDANTEN"
+ Me.TBMANDANTENBindingSource.DataSource = Me.MyDataset
+ '
+ 'chkLogData
+ '
+ Me.chkLogData.AutoSize = True
+ Me.chkLogData.Location = New System.Drawing.Point(385, 22)
+ Me.chkLogData.Name = "chkLogData"
+ Me.chkLogData.Size = New System.Drawing.Size(103, 17)
+ Me.chkLogData.TabIndex = 3
+ Me.chkLogData.Text = "Detail-Logging"
+ Me.chkLogData.UseVisualStyleBackColor = True
+ '
'DataGridView3
'
Me.DataGridView3.AllowUserToAddRows = False
Me.DataGridView3.AllowUserToDeleteRows = False
- DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
- Me.DataGridView3.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+ DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
+ Me.DataGridView3.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
Me.DataGridView3.AutoGenerateColumns = False
Me.DataGridView3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView3.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.MELDEDATUMDataGridViewTextBoxColumn1, Me.SUPPLYLEVELDataGridViewTextBoxColumn, Me.STATUSDataGridViewTextBoxColumn1, Me.ERFASSTWANNDataGridViewTextBoxColumn1})
@@ -2635,8 +2536,8 @@ Partial Class FMMain
'
Me.TBWH_STATUSFILTERDataGridView.AllowUserToAddRows = False
Me.TBWH_STATUSFILTERDataGridView.AllowUserToDeleteRows = False
- DataGridViewCellStyle3.BackColor = System.Drawing.Color.Fuchsia
- Me.TBWH_STATUSFILTERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+ DataGridViewCellStyle2.BackColor = System.Drawing.Color.Fuchsia
+ Me.TBWH_STATUSFILTERDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
Me.TBWH_STATUSFILTERDataGridView.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.TBWH_STATUSFILTERDataGridView.AutoGenerateColumns = False
@@ -3087,8 +2988,8 @@ Partial Class FMMain
'
Me.TBCHANGE_LOG_GERAETDataGridView.AllowUserToAddRows = False
Me.TBCHANGE_LOG_GERAETDataGridView.AllowUserToDeleteRows = False
- DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
- Me.TBCHANGE_LOG_GERAETDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+ DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
+ Me.TBCHANGE_LOG_GERAETDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
Me.TBCHANGE_LOG_GERAETDataGridView.AutoGenerateColumns = False
Me.TBCHANGE_LOG_GERAETDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.TBCHANGE_LOG_GERAETDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn4, Me.ERFASSTWANN})
@@ -3238,8 +3139,8 @@ Partial Class FMMain
Me.VWSUPPLIES_AKTUELLDataGridView.AllowUserToAddRows = False
Me.VWSUPPLIES_AKTUELLDataGridView.AllowUserToDeleteRows = False
Me.VWSUPPLIES_AKTUELLDataGridView.AllowUserToOrderColumns = True
- DataGridViewCellStyle5.BackColor = System.Drawing.Color.Yellow
- Me.VWSUPPLIES_AKTUELLDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
+ DataGridViewCellStyle4.BackColor = System.Drawing.Color.Yellow
+ Me.VWSUPPLIES_AKTUELLDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
Me.VWSUPPLIES_AKTUELLDataGridView.AutoGenerateColumns = False
Me.VWSUPPLIES_AKTUELLDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.VWSUPPLIES_AKTUELLDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.VWSUPPLIES_AKTUELLDataGridViewSupplyID, Me.DataGridViewTextBoxColumn38, Me.DataGridViewTextBoxColumn39, Me.DataGridViewTextBoxColumn40, Me.DataGridViewTextBoxColumn41, Me.DataGridViewTextBoxColumn42, Me.DataGridViewTextBoxColumn44, Me.DataGridViewTextBoxColumn50, Me.DataGridViewTextBoxColumn49, Me.VWSUPPLIES_AKTUELLDataGridViewOnHold, Me.DataGridViewTextBoxColumn51, Me.DataGridViewTextBoxColumn45, Me.DataGridViewTextBoxColumn46, Me.DataGridViewTextBoxColumn47})
@@ -3358,8 +3259,8 @@ Partial Class FMMain
'
Me.DataGridView1.AllowUserToAddRows = False
Me.DataGridView1.AllowUserToDeleteRows = False
- DataGridViewCellStyle6.BackColor = System.Drawing.Color.Lime
- Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
+ DataGridViewCellStyle5.BackColor = System.Drawing.Color.Lime
+ Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
Me.DataGridView1.AutoGenerateColumns = False
Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.DataGridView1.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.MeldedatumDataGridViewTextBoxColumn, Me.StatusDataGridViewTextBoxColumn, Me.MarkerDataGridViewTextBoxColumn, Me.ErfasstWannDataGridViewTextBoxColumn})
@@ -3741,7 +3642,7 @@ Partial Class FMMain
'
'tscmbaktiv
'
- Me.tscmbaktiv.Items.AddRange(New Object() {"Nur aktive Geräte", "Inaktive Geräte"})
+ Me.tscmbaktiv.Items.AddRange(New Object() {"Nur aktive Geräte", "Inaktive Geräte", "Abgebaute Geräte"})
Me.tscmbaktiv.Name = "tscmbaktiv"
Me.tscmbaktiv.Size = New System.Drawing.Size(121, 25)
'
@@ -4013,8 +3914,8 @@ Partial Class FMMain
'
Me.DGVTBWH_MARKT_VF.AllowUserToAddRows = False
Me.DGVTBWH_MARKT_VF.AllowUserToDeleteRows = False
- DataGridViewCellStyle7.BackColor = System.Drawing.Color.Cyan
- Me.DGVTBWH_MARKT_VF.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+ DataGridViewCellStyle6.BackColor = System.Drawing.Color.Cyan
+ Me.DGVTBWH_MARKT_VF.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
Me.DGVTBWH_MARKT_VF.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)
@@ -4038,6 +3939,11 @@ Partial Class FMMain
Me.clmMarkt.ReadOnly = True
Me.clmMarkt.Width = 220
'
+ 'TBWH_MARKTBindingSource
+ '
+ Me.TBWH_MARKTBindingSource.DataMember = "TBWH_MARKT"
+ Me.TBWH_MARKTBindingSource.DataSource = Me.MyDataset
+ '
'tsbtnSupplyverfolgung
'
Me.tsbtnSupplyverfolgung.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton30, Me.ToolStripButton10, Me.tsProgressBar, Me.tslbl_Files, Me.tsbtnManaulOrders, Me.tsbtnAbbrechen, Me.ToolStripDropDownButton1, Me.ToolStripSeparator4, Me.tsbtnNAchverfolgung, Me.ToolStripSeparator10, Me.ToolStripLabel3, Me.cmbMandanten})
@@ -4200,8 +4106,8 @@ Partial Class FMMain
'
'TBSTATUSDataGridView
'
- DataGridViewCellStyle8.BackColor = System.Drawing.Color.Aqua
- Me.TBSTATUSDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+ DataGridViewCellStyle7.BackColor = System.Drawing.Color.Aqua
+ Me.TBSTATUSDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
Me.TBSTATUSDataGridView.AutoGenerateColumns = False
Me.TBSTATUSDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.TBSTATUSDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.statusBezeichnung, Me.StatusBeschreibung, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.Statusgeaendertwer, Me.DataGridViewTextBoxColumn8})
@@ -4385,8 +4291,8 @@ Partial Class FMMain
'TBSUPPLY_DEFINITIONDataGridView
'
Me.TBSUPPLY_DEFINITIONDataGridView.AllowUserToOrderColumns = True
- DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer))
- Me.TBSUPPLY_DEFINITIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+ DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.TBSUPPLY_DEFINITIONDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
Me.TBSUPPLY_DEFINITIONDataGridView.AutoGenerateColumns = False
Me.TBSUPPLY_DEFINITIONDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.TBSUPPLY_DEFINITIONDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn20, Me.DataGridViewTextBoxColumn26, Me.SUPPLY_NAME_DATEI, Me.DataGridViewTextBoxColumn28, Me.DataGridViewTextBoxColumn30, Me.DataGridViewTextBoxColumn31, Me.DataGridViewTextBoxColumn32})
@@ -4604,17 +4510,12 @@ Partial Class FMMain
Me.FILTERTextBox.Size = New System.Drawing.Size(409, 22)
Me.FILTERTextBox.TabIndex = 21
'
- 'TBMANDANTENBindingSource
- '
- Me.TBMANDANTENBindingSource.DataMember = "TBMANDANTEN"
- Me.TBMANDANTENBindingSource.DataSource = Me.MyDataset
- '
'TBMANDANTENDataGridView
'
Me.TBMANDANTENDataGridView.AllowUserToAddRows = False
Me.TBMANDANTENDataGridView.AllowUserToDeleteRows = False
- DataGridViewCellStyle10.BackColor = System.Drawing.Color.Cyan
- Me.TBMANDANTENDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
+ DataGridViewCellStyle9.BackColor = System.Drawing.Color.Cyan
+ Me.TBMANDANTENDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
Me.TBMANDANTENDataGridView.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)
@@ -6290,6 +6191,11 @@ Partial Class FMMain
'
Me.VWSUPPLIES_2_ORDERTableAdapter.ClearBeforeFill = True
'
+ 'OpenFileDialog1
+ '
+ Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+ Me.OpenFileDialog1.RestoreDirectory = True
+ '
'FMMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -6339,19 +6245,22 @@ Partial Class FMMain
Me.BindingNavigator4.PerformLayout()
Me.tpBestellungen.ResumeLayout(False)
Me.tpBestellungen.PerformLayout()
+ Me.pnlGridOrders.ResumeLayout(False)
CType(Me.GridControlBestellungen, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.TBSUPPLY_BESTELLUNGViewBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridViewBestellUebersicht, System.ComponentModel.ISupportInitialize).EndInit()
- Me.GroupBox6.ResumeLayout(False)
- Me.GroupBox6.PerformLayout()
- CType(Me.DGTBWH_Markt_Bestellungen, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.TBWH_MARKTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.TBSUPPLY_BESTELLUNGViewBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.ResumeLayout(False)
- Me.TBSUPPLY_BESTELLUNGViewBindingNavigator.PerformLayout()
+ Me.pnlOrderDateSelector.ResumeLayout(False)
+ Me.pnlOrderDateSelector.PerformLayout()
+ CType(Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.ResumeLayout(False)
+ Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator.PerformLayout()
+ CType(Me.VWSUPPLY_BESTELLUNG_FRONTENDBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPageBestell_Import.ResumeLayout(False)
Me.TabPageBestell_Import.PerformLayout()
CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.GroupBox10.ResumeLayout(False)
+ Me.GroupBox5.ResumeLayout(False)
+ Me.GroupBox5.PerformLayout()
+ CType(Me.TBMANDANTENBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DataGridView3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.VWSUPPLY_VERFOLGUNGBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.BindingNavigator3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -6420,6 +6329,7 @@ Partial Class FMMain
Me.GroupBox7.ResumeLayout(False)
Me.GroupBox7.PerformLayout()
CType(Me.DGVTBWH_MARKT_VF, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TBWH_MARKTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
Me.tsbtnSupplyverfolgung.ResumeLayout(False)
Me.tsbtnSupplyverfolgung.PerformLayout()
Me.tpEinstellungen.ResumeLayout(False)
@@ -6441,7 +6351,6 @@ Partial Class FMMain
Me.TBSUPPLY_DEFINITIONBindingNavigator.PerformLayout()
Me.GroupBox12.ResumeLayout(False)
Me.GroupBox12.PerformLayout()
- CType(Me.TBMANDANTENBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBMANDANTENDataGridView, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBMANDANTENBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
Me.TBMANDANTENBindingNavigator.ResumeLayout(False)
@@ -6654,11 +6563,7 @@ Partial Class FMMain
Friend WithEvents TBWH_STATUS5TableAdapter As SUPPLYWATCH.MyDatasetTableAdapters.TBWH_STATUS5TableAdapter
Friend WithEvents tsborders As System.Windows.Forms.ToolStripButton
Friend WithEvents tpBestellungen As System.Windows.Forms.TabPage
- Friend WithEvents GroupBox6 As System.Windows.Forms.GroupBox
- Friend WithEvents chbFilterMarkt_Bestellungen As System.Windows.Forms.CheckBox
- Friend WithEvents DGTBWH_Markt_Bestellungen As System.Windows.Forms.DataGridView
- Friend WithEvents DataGridViewTextBoxColumn15 As System.Windows.Forms.DataGridViewTextBoxColumn
- Friend WithEvents TBSUPPLY_BESTELLUNGViewBindingNavigator As System.Windows.Forms.BindingNavigator
+ Friend WithEvents VWSUPPLY_BESTELLUNG_FRONTENDBindingNavigator As System.Windows.Forms.BindingNavigator
Friend WithEvents BindingNavigatorCountItem3 As System.Windows.Forms.ToolStripLabel
Friend WithEvents BindingNavigatorMoveFirstItem3 As System.Windows.Forms.ToolStripButton
Friend WithEvents BindingNavigatorMovePreviousItem3 As System.Windows.Forms.ToolStripButton
@@ -6669,7 +6574,7 @@ Partial Class FMMain
Friend WithEvents BindingNavigatorMoveLastItem3 As System.Windows.Forms.ToolStripButton
Friend WithEvents BindingNavigatorSeparator11 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents tsbRefresh_Bestellungen As System.Windows.Forms.ToolStripButton
- Friend WithEvents TBSUPPLY_BESTELLUNGViewBindingSource As System.Windows.Forms.BindingSource
+ Friend WithEvents VWSUPPLY_BESTELLUNG_FRONTENDBindingSource As System.Windows.Forms.BindingSource
Friend WithEvents TBSUPPLY_BESTELLUNGViewTableAdapter As SUPPLYWATCH.MyDatasetTableAdapters.VWSUPPLY_BESTELLUNG_FRONTENDTableAdapter
Friend WithEvents tsbexcel_geraete As System.Windows.Forms.ToolStripButton
Friend WithEvents tsbExcel_Supplies As System.Windows.Forms.ToolStripButton
@@ -6691,11 +6596,6 @@ Partial Class FMMain
Friend WithEvents chkbDatumfilter As System.Windows.Forms.CheckBox
Friend WithEvents VWSUPPLY_VERFOLGUNGBindingSource As System.Windows.Forms.BindingSource
Friend WithEvents VWSUPPLY_VERFOLGUNGTableAdapter As SUPPLYWATCH.MyDatasetTableAdapters.VWSUPPLY_VERFOLGUNGTableAdapter
- Friend WithEvents chkbDatumfilterOrder As System.Windows.Forms.CheckBox
- Friend WithEvents dtpOrder_bis As System.Windows.Forms.DateTimePicker
- Friend WithEvents Label12 As System.Windows.Forms.Label
- Friend WithEvents dtpOrder_von As System.Windows.Forms.DateTimePicker
- Friend WithEvents Label13 As System.Windows.Forms.Label
Friend WithEvents Label14 As System.Windows.Forms.Label
Friend WithEvents txtConfigPath As System.Windows.Forms.TextBox
Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
@@ -6876,7 +6776,6 @@ Partial Class FMMain
Friend WithEvents ToolStripSeparator10 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents ToolStripLabel3 As System.Windows.Forms.ToolStripLabel
Friend WithEvents cmbMandanten As System.Windows.Forms.ToolStripComboBox
- Friend WithEvents DataGridView2 As System.Windows.Forms.DataGridView
Private WithEvents rptViewerBestellungen As Microsoft.Reporting.WinForms.ReportViewer
Friend WithEvents tsbtnChangelog As System.Windows.Forms.ToolStripButton
Friend WithEvents TBCHANGE_LOG_GERAETBindingSource As System.Windows.Forms.BindingSource
@@ -6975,17 +6874,6 @@ Partial Class FMMain
Friend WithEvents tsbtnSet2BestelltManually As System.Windows.Forms.ToolStripButton
Friend WithEvents GridControlBestellungen As DevExpress.XtraGrid.GridControl
Friend WithEvents GridViewBestellUebersicht As DevExpress.XtraGrid.Views.Grid.GridView
- Friend WithEvents colBestellID As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colGERAET1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colSERIEN_NR1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colSUPPLY_BEZEICHNUNG1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colMENGE1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colBESTELLNR As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colMARKT1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colMANUELL1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colBESTELLT_WANN1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colBESTELLT_WER1 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colFILE_ORDER_CONFIRM As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents GridControlGeraete As DevExpress.XtraGrid.GridControl
Friend WithEvents GridViewGeraete As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents GUID As DevExpress.XtraGrid.Columns.GridColumn
@@ -7082,9 +6970,7 @@ Partial Class FMMain
Friend WithEvents colGUI_SELECTED As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents colGUID As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents chkLogData As System.Windows.Forms.CheckBox
- Friend WithEvents Panel1 As System.Windows.Forms.Panel
Friend WithEvents SplitContainerGeraet As DevExpress.XtraEditors.SplitContainerControl
- Friend WithEvents Panel2 As System.Windows.Forms.Panel
Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator
Friend WithEvents BindingNavigatorCountItem7 As System.Windows.Forms.ToolStripLabel
Friend WithEvents BindingNavigatorMoveFirstItem7 As System.Windows.Forms.ToolStripButton
@@ -7104,5 +6990,20 @@ Partial Class FMMain
Friend WithEvents tsbtnManaulOrders As ToolStripButton
Friend WithEvents ToolStripSeparator4 As ToolStripSeparator
Friend WithEvents colMENGE2 As DevExpress.XtraGrid.Columns.GridColumn
- Friend WithEvents colMENGE_ORIGIN As DevExpress.XtraGrid.Columns.GridColumn
+ Friend WithEvents btnTSR_open As Button
+ Friend WithEvents OpenFileDialog1 As OpenFileDialog
+ Friend WithEvents GroupBox5 As GroupBox
+ Friend WithEvents cmbMandant As ComboBox
+ Friend WithEvents Label22 As Label
+ Friend WithEvents GroupBox10 As GroupBox
+ Friend WithEvents DataGridView2 As DataGridView
+ Friend WithEvents tsbtOrderSelectDate As ToolStripButton
+ Friend WithEvents pnlGridOrders As Panel
+ Friend WithEvents pnlOrderDateSelector As Panel
+ Friend WithEvents Label13 As Label
+ Friend WithEvents DateTimePickerOrdervon As DateTimePicker
+ Friend WithEvents DateTimePickerOrderbis As DateTimePicker
+ Friend WithEvents Label12 As Label
+ Friend WithEvents Panel1 As Panel
+ Friend WithEvents Panel2 As Panel
End Class
diff --git a/Supplywatch/FMMain.resx b/Supplywatch/FMMain.resx
index 981d394..7a8be7f 100644
--- a/Supplywatch/FMMain.resx
+++ b/Supplywatch/FMMain.resx
@@ -166,16 +166,16 @@
False
- 543, 290
+ 277, 329
824, 17
- 922, 251
+ 508, 290
- 17, 290
+ 976, 290
444, 17
@@ -219,10 +219,10 @@
- 1303, 173
+ 734, 212
- 505, 641
+ 844, 680
191, 17
@@ -268,10 +268,10 @@
- 975, 602
+ 17, 680
- 351, 641
+ 690, 680
@@ -313,14 +313,11 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
- 881, 329
+
+ 17, 56
-
- 17, 251
-
-
- 812, 173
+
+ 719, 134
@@ -362,11 +359,22 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABmSURBVDhPrc5BCoAwDERRz5YD26Opm2wrESZIm9aMWvgk
+ Wny4qGr90gWIyKv+B/btCLO7shZ/tp0GgOBjiwbaOoDNAWQvoz+IcgDnDjxN7EMg0xSIJkoBbTQQTZQC
+ Mg0Bpg7g03oCWsjBUV6taqgAAAAASUVORK5CYII=
+
+
+
+ 533, 602
+
- 750, 368
+ 292, 407
- 821, 602
+ 1084, 641
@@ -409,13 +417,13 @@
- 826, 212
+ 287, 251
- 958, 95
+ 230, 134
- 825, 56
+ 17, 95
@@ -458,16 +466,16 @@
- 1116, 173
+ 547, 212
True
- 706, 563
+ 967, 602
- 1012, 641
+ 17, 719
@@ -510,13 +518,13 @@
- 431, 251
+ 17, 290
- 17, 602
+ 280, 641
- 667, 602
+ 930, 641
@@ -559,7 +567,7 @@
- 17, 173
+ 1057, 173
@@ -602,7 +610,7 @@
- 622, 56
+ 1207, 56
@@ -645,10 +653,10 @@
- 17, 212
+ 877, 212
- 461, 524
+ 641, 563
@@ -690,14 +698,17 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+
+ 885, 251
+
- 328, 134
+ 17, 173
- 504, 134
+ 193, 173
- 1221, 212
+ 682, 251
@@ -743,10 +754,10 @@
True
- 228, 446
+ 228, 485
- 915, 134
+ 604, 173
@@ -788,11 +799,8 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
-
- 272, 563
-
- 508, 95
+ 1157, 95
@@ -850,25 +858,25 @@
934, 17
- 449, 329
+ 230, 368
- 17, 329
+ 1228, 329
- 17, 95
+ 666, 95
- 1042, 56
+ 234, 95
- 190, 56
+ 775, 56
- 734, 446
+ 734, 485
- 17, 134
+ 1054, 134
@@ -911,13 +919,13 @@
- 1233, 407
+ 1031, 446
- 1291, 368
+ 833, 407
- 690, 134
+ 379, 173
@@ -960,10 +968,10 @@
- 219, 407
+ 17, 446
- 236, 95
+ 885, 95
@@ -1013,7 +1021,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA2
- CwAAAk1TRnQBSQFMAgEBAwEAAYgBIQGIASEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CwAAAk1TRnQBSQFMAgEBAwEAAdgBIwHYASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1064,160 +1072,163 @@
- 17, 368
+ 944, 368
- 17, 485
+ 17, 524
587, 17
- 1174, 17
+ 368, 56
- 17, 56
+ 602, 56
- 409, 56
+ 994, 56
- 1261, 56
+ 453, 95
- 745, 95
+ 17, 134
- 1205, 95
+ 477, 134
- 1187, 134
+ 876, 173
- 282, 173
+ 17, 212
- 550, 173
+ 285, 212
- 281, 212
+ 1141, 212
- 556, 212
+ 17, 251
- 1026, 212
+ 487, 251
- 227, 251
+ 1095, 251
- 679, 251
+ 265, 290
- 1159, 251
+ 745, 290
- 283, 290
+ 17, 329
- 829, 290
+ 563, 329
- 1110, 290
+ 844, 329
- 1305, 290
+ 1039, 329
- 236, 329
+ 17, 368
- 668, 329
+ 449, 368
- 1168, 329
+ 662, 368
- 249, 368
+ 1176, 368
- 475, 368
-
-
- 1023, 368
-
-
17, 407
+
+ 565, 407
+
+
+ 1041, 407
+
- 474, 407
+ 272, 446
- 723, 407
+ 521, 446
- 981, 407
+ 779, 446
- 17, 446
+ 17, 485
- 484, 446
+ 484, 485
- 1028, 446
+ 1028, 485
- 332, 485
+ 332, 524
- 641, 485
+ 641, 524
- 767, 485
+ 767, 524
- 1023, 485
+ 1023, 524
- 1273, 485
-
-
- 17, 524
-
-
- 242, 524
-
-
- 709, 524
-
-
- 951, 524
-
-
- 1132, 524
-
-
17, 563
+
+ 197, 563
+
+
+ 422, 563
+
+
+ 889, 563
+
+
+ 1131, 563
+
+
+ 17, 602
+
+
+ 278, 602
+
- 492, 563
+ 753, 602
- 975, 563
-
-
- 345, 602
-
-
17, 641
+
+ 608, 641
+
+
+ 356, 680
+
- 761, 641
+ 1100, 680
+
+
+ 171, 719
- 208
+ 187
diff --git a/Supplywatch/FMMain.vb b/Supplywatch/FMMain.vb
index 0d2237c..2b2b76c 100644
--- a/Supplywatch/FMMain.vb
+++ b/Supplywatch/FMMain.vb
@@ -3,6 +3,7 @@ Imports Excel = Microsoft.Office.Interop.Excel
Imports System.ComponentModel
Imports System.Data.SqlClient
Imports System.IO
+Imports System.Data.OleDb
Public Class FMMain
Dim FormLoaded As Boolean = False
@@ -43,7 +44,7 @@ Public Class FMMain
Try
Me.tscmbaktiv.SelectedIndex = 0
'IP-Adresse-Auslesen
- Dim Addresslist() As IPAddress = _
+ Dim Addresslist() As IPAddress =
Dns.GetHostEntry(Dns.GetHostName()).AddressList
Dim IPs As IPAddress
For Each IPs In Addresslist
@@ -141,7 +142,7 @@ Public Class FMMain
Load_Datagrid(TBSTATUSDataGridView, "TBSTATUSDataGridView")
Load_Datagrid(VWSUPPLIES_AKTUELLDataGridView, "VWSUPPLIES_AKTUELLDataGridView")
Load_Datagrid(TBWH_STATUSFILTERDataGridView, "TBWH_STATUSFILTERDataGridView")
- Load_Datagrid(DGTBWH_Markt_Bestellungen, "DGTBWH_Markt_Bestellungen")
+
Load_Datagrid(TBSUPPLY_DEFINITIONDataGridView, "TBSUPPLY_DEFINITIONDataGridView")
Load_GridLayout_BestGesendet()
Load_GridLayout_Bestuebersicht()
@@ -173,7 +174,7 @@ Public Class FMMain
Save_Datagrid(VWSUPPLIES_AKTUELLDataGridView, "VWSUPPLIES_AKTUELLDataGridView")
Save_Datagrid(TBSTATUSDataGridView, "TBSTATUSDataGridView")
Save_Datagrid(TBWH_STATUSFILTERDataGridView, "TBWH_STATUSFILTERDataGridView")
- Save_Datagrid(DGTBWH_Markt_Bestellungen, "DGTBWH_Markt_Bestellungen")
+
Save_Datagrid(TBSUPPLY_DEFINITIONDataGridView, "TBSUPPLY_DEFINITIONDataGridView")
Save_GridLayout_BestGesendet()
Save_GridLayout_Bestuebersicht()
@@ -402,13 +403,28 @@ Public Class FMMain
cmbMandanten.BackColor = Color.White
Me.Cursor = Cursors.WaitCursor
- Dim aktiv As Boolean
If Me.tscmbaktiv.SelectedIndex = 0 Then
- aktiv = 1
+ FILTER_DEVICE = ""
+
Else
- aktiv = 0
+ FILTER_DEVICE = tscmbaktiv.Text
+
End If
- Me.TBGERAETTableAdapter.Fill(Me.MyDataset.TBGERAET, aktiv, mandant_id)
+ Select Case Me.tscmbaktiv.Text
+ Case "Nur aktive Geräte"
+ Me.TBGERAETTableAdapter.Fill(Me.MyDataset.TBGERAET, True, mandant_id)
+ Case "Inaktive Geräte"
+ Me.TBGERAETTableAdapter.Fill(Me.MyDataset.TBGERAET, False, mandant_id)
+ Case "Abgebaute Geräte"
+ Me.TBGERAETTableAdapter.FillByAbgebaut1(Me.MyDataset.TBGERAET, mandant_id)
+ End Select
+
+
+
+
+
+
+
Me.MyDataset.VWSUPPLIES_AKTUELL.Clear()
Else
@@ -540,7 +556,7 @@ Public Class FMMain
Gesamtfiles = 0
Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
For Each file As IO.FileInfo In diPfad.GetFiles()
- If file.Name.ToUpper.EndsWith(".XLS") Then
+ If (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLS")) Or (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLSX")) Then
Gesamtfiles = Gesamtfiles + 1
End If
Next
@@ -552,240 +568,359 @@ Public Class FMMain
End If
End Sub
Private Sub bwBestellungen_verarbeiten_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
- Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
- Dim Progress As Integer = 0
- Dim Counter As Integer = 0
- For Each file As IO.FileInfo In diPfad.GetFiles()
- ' Dim vDatum As String = ""
- If file.Name.ToUpper.EndsWith(".XLS") Then
- Anzahl_Dateien = Anzahl_Dateien + 1
- Progress += 25
- 'bwXMLverarbeiten.ReportProgress(Progress)
- 'Dim str As String = file.Name
- ''1106271'
- 'vDatum = file.Name.Substring(4, 2) & "." & file.Name.Substring(2, 2) & ".20" & file.Name.Substring(0, 2)
+ Try
+ Dim _errorsOrders As String = ""
+ Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
+ Dim Progress As Integer = 0
+ Dim Counter As Integer = 0
+ ClassLoggerSW.Init("", "Supply_Watch", False)
- 'MsgBox(vDatum & vbNewLine & file.FullName)
- Dim _DS As New DataSet
- 'Datei auslesen und Dataset rückgeben lassen
- _DS = XLSReader(file.FullName, file.Name)
- If _DS Is Nothing Then
- MsgBox("Datei: " & vbNewLine & file.FullName & vbNewLine & " wurde nicht verarbeitet!", MsgBoxStyle.Exclamation, "Achtung:")
- Anzahl_Dateien = Anzahl_Dateien - 1
- Else
- 'MsgBox("Anzahl: " & _DS.Tables(0).Rows.Count & vbNewLine & "Hier müssten jetzt die Updates erfolgen")
- Dim DT As System.Data.DataTable
- Dim DR As System.Data.DataRow
- ' Dim DC As System.Data.DataColumn
- '' --- DataSet zuweisen
- 'DS = Me.MyDataset
- '' --- Zugriff auf Tabelle
- DT = _DS.Tables(0)
- Dim idxGeraet, idxSerial, idxVertrag, idxMarkt, idxSupplyID As Integer
+ For Each file As IO.FileInfo In diPfad.GetFiles()
+ ' Dim vDatum As String = ""
+ If (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLS")) Or (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLSX")) Then
+ Anzahl_Dateien = Anzahl_Dateien + 1
+ Progress += 25
+ 'bwXMLverarbeiten.ReportProgress(Progress)
+ 'Dim str As String = file.Name
+ ''1106271'
+ 'vDatum = file.Name.Substring(4, 2) & "." & file.Name.Substring(2, 2) & ".20" & file.Name.Substring(0, 2)
- Dim _gerät, _markt, _seriennr, _Supply, _Part As String
- Dim _VAS
- Dim _BestellSupplyID As String
- Dim _SupplyID As Integer
- Dim _BestellID As Integer
- Dim _returnvalueGeraet, _returnvalueSerial, _returnvalueSupplyID, _returnvalueVAS As Type
- 'Überprüfen wie die Datei aufgebaut/bearbeitet wurde?
- Dim RowIndex = 0
- Dim GeraetebezeichnungHook
- Dim GeraetebezeichnungHook1
-
- For Each DR In DT.Rows
- _VAS = Nothing
- idxGeraet = 99
-
- If RowIndex >= 5 Then
- GeraetebezeichnungHook = DR.Item(0)
- GeraetebezeichnungHook1 = DR.Item(1)
- If GeraetebezeichnungHook.GetType.ToString <> "System.DBNull" Then
- If GeraetebezeichnungHook = "Gerätebezeichnung" Then
- idxGeraet = 0
- End If
- Else
- If GeraetebezeichnungHook1.GetType.ToString <> "System.DBNull" Then
- If GeraetebezeichnungHook1 = "Gerätebezeichnung" Then
- GeraetebezeichnungHook = "Gerätebezeichnung"
- idxGeraet = 1
- End If
- End If
- End If
- End If
-
- 'Dim Rowstring = DR.Item(0)
- 'Dim Rowstring1 = DR.Item(1)
- 'If Rowstring.GetType.ToString <> "System.DBNull" Then
- ' If Rowstring.ToString.StartsWith("HP") Then
- ' idxGeraet = 0
- ' End If
- 'Else
- ' If Rowstring1.GetType.ToString <> "System.DBNull" Then
- ' Rowstring = Rowstring1
- ' End If
-
- 'End If
-
- 'If DR.Item(1).GetType.ToString <> "System.DBNull" Then
- ' If Rowstring.ToString.StartsWith("HP") Then
- ' idxGeraet = 1
- ' End If
- 'End If
- If idxGeraet < 99 Then
- Exit For
- End If
-
- RowIndex += 1
- Next
- If idxGeraet = 99 Then
- MsgBox("In der Datei konnte keine gültige Devicedefinition gefunden werden!", MsgBoxStyle.Exclamation)
+ 'MsgBox(vDatum & vbNewLine & file.FullName)
+ Dim _DS As New DataSet
+ 'Datei auslesen und Dataset rückgeben lassen
+ _DS = XLSReader(file.FullName, "RptOrder_Supplies")
+ If _DS Is Nothing Then
+ MsgBox("Datei: " & vbNewLine & file.Name & vbNewLine & " wurde nicht verarbeitet!" & vbNewLine & "Prüfen Sie ob der Name des Tabellenblattes RptOrder_Supplies ist?!", MsgBoxStyle.Exclamation, "Achtung:")
+ Anzahl_Dateien = Anzahl_Dateien - 1
Else
- If GeraetebezeichnungHook = "Gerätebezeichnung" Then
- End If
- Dim zaehler As Integer = 0
- For Each DR In DT.Rows
- _gerät = ""
- _seriennr = ""
- _markt = ""
- _SupplyID = 0
- _BestellSupplyID = ""
- _BestellID = 0
- _Supply = ""
- 'If zaehler >= 6 Then
- ' MsgBox("_gerät " & DR.Item(1) & vbNewLine & _
- '"_seriennr " & DR.Item(2) & vbNewLine & _
- ' "_markt: " & DR.Item(4) & vbNewLine & _
- ' "_SupplyID: " & DR.Item(5))
- 'End If
- _returnvalueGeraet = DR.Item(idxGeraet).GetType()
- _returnvalueSerial = DR.Item(idxGeraet + 1).GetType()
- _returnvalueSupplyID = DR.Item(idxGeraet + 4).GetType()
- _returnvalueVAS = DR.Item(idxGeraet + 9).GetType()
- If _returnvalueGeraet.ToString <> "System.DBNull" Then
- If _returnvalueSerial.ToString <> "System.DBNull" Then
- If _returnvalueSupplyID.ToString <> "System.DBNull" And _returnvalueVAS.ToString <> "System.DBNull" Then
- Dim Device = DR.Item(idxGeraet)
- If CStr(Device) <> "Gerätebezeichnung" Then '.StartsWith("HP") Then
- _gerät = DR.Item(idxGeraet)
- _seriennr = DR.Item(idxGeraet + 1)
- _markt = DR.Item(idxGeraet + 3)
- _BestellSupplyID = RTrim(LTrim(DR.Item(idxGeraet + 4)))
- '_SupplyID = DR.Item(idxGeraet + 4)
- _Supply = DR.Item(idxGeraet + 5)
- _VAS = RTrim(LTrim(DR.Item(idxGeraet + 9).ToString)).ToString.Replace(" ", "")
- _VAS = _VAS.Replace(vbCr, "").Replace(vbLf, "")
- _VAS = _VAS.ToString.Where(Function(x) Not Char.IsWhiteSpace(x)).ToArray()
- ' Convert to String data.
- Dim value As New String(_VAS)
- _VAS = value
- If chkLogData.Checked Then
- Dim msg = "Device: '" & _gerät & "'" & vbNewLine &
- "Serial: '" & _seriennr & "'" & vbNewLine &
- "Markt: '" & _markt & "'" & vbNewLine &
- "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine &
- "Supply: '" & _gerät & "'" & vbNewLine &
- "VAS#: '" & _VAS & "'"
- ClassLogger.Add(msg, False)
+ 'MsgBox("Anzahl: " & _DS.Tables(0).Rows.Count & vbNewLine & "Hier müssten jetzt die Updates erfolgen")
+ Dim DT As System.Data.DataTable
+ Dim DR As System.Data.DataRow
+ ' Dim DC As System.Data.DataColumn
+ '' --- DataSet zuweisen
+ 'DS = Me.MyDataset
+ '' --- Zugriff auf Tabelle
+ DT = _DS.Tables(0)
+ If DT.Rows.Count > 0 Then
+ Dim idxGeraet, idxSerial, idxVertrag, idxMarkt, idxSupplyID As Integer
+
+ Dim _gerät, _markt, _seriennr, _Supply, _Part, _Anzahl As String
+ Dim _VAS As String
+ Dim _BestellSupplyID As String
+ Dim _SupplyID As Integer
+ Dim _BestellID
+ Dim _returnvalueGeraet, _returnvalueSerial, _returnvalueSupplyID, _returnValueCount, _returnvalueVAS As Type
+ 'Überprüfen wie die Datei aufgebaut/bearbeitet wurde?
+ Dim RowIndex = 0
+ Dim GeraetebezeichnungHook
+ Dim GeraetebezeichnungHook1
+
+ For Each DR In DT.Rows
+ _VAS = Nothing
+ idxGeraet = 99
+
+ If RowIndex >= 5 Then
+ GeraetebezeichnungHook = DR.Item(0)
+ GeraetebezeichnungHook1 = DR.Item(1)
+ If GeraetebezeichnungHook.GetType.ToString <> "System.DBNull" Then
+ If GeraetebezeichnungHook = "Gerätebezeichnung" Then
+ idxGeraet = 0
+ End If
+ Else
+ If GeraetebezeichnungHook1.GetType.ToString <> "System.DBNull" Then
+ If GeraetebezeichnungHook1 = "Gerätebezeichnung" Then
+ GeraetebezeichnungHook = "Gerätebezeichnung"
+ idxGeraet = 1
End If
- If _BestellSupplyID.StartsWith("#2") Then 'reguläre Bestellung kommt zurück
- _SupplyID = _BestellSupplyID.Replace("#2", "")
- Dim sql = String.Format("SELECT ISNULL(MAX(GUID), 0) FROM TBSUPPLY_BESTELLUNG WHERE (SUPPLY_ID = {0})", _SupplyID)
- _BestellID = ClassDatabase.Execute_Scalar(sql, True)
- ElseIf _BestellSupplyID.StartsWith("#1") Then 'manuelle Bestellung kommt zurück
- _BestellID = _BestellSupplyID.Replace("#1", "")
- End If
-
- 'Dim GUID As Integer = TBSUPPLY_BESTELLUNGViewTableAdapter.cmdgetID_ORDER_SUPPLYID(_SupplyID)
- 'MsgBox(GUID)
- If _BestellID <> 0 Then
- If _VAS <> String.Empty Then
- Try
- Dim vasint = CInt(_VAS)
- Catch ex As Exception
- If _VAS.ToLower.StartsWith("pa") Then
-
- Else
- MsgBox("Achtung:" & vbNewLine & "Die Bestellnummer '" & _VAS & "' entspricht nicht den Vorgaben. (Numerisch oder beginnend mit 'PA')")
- Continue For
- End If
- End Try
- Dim upd
- Try
- upd = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLNR = '{0}', FILE_ORDER_CONFIRM = '{1}' WHERE GUID = {2}", _VAS, file.Name, _BestellID)
-
- If ClassDatabase.Execute_non_Query(upd, True) = True Then
- Counter = Counter + 1
- End If
- Catch ex As Exception
- MsgBox("Error in update Bestellnr:" & vbNewLine & ex.Message & vbNewLine & "Command copied to clipboard", MsgBoxStyle.Critical)
- My.Computer.Clipboard.SetText(upd)
- End Try
-
- 'TBSUPPLY_BESTELLUNGViewTableAdapter.cmdUpdateVAS(_VAS, file.Name, GUID)
- Else
- MsgBox("Achtung:" & vbNewLine & "Es liegt keine Bestellnummer für die Supply-ID: " & _SupplyID & " vor.")
- End If
- End If
- Else
- ClassLoggerSW.Add(">> Device is not defined for OrderImport: '" & Device & "'", False)
End If
End If
End If
+
+ 'Dim Rowstring = DR.Item(0)
+ 'Dim Rowstring1 = DR.Item(1)
+ 'If Rowstring.GetType.ToString <> "System.DBNull" Then
+ ' If Rowstring.ToString.StartsWith("HP") Then
+ ' idxGeraet = 0
+ ' End If
+ 'Else
+ ' If Rowstring1.GetType.ToString <> "System.DBNull" Then
+ ' Rowstring = Rowstring1
+ ' End If
+
+ 'End If
+
+ 'If DR.Item(1).GetType.ToString <> "System.DBNull" Then
+ ' If Rowstring.ToString.StartsWith("HP") Then
+ ' idxGeraet = 1
+ ' End If
+ 'End If
+ If idxGeraet < 99 Then
+ Exit For
+ End If
+
+ RowIndex += 1
+ Next
+ If idxGeraet = 99 Then
+ MsgBox("In der Datei konnte keine gültige Devicedefinition gefunden werden!", MsgBoxStyle.Exclamation)
+ Else
+ If GeraetebezeichnungHook = "Gerätebezeichnung" Then
+
+ End If
+ Dim zaehler As Integer = 0
+ For Each DR In DT.Rows
+ _gerät = ""
+ _seriennr = ""
+ _markt = ""
+ _SupplyID = 0
+ _BestellSupplyID = ""
+ _BestellID = 0
+ _Supply = ""
+ _Anzahl = "1"
+ 'If zaehler >= 6 Then
+ ' MsgBox("_gerät " & DR.Item(1) & vbNewLine & _
+ '"_seriennr " & DR.Item(2) & vbNewLine & _
+ ' "_markt: " & DR.Item(4) & vbNewLine & _
+ ' "_SupplyID: " & DR.Item(5))
+ 'End If
+ _returnvalueGeraet = DR.Item(idxGeraet).GetType()
+ _returnvalueSerial = DR.Item(idxGeraet + 1).GetType()
+ _returnvalueSupplyID = DR.Item(idxGeraet + 4).GetType()
+ _returnValueCount = DR.Item(idxGeraet + 5).GetType()
+ _returnvalueVAS = DR.Item(idxGeraet + 9).GetType()
+ If _returnvalueGeraet.ToString <> "System.DBNull" Then
+ If _returnvalueSerial.ToString <> "System.DBNull" Then
+ If _returnvalueSupplyID.ToString <> "System.DBNull" Then 'And _returnvalueVAS.ToString <> "System.DBNull"
+ Dim Device = DR.Item(idxGeraet)
+ If CStr(Device) <> "Gerätebezeichnung" Then '.StartsWith("HP") Then
+ _gerät = DR.Item(idxGeraet)
+ _seriennr = DR.Item(idxGeraet + 1)
+ _markt = DR.Item(idxGeraet + 3)
+ _BestellSupplyID = RTrim(LTrim(DR.Item(idxGeraet + 4)))
+ '_SupplyID = DR.Item(idxGeraet + 4)
+ _Supply = DR.Item(idxGeraet + 5)
+
+
+
+ Dim _count = DR.Item(6)
+ If IsDBNull(_count) Then
+ _Anzahl = "1"
+ Else
+ _Anzahl = _count
+ End If
+
+ Dim _vasno = DR.Item(idxGeraet + 9).ToString
+
+ _VAS = RTrim(LTrim(DR.Item(idxGeraet + 9).ToString)).ToString.Replace(" ", "")
+ _VAS = _VAS.Replace(vbCr, "").Replace(vbLf, "")
+ _VAS = _VAS.Replace("\n", "").Replace("\r", "")
+ _VAS = _VAS.Replace(vbCrLf, "")
+ _VAS = _VAS.ToString.Where(Function(x) Not Char.IsWhiteSpace(x)).ToArray()
+ ' Convert to String data.
+ Dim value As New String(_VAS)
+ _VAS = value
+ If chkLogData.Checked Then
+ Dim msg = "Device: '" & _gerät & "'" & vbNewLine &
+ "Serial: '" & _seriennr & "'" & vbNewLine &
+ "Markt: '" & _markt & "'" & vbNewLine &
+ "OrderSupplyID: '" & _BestellSupplyID & "'" & vbNewLine &
+ "Supply: '" & _Supply & "'" & vbNewLine &
+ "VAS#: '" & _VAS & "'"
+ ClassLogger.Add(msg, False)
+ End If
+
+ If _BestellSupplyID.StartsWith("#2") Then 'reguläre Bestellung kommt zurück
+ _BestellID = _BestellSupplyID.Replace("#2", "")
+
+ 'Dim sql = String.Format("SELECT ISNULL(MAX(GUID), 0) FROM TBSUPPLY_BESTELLUNG WHERE (SUPPLY_ID = {0})", _SupplyID)
+ '_BestellID = ClassDatabase.Execute_Scalar(sql, True)
+ ElseIf _BestellSupplyID.StartsWith("#1") Then 'manuelle Bestellung kommt zurück
+ _BestellID = _BestellSupplyID.Replace("#1", "")
+ End If
+
+ 'Dim GUID As Integer = TBSUPPLY_BESTELLUNGViewTableAdapter.cmdgetID_ORDER_SUPPLYID(_SupplyID)
+ 'MsgBox(GUID)
+ If _BestellID <> 0 Then
+ If _VAS <> String.Empty Then
+ If _VAS.ToString.StartsWith("5") Then
+ MsgBox(_VAS)
+ End If
+ If Not IsNumeric(_VAS) Then
+ MsgBox("Achtung:" & vbNewLine & "Die Bestellnummer '" & _VAS & "' entspricht nicht den Vorgaben. (Numerisch)")
+ Continue For
+ End If
+
+ Dim sql = String.Format("SELECT COUNT(GUID) FROM TBSUPPLY_BESTELLUNG WHERE GUID = {0}", _BestellID)
+ Dim exists = ClassDatabase.Execute_Scalar(sql, True)
+ If exists = 0 Then
+ Dim DTRECORD As DataTable
+ sql = String.Format("SELECT T.BEZEICHNUNG,T1.MARKT,'ERR-ORDER-DELETED',T1.BEZEICHNUNG,T1.SERIENNR,T.GUID,T1.GUID,T.[LEVEL],T1.MANDANT_ID " &
+ "FROM TBSUPPLIES T, TBGERAET T1 WHERE T.GERAET_ID = T1.GUID AND T.STATUS_ID <> 6 AND " &
+ "UPPER(T1.SERIENNR) = UPPER('{0}') AND " &
+ "UPPER(T.BEZEICHNUNG) = UPPER('{1}')", _seriennr, _Supply)
+ DTRECORD = ClassDatabase.Return_Datatable(sql, True)
+ If Not IsNothing(DTRECORD) And DTRECORD.Rows.Count >= 1 Then
+ _markt = DTRECORD.Rows(0).Item(1)
+ Dim wer = "ERR-ORDER-DELETED"
+ Dim SUPP_ID = DTRECORD.Rows(0).Item(5)
+ Dim GERAETID = DTRECORD.Rows(0).Item(6)
+ Dim BESTELL_LEVEL = DTRECORD.Rows(0).Item(7)
+ Dim MandantID = DTRECORD.Rows(0).Item(8)
+
+ Dim ins = String.Format("INSERT INTO TBSUPPLY_BESTELLUNG(SUPPLY_BEZEICHNUNG,MARKT,BESTELLT_WER,GERAET,SERIEN_NR,SUPPLY_ID,GERAET_ID,BESTELL_LEVEL,MANDANT_ID,MENGE) VALUES (" &
+ "'{0}','{1}','{2}','{3}','{4}',{5},{6},'{7}',{8},{9})",
+ _Supply, _markt, wer, _gerät, _seriennr, SUPP_ID, GERAETID, BESTELL_LEVEL, MandantID, _Anzahl)
+ If ClassDatabase.Execute_non_Query(ins, True) = True Then
+ sql = String.Format("SELECT MAX(GUID) FROM TBSUPPLY_BESTELLUNG WHERE UPPER(SUPPLY_BEZEICHNUNG) = UPPER('{0}') AND UPPER(SERIEN_NR) = UPPER('{1}')", _Supply, _seriennr)
+ _BestellID = ClassDatabase.Execute_Scalar(sql, True)
+ If IsDBNull(_BestellID) Or IsNothing(_BestellID) Or _BestellID = 0 Then
+ MsgBox("Achtung:" & vbNewLine & "Für die hinzugefügte Bestellung konnte kein Datensatz geholt werden!")
+ Continue For
+ End If
+ Else
+ MsgBox("Could not insert the new Order-record! - Why: BestellID was nothing!")
+ End If
+ Else
+ MsgBox("Achtung:" & vbNewLine & "Für die OrderID '" & _BestellID & "' konnte kein Supply identifiziert werden!")
+ Continue For
+ End If
+ End If
+
+
+
+
+ Dim upd
+ Try
+ upd = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLNR = '{0}', FILE_ORDER_CONFIRM = '{1}' WHERE GUID = {2}", _VAS, file.Name, _BestellID)
+ If chkLogData.Checked Then
+ ClassLogger.Add(upd, False)
+ End If
+ If ClassDatabase.Execute_non_Query(upd, True) = True Then
+ Counter = Counter + 1
+ End If
+ Catch ex As Exception
+ MsgBox("Error in update Bestellnr:" & vbNewLine & ex.Message & vbNewLine & "Command copied to clipboard", MsgBoxStyle.Critical)
+ My.Computer.Clipboard.SetText(upd)
+ End Try
+
+ 'TBSUPPLY_BESTELLUNGViewTableAdapter.cmdUpdateVAS(_VAS, file.Name, GUID)
+ Else
+ If _errorsOrders <> String.Empty Then
+ _errorsOrders &= vbNewLine & _BestellID.ToString
+ Else
+ _errorsOrders = _BestellID.ToString
+ End If
+
+ MsgBox("Achtung:" & vbNewLine & "Die Bestellnummer ist leer bzw konnte nicht ausgewertet werden!" & vbNewLine & "Die BestellID: " & _BestellID.ToString & " wird geloggt und später aufgeführt!")
+ End If
+ End If
+ Else
+ ClassLoggerSW.Add(">> Device is not defined for OrderImport: '" & Device & "'", False)
+ End If
+ End If
+ End If
+ End If
+ zaehler += 1
+ Next
End If
- zaehler += 1
- Next
+ Else
+ MsgBox("Excel-Tabelle konnte nicht gelesen werden!", MsgBoxStyle.MsgBoxHelp)
+ End If
+
+
+
End If
+ 'For Each DC In DT.Columns
+ ' MsgBox(DC.ColumnName & vbNewLine & DC.Caption)
+ 'Next
+ Progress += 75
+ Gesamtfiles += -1
+ bwBestellungen_verarbeiten.ReportProgress(Progress)
+ If Counter > 0 Then
+ MoveFile(file.FullName, file.Name, pathBestellungen, pathBestellungen)
+ End If
End If
+ Next
+ If Anzahl_Dateien <> 0 And Counter > 0 Then
+ MsgBox("Es wurde(n) " & Anzahl_Dateien & " Datei(en) erfolgreich verarbeitet!" & vbNewLine &
+ Counter & " Bestell-Nummern wurden erfolgreich upgedated.", MsgBoxStyle.Information, "Erfolgsmeldung:")
+ 'Me.Wertehilfen_fuellen()
+ Else
+ MsgBox("Keine Dateien zum Verarbeiten vorhanden oder" & vbNewLine & "die Dateizellen können nicht gelesen werden!" & vbNewLine & "Überwachter Ordner: " & vbNewLine & pathBestellungen, MsgBoxStyle.Exclamation, "Achtung:")
+ End If
- 'For Each DC In DT.Columns
- ' MsgBox(DC.ColumnName & vbNewLine & DC.Caption)
- 'Next
- Progress += 75
- Gesamtfiles += -1
- bwBestellungen_verarbeiten.ReportProgress(Progress)
- If Counter > 0 Then
- MoveFile(file.FullName, file.Name, pathBestellungen, pathBestellungen)
- End If
+ If _errorsOrders <> String.Empty Then
+ MsgBox("Achtung: folgende Bestell-IDs konnten nicht verarbeitet werden: " & vbNewLine & _errorsOrders & vbNewLine & vbNewLine & "Bitte korrigieren Sie etwaige Formatierungen manuell und lesen die Datei erneut ein!", MsgBoxStyle.Exclamation)
End If
- Next
- If Anzahl_Dateien <> 0 And Counter > 0 Then
- MsgBox("Es wurde(n) " & Anzahl_Dateien & " Datei(en) erfolgreich verarbeitet!" & vbNewLine & _
- Counter & " Bestell-Nummern wurden erfolgreich upgedated.", MsgBoxStyle.Information, "Erfolgsmeldung:")
- 'Me.Wertehilfen_fuellen()
- Else
- MsgBox("Keine Dateien zum Verarbeiten vorhanden oder" & vbNewLine & "die Dateizellen können nicht gelesen werden!" & vbNewLine & "Überwachter Ordner: " & vbNewLine & pathBestellungen, MsgBoxStyle.Exclamation, "Achtung:")
- End If
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in bwBestellungen_verarbeiten_DoWork:")
+ End Try
+
+
End Sub
- Private Function XLSReader(ByVal filepath As String, ByVal filename As String)
+
+ Private Function XLSReader(ByVal filepath As String, Sheetname As String)
+ Dim ds As New DataSet
+ Dim con As String
+ Dim excelConnection As OleDbConnection
Try
+
'Instanz des DataSet-Objektes instanzieren
- Dim ds As New DataSet
- 'Verbindungszeichenfolge festlegen, der Name der Excel-Datei wird als Parameter übergeben
- Dim con As String = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" &
- "Extended Properties=""Excel 8.0;HDR=YES;"""
- Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", con)
+
+ Try
+ 'Verbindungszeichenfolge festlegen, der Name der Excel-Datei wird als Parameter übergeben
+ con = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=" + filepath + ";Extended Properties='Excel 12.0;HDR=YES;'"
+ '"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" & filepath & ";" &
+ ' "Extended Properties=""Excel 8.0;HDR=YES;"""
+ excelConnection = New OleDbConnection(con)
+ excelConnection.Open()
+ If chkLogData.Checked Then ClassLogger.Add("excelConnection opened....", False)
+ Catch ex1 As Exception
+ If ex1.Message = "Der 'Microsoft.ACE.OLEDB.12.0'-Provider ist nicht auf dem lokalen Computer registriert." Then
+ con = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + filepath + ";Extended Properties='Excel 8.0;HDR=YES;'"
+ excelConnection = New OleDbConnection(con)
+ Try
+ excelConnection.Open()
+ Catch ex As Exception
+ Return Nothing
+ End Try
+ Else
+ MsgBox(ex1.Message, MsgBoxStyle.Critical, "Could not create excel-Connection 12.0:")
+ Try
+ excelConnection.Close()
+ Catch ex As Exception
+ End Try
+ Return Nothing
+ End If
+
+
+
+
+
+
+ End Try
+
+ Dim da_final As New OleDb.OleDbDataAdapter("SELECT * FROM [" & Sheetname & "$]", con) 'Report
+ If chkLogData.Checked Then ClassLogger.Add("da_final opening....", False)
'DataSet füllen
- da.Fill(ds)
+ da_final.Fill(ds)
Dim DT As System.Data.DataTable
DT = ds.Tables(0)
+ da_final.Dispose()
+ excelConnection.Close()
'DataSet zurückgeben
Return ds
Catch ex As Exception
- MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei XLSReader:")
- Dim newcon As String = "Provider=Microsoft.ACE.OLEDB.12.0;Data Source=" + filepath + ";Extended Properties=Excel 12.0;"";"
- Dim da As New OleDb.OleDbDataAdapter("SELECT * FROM [" & My.Settings.SheetnameBestellung & "$]", newcon)
- 'DataSet füllen
- Dim ds As New DataSet
- da.Fill(ds)
- Dim DT As System.Data.DataTable
- DT = ds.Tables(0)
- MsgBox("New Connectionw as established")
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected Error in XLSReader:")
+ Try
+ excelConnection.Close()
+ Catch ex1 As Exception
+
+ End Try
+
Return Nothing
End Try
End Function
@@ -819,7 +954,7 @@ Public Class FMMain
MsgBox("Der aktuelle Import läuft noch!", MsgBoxStyle.Exclamation, "ACHTUNG:")
End If
End Sub
- _
+
Private Sub bwXMLverarbeiten_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
Try
Me.TBVERTRAG_NOTEXISTTableAdapter.Delete()
@@ -995,7 +1130,7 @@ Public Class FMMain
IO.Directory.CreateDirectory(Me._EmailProfile.Path & "\Archiv")
End If
Dim SQL_ergebnis = ""
- dateiname = Me._EmailProfile.Path & "\" & My.Computer.Clock.LocalTime.Year & "_" & My.Computer.Clock.LocalTime.Month & "_" & My.Computer.Clock.LocalTime.Day & "_" & Me._EmailProfile.Profilname & _
+ dateiname = Me._EmailProfile.Path & "\" & My.Computer.Clock.LocalTime.Year & "_" & My.Computer.Clock.LocalTime.Month & "_" & My.Computer.Clock.LocalTime.Day & "_" & Me._EmailProfile.Profilname &
"." & Me._EmailProfile.Format
' die SQL-Abfrage durchführen (liefert den Wert der in den windream-Index geschrieben werden soll)
SQL_ergebnis = ExportDataFromMssqlDb(Me._EmailProfile.Profilname, dateiname, Me._EmailProfile.vSQL_Anweisung, My.Settings.ConfigConnectionString, Me._EmailProfile.Format)
@@ -1031,7 +1166,7 @@ Public Class FMMain
With email
.Absender(Me._EmailProfile.Emailfrom, Me._EmailProfile.EmailAbsender)
.Empfänger(_mailempfaenger, _mailempfaenger)
- .Nachricht(Me._EmailProfile.EmailBetreff, "" & Me._EmailProfile.EmailBody & "
Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" & _
+ .Nachricht(Me._EmailProfile.EmailBetreff, "" & Me._EmailProfile.EmailBody & "
Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" &
My.Computer.Clock.LocalTime.ToLongTimeString & "")
.Nachricht_Einstellungen(True, Net.Mail.MailPriority.Normal)
.Anlage(Resultdatei)
@@ -1056,7 +1191,7 @@ Public Class FMMain
With bemail
.Absender(Me._EmailProfile.Emailfrom, Me._EmailProfile.EmailAbsender)
.Empfänger(_bmailempfaenger, _bmailempfaenger)
- .Nachricht(Me._EmailProfile.EmailBetreff & " - Bestätigung", " Email für das Profil: " & Me._EmailProfile.Profilname & " wurde erfolgreich versendet!
" & "Datei: " & dateiname & "
Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" & _
+ .Nachricht(Me._EmailProfile.EmailBetreff & " - Bestätigung", " Email für das Profil: " & Me._EmailProfile.Profilname & " wurde erfolgreich versendet!
" & "Datei: " & dateiname & "
Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" &
My.Computer.Clock.LocalTime.ToLongTimeString & "")
.Nachricht_Einstellungen(True, Net.Mail.MailPriority.Normal)
.Anlage(Resultdatei)
@@ -1498,14 +1633,14 @@ Public Class FMMain
Case "serialnumber".ToLower
If vSerienNrGeraet = "" Then
vSerienNrGeraet = Value
- If vSerienNrGeraet.ToLower = "" Or vSerienNrGeraet.ToLower = "" Or vSerienNrGeraet.ToLower = "" Or _
+ If vSerienNrGeraet.ToLower = "" Or vSerienNrGeraet.ToLower = "" Or vSerienNrGeraet.ToLower = "" Or
vSerienNrGeraet.ToLower.StartsWith("<") Or vSerienNrGeraet.Length < 6 Or vSerienNrGeraet.ToLower = "" Then
vSerienNrGeraet = ""
End If
marker &= vbNewLine & "- vseriennrgeraet: " & vSerienNrGeraet
End If
-
+
' msgbox("1 " & vseriennrgeraet)
Case "pagecount".ToLower
If IsNumeric(Value) Then
@@ -1670,7 +1805,7 @@ Public Class FMMain
' MsgBox("1.1 " & vSerienNrGeraet)
marker &= vbNewLine & "2. Den Geräteverfolgungsdatensatz " & vSerienNrGeraet & " inserten"
' MsgBox("2 " & vSerienNrGeraet)
- Me.TBGERAETE_VERFOLGUNGTableAdapter.cmdinsert(vGeraete_Bez, vIP, vSerienNrGeraet, vPagecount, Markt, filename, Datum, vVertrag, vModelNr, A3DuplexSheets, A3SimplexSheets, A4DuplexSheets, A4SimplexSheets, A3TotalColorImpressions, _
+ Me.TBGERAETE_VERFOLGUNGTableAdapter.cmdinsert(vGeraete_Bez, vIP, vSerienNrGeraet, vPagecount, Markt, filename, Datum, vVertrag, vModelNr, A3DuplexSheets, A3SimplexSheets, A4DuplexSheets, A4SimplexSheets, A3TotalColorImpressions,
A3TotalMonoImpression, A4TotalMonoImpressions, A4ColorTotalImpressions, AverageBlackCoverage, AverageCyanCoverage, AverageMagentaCoverage, AverageYellowCoverage, ScanA3TotalImages, ScanA4TotalImages, vKD_KZ, FaxIncoming, ScanA4TotalImages, ScanA3TotalImages, vPORT_DISPLAY)
ClassLoggerSW.Add(" ==> Gerät inserted: " & vGeraete_Bez & " - " & vSerienNrGeraet, False)
@@ -1906,7 +2041,7 @@ Public Class FMMain
Dim inuse As Boolean = False
If System.IO.File.Exists(_filename) Then
Try
- FileOpen(fs, _filename, OpenMode.Binary, _
+ FileOpen(fs, _filename, OpenMode.Binary,
OpenAccess.ReadWrite, OpenShare.LockReadWrite)
Catch
inuse = True
@@ -2057,7 +2192,7 @@ Public Class FMMain
Dim diPfad As New IO.DirectoryInfo(pathBestellungen)
Dim _count As Integer = 0
For Each file As IO.FileInfo In diPfad.GetFiles()
- If file.Name.ToUpper.EndsWith(".XLS") Then
+ If (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLS")) Or (file.Name.ToUpper.Contains("_BESTELLUNG_") And file.Name.ToUpper.EndsWith(".XLSX")) Then
_count = _count + 1
End If
Next
@@ -2156,58 +2291,76 @@ Public Class FMMain
End If
End Sub
Private Sub tsborders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tsborders.Click
- Load_Bestellungen_Manuell
+ Load_Bestellungen_Manuell()
End Sub
Sub Load_Bestellungen_Manuell()
frmBestellung.Show()
End Sub
- Private Sub chbFilterMarkt_Bestellungen_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chbFilterMarkt_Bestellungen.CheckedChanged
- If Me.chbFilterMarkt_Bestellungen.Checked Then
- 'Me.TBSUPPLY_BESTELLUNGViewBindingSource.DataSource = TBWH_MARKTBindingSource
- 'TBSUPPLY_BESTELLUNGViewBindingSource.DataMember = "RelTBWH_MARKT_TBSUPPLY_BESTELLUNGView"
- Me.DGTBWH_Markt_Bestellungen.Visible = True
- Else
- 'Me.TBSUPPLY_BESTELLUNGViewBindingSource.DataSource = MyDataset
- 'TBSUPPLY_BESTELLUNGViewBindingSource.DataMember = "TBSUPPLY_BESTELLUNGView"
- Me.DGTBWH_Markt_Bestellungen.Visible = False
- End If
- End Sub
+
Private Sub Refresh_Bestellungen()
Try
- If Me.chbFilterMarkt_Bestellungen.Checked = False And Me.chkbDatumfilterOrder.Checked = False Then
- ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für alle Märkte"
- Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillByall(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, cmbMandanten.Text)
+ Me.Cursor = Cursors.WaitCursor
+ Dim sql = String.Format("SELECT * FROM VWSUPPLY_BESTELLUNG_FRONTEND AS T " &
+ "WHERE (UPPER(Mandant) = UPPER('{0}'))", cmbMandanten.Text)
+ If pnlOrderDateSelector.Visible = True Then
+ sql &= $" AND convert(Date,[Bestellt wann]) >= CONVERT(DATE,'{DateTimePickerOrdervon.Value}') AND convert(Date,[Bestellt wann]) <= CONVERT(DATE,'{DateTimePickerOrderbis.Value}')"
Else
- If chbFilterMarkt_Bestellungen.Checked Then
- Dim Markt As String = DGTBWH_Markt_Bestellungen.CurrentCell.Value()
-
- If Me.chkbDatumfilterOrder.Checked Then
- ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für Markt: " & Markt.ToUpper & " und in Zeitraum"
- Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillBy_DatumMArkt(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, Markt, Me.dtpOrder_von.Value, Me.dtpOrder_bis.Value)
- Else
- ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für Markt: " & Markt.ToUpper
- Me.TBSUPPLY_BESTELLUNGViewTableAdapter.Fill_ByMarkt(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, Markt)
- End If
- ElseIf Me.chkbDatumfilterOrder.Checked Then
- ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen in Zeitraum"
- Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillByDatum(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, cmbMandanten.Text, Me.dtpOrder_von.Value, Me.dtpOrder_bis.Value)
- End If
+ sql &= " AND YEAR([Bestellt wann]) = YEAR(GETDATE())"
End If
+ sql &= " ORDER BY [Bestellt wann] DESC"
+
+
+ Dim DTRESULT As DataTable = ClassDatabase.Return_Datatable(sql, True)
+ If Not IsNothing(DTRESULT) Then
+ VWSUPPLY_BESTELLUNG_FRONTENDBindingSource.DataSource = DTRESULT
+ GridControlBestellungen.DataSource = VWSUPPLY_BESTELLUNG_FRONTENDBindingSource
+ Dim XMLPath = ClassHelper.GetSelectionGridName("GridViewBestellungen_Uebersicht")
+ If File.Exists(XMLPath) Then
+ GridControlBestellungen.MainView.RestoreLayoutFromXml(XMLPath)
+ End If
+
+ Else
+ VWSUPPLY_BESTELLUNG_FRONTENDBindingSource.DataSource = Nothing
+ GridControlBestellungen.DataSource = Nothing
+ GridViewBestellUebersicht.Columns.Clear()
+
+ End If
+ 'If Me.chbFilterMarkt_Bestellungen.Checked = False And Me.chkbDatumfilterOrder.Checked = False Then
+ ' ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für alle Märkte"
+ ' Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillByall(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, cmbMandanten.Text)
+ 'Else
+ ' If chbFilterMarkt_Bestellungen.Checked Then
+ ' Dim Markt As String = DGTBWH_Markt_Bestellungen.CurrentCell.Value()
+
+ ' If Me.chkbDatumfilterOrder.Checked Then
+ ' ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für Markt: " & Markt.ToUpper & " und in Zeitraum"
+ ' Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillBy_DatumMArkt(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, Markt, Me.dtpOrder_von.Value, Me.dtpOrder_bis.Value)
+ ' Else
+ ' ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen für Markt: " & Markt.ToUpper
+ ' Me.TBSUPPLY_BESTELLUNGViewTableAdapter.Fill_ByMarkt(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, Markt)
+ ' End If
+ ' ElseIf Me.chkbDatumfilterOrder.Checked Then
+ ' ' Me.DGTBSUPPLY_BESTELLUNG.Caption = "Bestellungen in Zeitraum"
+ ' Me.TBSUPPLY_BESTELLUNGViewTableAdapter.FillByDatum(Me.MyDataset.VWSUPPLY_BESTELLUNG_FRONTEND, cmbMandanten.Text, Me.dtpOrder_von.Value, Me.dtpOrder_bis.Value)
+ ' End If
+ 'End If
Catch ex As System.Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Abfragen der Bestellungen:")
End Try
+ Me.Cursor = Cursors.Default
End Sub
Private Sub tsbRefresh_Bestellungen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tsbRefresh_Bestellungen.Click
Me.Cursor = Cursors.WaitCursor
+ Save_GridLayout_Bestuebersicht()
Refresh_Bestellungen()
Cursor = Cursors.Default
End Sub
Private Sub tsbexcel_geraete_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tsbexcel_geraete.Click
- Dim saveFileDialog1 As New SaveFileDialog
+ Dim saveFileDialog1 As New SaveFileDialog
saveFileDialog1.Filter = "Excel (*.xls)|*.xls|Excel (*.xlsx)|*.xlsx"
saveFileDialog1.Title = "Export to Excel:"
saveFileDialog1.ShowDialog()
@@ -2495,32 +2648,7 @@ Public Class FMMain
XLS_Mit_Filter(MyDataset, "VWGERAETE_VERFOLGUNG", "Geräteverfolgung")
Cursor = Cursors.Default
End Sub
- Private Sub chkbDatumfilterOrder_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkbDatumfilterOrder.CheckedChanged
- If Me.chkbDatumfilterOrder.Checked Then
- dtpOrder_von.Enabled = True
- dtpOrder_bis.Enabled = True
- Else
- dtpOrder_von.Enabled = False
- dtpOrder_bis.Enabled = False
- End If
- End Sub
- Private Sub DGTBWH_Markt_Bestellungen_SelectionChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles DGTBWH_Markt_Bestellungen.SelectionChanged
- If Me.FormLoaded = True And Me.TBWH_MARKTBindingSource.Count > 0 And Me.chbFilterMarkt_Bestellungen.Checked Then
- Refresh_Bestellungen()
- End If
- End Sub
- Private Sub dtpOrder_bis_ValueChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles dtpOrder_bis.ValueChanged
- If Me.chkbDatumfilterOrder.Checked Then
- Refresh_Bestellungen()
- End If
- End Sub
-
- Private Sub dtpOrder_von_ValueChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles dtpOrder_von.ValueChanged
- If Me.chkbDatumfilterOrder.Checked Then
- Refresh_Bestellungen()
- End If
- End Sub
Private Sub dtpVerfolgung_von_ValueChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles dtpVerfolgung_von.ValueChanged
If dtpVerfolgung_bis.Value.ToShortDateString >= dtpVerfolgung_von.Value.ToShortDateString Then
@@ -2820,7 +2948,7 @@ Public Class FMMain
End If
End Sub
Private Sub VWSUPPLIES_DG_Click(sender As System.Object, e As System.EventArgs)
-
+
End Sub
Private Sub tsbtnNAchverfolgung_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnNAchverfolgung.Click
@@ -2876,9 +3004,9 @@ Public Class FMMain
SplitContainerGeraet.Collapsed = True
End If
Catch ex As Exception
- MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anzeige Changelog:")
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei Anzeige Changelog:")
End Try
-
+
End Sub
Private Sub Refresh_ChangeLog(GID As Integer)
@@ -2990,7 +3118,7 @@ Public Class FMMain
Cursor = Cursors.Default
End Sub
-
+
Sub Load_Bestellung_Gesendet()
Try
Cursor = Cursors.WaitCursor
@@ -3119,7 +3247,7 @@ Public Class FMMain
GridControlSupplies2Order.MainView.SaveLayoutToXml(XMLPath)
End Sub
Sub Save_GridLayout_Bestuebersicht()
- Dim XMLPath = ClassHelper.GetSelectionGridName("GridViewBestellungen_Uebersciht")
+ Dim XMLPath = ClassHelper.GetSelectionGridName("GridViewBestellungen_Uebersicht")
GridControlBestellungen.MainView.SaveLayoutToXml(XMLPath)
End Sub
Sub Save_GridLayout_BestGesendet()
@@ -3136,7 +3264,7 @@ Public Class FMMain
GridControlProduktVertrag.MainView.SaveLayoutToXml(XMLPath)
End Sub
-
+
Private Sub ToolStripButton16_Click(sender As Object, e As EventArgs) Handles ToolStripButton16.Click
Load_Bestellung_Gesendet()
@@ -3155,9 +3283,9 @@ Public Class FMMain
If Manuell = False Then
sql = String.Format("UPDATE TBSUPPLIES SET STATUS_ID = 2, GEAENDERTWER = '{0}', MARKER = 'Frontend' WHERE GUID = {1} AND STATUS_ID = 10", Environment.UserName, SupplyID)
If ClassDatabase.Execute_non_Query(sql, True) = True Then
- sql = String.Format("DELETE FROM TBSUPPLY_BESTELLUNG WHERE (GUID = {0})", BestellID)
- ClassDatabase.Execute_non_Query(sql, True)
- ' TBSUPPLY_BESTELLUNGViewTableAdapter.Delete(BestellID)
+ 'sql = String.Format("DELETE FROM TBSUPPLY_BESTELLUNG WHERE (GUID = {0})", BestellID)
+ 'ClassDatabase.Execute_non_Query(sql, True)
+
End If
Else
Dim marker
@@ -3168,7 +3296,7 @@ Public Class FMMain
End If
sql = String.Format("INSERT INTO TBSUPPLIES_2_ORDER_TEMP (SUPPLY_ID,MARKER,ERFASSTWER,MANUALLY,BESTELL_ID) VALUES ({0},'{1}','{2}',1,{3})", SupplyID, marker, BestelltWer, BestellID)
If ClassDatabase.Execute_non_Query(sql, True) = True Then
- sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET MARKER = 'Rückgängig Bestellung gesendet',MANUELL_BESTELLT = 0 WHERE GUID = {0}", BestellID)
+ sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET MARKER = 'Rückgängig Bestellung gesendet',STATE_MSG = 'Default', MANUELL_BESTELLT = 0 WHERE GUID = {0}", BestellID)
ClassDatabase.Execute_non_Query(sql, True)
End If
End If
@@ -3208,7 +3336,7 @@ Public Class FMMain
If Manuell = False Then
sql = String.Format("UPDATE TBSUPPLIES SET STATUS_ID = 4, STATUS_WER = '{0}', MARKER = 'MANUALLY FROM BESTELLUNG GESENDET' WHERE (STATUS_ID = 10) AND (GUID = {1})", Environment.UserName, SupplyID)
If ClassDatabase.Execute_non_Query(sql, True) = True Then
- sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID)
+ sql = String.Format("UPDATE TBSUPPLY_BESTELLUNG SET BESTELLT_WANN = GETDATE(), BESTELLNR = 'PLEASE UPDATE MANUALLY', MARKER = 'Status Bestellt manuell gesetzt durch: {0}' WHERE GUID = {1}", Environment.UserName, BestellID)
ClassDatabase.Execute_non_Query(sql, True)
End If
'TBSUPPLIESTableAdapter.cmdSetBestellt(Environment.UserName, "MANUALLY FROM BESTELLUNG GESENDET", SupplyID)
@@ -3239,13 +3367,15 @@ Public Class FMMain
'Überhaupt Rows in Grid?
If GridViewBestellUebersicht.RowCount > 0 Then
Dim coc = GridViewBestellUebersicht.FocusedValue
- Dim BestellNr = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("BESTELLNR"))
- Dim ID = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("GUID"))
- Dim Menge = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("MENGE"))
+ Dim BestellNr = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("BestellNr"))
+ Dim ID = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("MC2BestellID"))
+ Dim Menge = GridViewBestellUebersicht.GetFocusedRowCellValue(GridViewBestellUebersicht.Columns("Menge"))
If BestellNr Is Nothing = False And Not IsNothing(ID) Then
tslbl_Hinweis.Text = "Bestell-Nr./Menge eingepflegt/geändert' - " & Now
tslbl_Hinweis.Visible = True
Me.TBSUPPLY_BESTELLUNGViewTableAdapter.cmdUpdate_BestNr(BestellNr, Environment.UserName, Menge, ID)
+ Dim XMLPath = ClassHelper.GetSelectionGridName("GridViewBestellungen_Gesendet")
+ Save_GridLayout_Bestuebersicht()
Refresh_Bestellungen()
Else
tslbl_Hinweis.Visible = False
@@ -3278,7 +3408,7 @@ Public Class FMMain
End If
- Cursor = Cursors.Default
+ Cursor = Cursors.Default
End Sub
Private Sub GridViewGeraete_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewGeraete.FocusedColumnChanged
ROWCOL_Change_Geraet()
@@ -3306,7 +3436,7 @@ Public Class FMMain
Catch ex As Exception
Exit Sub
End Try
-
+
End If
End Sub
@@ -3314,6 +3444,212 @@ Public Class FMMain
Load_Bestellungen_Manuell()
End Sub
+ Private Sub btnTSR_open_Click(sender As Object, e As EventArgs) Handles btnTSR_open.Click
+ If cmbMandant.SelectedIndex = -1 Then
+ Exit Sub
+ End If
+ If OpenFileDialog1.ShowDialog() = System.Windows.Forms.DialogResult.OK Then
+ Try
+ ClassLogger.Init("", "ImportTSR_", False)
+ If chkLogData.Checked Then MsgBox("Working on file: " & OpenFileDialog1.FileName)
+ Dim _DS As New DataSet
+ 'Datei auslesen und Dataset rückgeben lassen
+ _DS = XLSReader(OpenFileDialog1.FileName, "Report")
+ If _DS Is Nothing Then
+ MsgBox("Datei: " & vbNewLine & OpenFileDialog1.FileName & vbNewLine & " wurde nicht verarbeitet!", MsgBoxStyle.Exclamation, "Achtung:")
+ Else
+ Me.Cursor = Cursors.WaitCursor
+ If chkLogData.Checked Then ClassLogger.Add("XLSReaderTSR finished....", False)
+
+ 'MsgBox("Anzahl: " & _DS.Tables(0).Rows.Count & vbNewLine & "Hier müssten jetzt die Updates erfolgen")
+ Dim DT As System.Data.DataTable
+ Dim DR As System.Data.DataRow
+ ' Dim DC As System.Data.DataColumn
+ '' --- DataSet zuweisen
+ 'DS = Me.MyDataset
+ '' --- Zugriff auf Tabelle
+ DT = _DS.Tables(0)
+ Dim _ORDER_ID, _CREATE_DT, _SHIP_DT, _DEV_SERIAL_NO, _ORD_PART_NO, _ORD_QTY, _SHIP_QTY, _TRACKING_NO, _SHIPTO_POSTCODE, _CUSTOM_LABEL_1, _CUSTOM_LABEL_2 As String
+
+ 'Überprüfen wie die Datei aufgebaut/bearbeitet wurde?
+ Dim RowIndex = 1
+ Dim ordercount As Integer = 0
+ Dim _error As Boolean = False
+ If chkLogData.Checked Then ClassLogger.Add("DS contains '" & DT.Rows.Count & "' rows!", False)
+ For Each DR In DT.Rows
+ If RowIndex >= 1 Then '>= 3 Then
+ Dim FirstColumnValue = DR.Item(0)
+ Dim DateValue = DR.Item(3)
+ If IsNumeric(FirstColumnValue) And IsDate(DateValue) Then
+ If chkLogData.Checked Then ClassLogger.Add("Working on Order '" & FirstColumnValue & "'...", False)
+ Try
+ _ORDER_ID = FirstColumnValue
+ Catch ex As Exception
+ ClassLogger.Add("Could not convert _ORDER_ID", False)
+ Continue For
+ End Try
+ Try
+ _SHIP_DT = DR.Item(3).ToString
+ _SHIP_DT = DR.Item(3).ToString.Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _SHIP_DT = ""
+ End If
+ End Try
+ Try
+ _CREATE_DT = DR.Item(2).ToString
+ _CREATE_DT = DR.Item(2).ToString.Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _CREATE_DT = ""
+ End If
+ End Try
+ Try
+ _DEV_SERIAL_NO = DR.Item(10)
+ _DEV_SERIAL_NO = DR.Item(10).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _DEV_SERIAL_NO = ""
+ End If
+ End Try
+ Try
+ _ORD_PART_NO = DR.Item(13)
+ _ORD_PART_NO = DR.Item(13).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _ORD_PART_NO = ""
+ End If
+ End Try
+ Try
+ _ORD_QTY = DR.Item(15)
+ If IsNumeric(_ORD_QTY) = False Then
+ _SHIP_QTY = DR.Item(15).Replace("'", "")
+ End If
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _ORD_QTY = "1"
+ End If
+
+ End Try
+ Try
+ _SHIP_QTY = DR.Item(16)
+ If IsNumeric(_SHIP_QTY) = False Then
+ _SHIP_QTY = DR.Item(16).Replace("'", "")
+ End If
+
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _SHIP_QTY = "1"
+ End If
+
+ End Try
+ Try
+ _TRACKING_NO = DR.Item(19).ToString
+ _TRACKING_NO = DR.Item(19).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _TRACKING_NO = ""
+ End If
+ End Try
+ Try
+ _SHIPTO_POSTCODE = DR.Item(26)
+ _SHIPTO_POSTCODE = DR.Item(26).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _SHIPTO_POSTCODE = ""
+ End If
+ End Try
+ Try
+ _CUSTOM_LABEL_1 = DR.Item(29)
+ _CUSTOM_LABEL_1 = DR.Item(29).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _CUSTOM_LABEL_1 = ""
+ End If
+ End Try
+ Try
+ _CUSTOM_LABEL_2 = DR.Item(30)
+ _CUSTOM_LABEL_2 = DR.Item(30).Replace("'", "")
+ Catch ex As Exception
+ If Not ex.Message.Contains("Replace für den Typ Double") Then
+ _CUSTOM_LABEL_2 = ""
+ End If
+ End Try
+ Dim del = $"DELETE FROM TBTONER_SHIPMENT_REPORT WHERE ORDER_ID = '{_ORDER_ID}' AND DEV_SERIAL_NO = '{_DEV_SERIAL_NO}' AND TRACKING_NO = '{_TRACKING_NO}'"
+ If ClassDatabase.Execute_non_Query(del) = True Then
+ Dim ins = String.Format("INSERT INTO TBTONER_SHIPMENT_REPORT ([ORDER_ID],[SHIP_DT],[DEV_SERIAL_NO],[ORD_PART_NO],[ORD_QTY],[SHIP_QTY],[TRACKING_NO],[SHIPTO_POSTCODE],[CUSTOM_LABEL_1],[CUSTOM_LABEL_2],[ADDED_WHO], MANDANT_ID,CREATE_DT) VALUES (
+ '{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}','{10}',{11},'{12}')", _ORDER_ID, _SHIP_DT, _DEV_SERIAL_NO, _ORD_PART_NO, _ORD_QTY, _SHIP_QTY, _TRACKING_NO, _SHIPTO_POSTCODE, _CUSTOM_LABEL_1, _CUSTOM_LABEL_2, Environment.UserName, cmbMandant.SelectedValue, _CREATE_DT)
+ If ClassDatabase.Execute_non_Query(ins) = False Then
+ _error = True
+ Else
+ ordercount += 1
+ End If
+ End If
+ Else
+ Console.WriteLine("No datevalue: " & DateValue.ToString & " - " & FirstColumnValue.ToString)
+ End If
+ End If
+ RowIndex += 1
+
+ Next
+ If _error = False And ordercount > 1 Then
+ MsgBox(String.Format("Es wurden {0} Reportzeilen erfolgreich eingelesen!", ordercount), MsgBoxStyle.Information)
+ Else
+ MsgBox("Die Datei wurde verarbeitet, allerdings ereigneten sich hierbei Fehler!", MsgBoxStyle.Exclamation)
+ End If
+ End If
+ Catch ex As Exception
+ MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in working TonerShipment:")
+ End Try
+ Me.Cursor = Cursors.Default
+ End If
+ End Sub
+ Dim IsFilterMode As Boolean = False
+ Private Sub GridViewBestellUebersicht_RowStyle(sender As Object, e As DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs) Handles GridViewBestellUebersicht.RowStyle
+ If e.RowHandle = -1 Then
+ IsFilterMode = True
+ Exit Sub
+ Else
+ IsFilterMode = False
+ End If
+ If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
+ IsFilterMode = True
+ e.Appearance.BackColor = Color.Orange
+
+ Else
+ IsFilterMode = False
+ Try
+ Dim rowCellValue = GridViewBestellUebersicht.GetRowCellValue(e.RowHandle, "BestellNr")
+ If rowCellValue <> "" Then
+ If rowCellValue = "PLEASE UPDATE MANUALLY" Then
+ e.Appearance.BackColor = Color.Red
+ e.HighPriority = True
+ End If
+
+ End If
+ Catch ex As Exception
+ ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False)
+ End Try
+
+ End If
+ End Sub
+
+ Private Sub GridControlBestellungen_Leave(sender As Object, e As EventArgs) Handles GridControlBestellungen.Leave
+ Save_GridLayout_Bestuebersicht()
+ End Sub
+
+ Private Sub tscmbaktiv_Click(sender As Object, e As EventArgs) Handles tscmbaktiv.Click
+
+ End Sub
+
+ Private Sub tsbtOrderSelectDate_Click(sender As Object, e As EventArgs) Handles tsbtOrderSelectDate.Click
+ If pnlOrderDateSelector.Visible = False Then
+ pnlOrderDateSelector.Visible = True
+ Else
+ pnlOrderDateSelector.Visible = False
+ End If
+ End Sub
+
'Private Sub GridViewGeraetOrder_RowUpdated(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowObjectEventArgs)
' If FormLoaded = True Then
' Try
diff --git a/Supplywatch/ModuleCURRENT.vb b/Supplywatch/ModuleCURRENT.vb
index 508a7ad..900fb51 100644
--- a/Supplywatch/ModuleCURRENT.vb
+++ b/Supplywatch/ModuleCURRENT.vb
@@ -1,4 +1,5 @@
Module ModuleCURRENT
Public CURRENT_GERAETE_ID As Integer
Public MyConnectionString As String
+ Public FILTER_DEVICE As String
End Module
diff --git a/Supplywatch/My Project/AssemblyInfo.vb b/Supplywatch/My Project/AssemblyInfo.vb
index 6583ee4..6224679 100644
--- a/Supplywatch/My Project/AssemblyInfo.vb
+++ b/Supplywatch/My Project/AssemblyInfo.vb
@@ -11,14 +11,14 @@ Imports System.Runtime.InteropServices
-
-
+
+
'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-
+
' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
'
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
+
diff --git a/Supplywatch/My Project/Resources.Designer.vb b/Supplywatch/My Project/Resources.Designer.vb
index 6764010..f134f85 100644
--- a/Supplywatch/My Project/Resources.Designer.vb
+++ b/Supplywatch/My Project/Resources.Designer.vb
@@ -320,6 +320,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property ImportCatalogPart_6777() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("ImportCatalogPart_6777", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
@@ -409,5 +419,15 @@ Namespace My.Resources
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property XSDSchema_ImportIcon() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("XSDSchema_ImportIcon", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
End Module
End Namespace
diff --git a/Supplywatch/My Project/Resources.resx b/Supplywatch/My Project/Resources.resx
index 6eb787c..2d7c0d3 100644
--- a/Supplywatch/My Project/Resources.resx
+++ b/Supplywatch/My Project/Resources.resx
@@ -127,12 +127,12 @@
..\Resources\benutzer7.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\My Downloads XP.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\arrow_Forward_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -148,6 +148,9 @@
..\Resources\arrow_Forward_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\aktualisieren_1.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -160,15 +163,15 @@
..\Resources\Beenden2.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\DigitalDataLogo.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\CheckIn_13188.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ico2168.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\EMAIL.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -190,11 +193,11 @@
..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\My Downloads XP.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\My Rar Files XP.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ico1411.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\link_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -208,11 +211,11 @@
..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\ico1411.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\My Rar Files XP.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ico2168.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bug.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -220,7 +223,10 @@
..\Resources\CheckOutforEdit_13187.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ImportCatalogPart_6777.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\XSDSchema_ImportIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/Supplywatch/MyDataset.Designer.vb b/Supplywatch/MyDataset.Designer.vb
index 341d7b0..1b92507 100644
--- a/Supplywatch/MyDataset.Designer.vb
+++ b/Supplywatch/MyDataset.Designer.vb
@@ -148,7 +148,7 @@ Partial Public Class MyDataset
Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public Sub New()
MyBase.New
Me.BeginInit
@@ -160,7 +160,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext)
MyBase.New(info, context, false)
If (Me.IsBinarySerialized(info, context) = true) Then
@@ -324,7 +324,7 @@ Partial Public Class MyDataset
End Sub
_
Public ReadOnly Property TBGERAET() As TBGERAETDataTable
@@ -334,7 +334,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLIES() As VWSUPPLIESDataTable
@@ -344,7 +344,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUS1() As TBWH_STATUS1DataTable
@@ -354,7 +354,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUS2() As TBWH_STATUS2DataTable
@@ -364,7 +364,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUS3() As TBWH_STATUS3DataTable
@@ -374,7 +374,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUSFILTER() As TBWH_STATUSFILTERDataTable
@@ -384,7 +384,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSUPPLY_VERFOLGUNG() As TBSUPPLY_VERFOLGUNGDataTable
@@ -394,7 +394,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBKONFIGURATION() As TBKONFIGURATIONDataTable
@@ -404,7 +404,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSTATUS() As TBSTATUSDataTable
@@ -414,7 +414,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_MARKT() As TBWH_MARKTDataTable
@@ -424,7 +424,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLIES_AKTUELL() As VWSUPPLIES_AKTUELLDataTable
@@ -434,7 +434,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWGERAET_ORDER() As VWGERAET_ORDERDataTable
@@ -444,7 +444,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLIES_TO_ORDER() As VWSUPPLIES_TO_ORDERDataTable
@@ -454,7 +454,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSUPPLIES() As TBSUPPLIESDataTable
@@ -464,7 +464,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUS4() As TBWH_STATUS4DataTable
@@ -474,7 +474,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_STATUS5() As TBWH_STATUS5DataTable
@@ -484,7 +484,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSUPPLY_BESTELLUNG() As TBSUPPLY_BESTELLUNGDataTable
@@ -494,7 +494,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_SUPPLIES_MARKT() As TBWH_SUPPLIES_MARKTDataTable
@@ -504,7 +504,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLY_BESTELLUNG_FRONTEND() As VWSUPPLY_BESTELLUNG_FRONTENDDataTable
@@ -514,7 +514,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBGERAETByMarkt() As TBGERAETByMarktDataTable
@@ -524,7 +524,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBIMPORT_PRODUKT() As TBIMPORT_PRODUKTDataTable
@@ -534,7 +534,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBVERTRAEGE() As TBVERTRAEGEDataTable
@@ -544,7 +544,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBPRODUKT_VERTRAG() As TBPRODUKT_VERTRAGDataTable
@@ -554,7 +554,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBGERAETE_NOTINLIST() As TBGERAETE_NOTINLISTDataTable
@@ -564,7 +564,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBWH_MODELL() As TBWH_MODELLDataTable
@@ -574,7 +574,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSUPPLY_DEFINITION() As TBSUPPLY_DEFINITIONDataTable
@@ -584,7 +584,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBGERAET_SUPPLY_ZUORDNUNG() As TBGERAET_SUPPLY_ZUORDNUNGDataTable
@@ -594,7 +594,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWGeraet_Supply_Zuordnung() As VWGeraet_Supply_ZuordnungDataTable
@@ -604,7 +604,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBUSER_RECHTE() As TBUSER_RECHTEDataTable
@@ -614,7 +614,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBMELDEDATUM() As TBMELDEDATUMDataTable
@@ -624,7 +624,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBGERAETE_VERFOLGUNG() As TBGERAETE_VERFOLGUNGDataTable
@@ -634,7 +634,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWMarkt_Verfolgung() As VWMarkt_VerfolgungDataTable
@@ -644,7 +644,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWGERAETE_VERFOLGUNG() As VWGERAETE_VERFOLGUNGDataTable
@@ -654,7 +654,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBREFLISTE_HISTORY() As TBREFLISTE_HISTORYDataTable
@@ -664,7 +664,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBMANDANTEN() As TBMANDANTENDataTable
@@ -674,7 +674,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLY_VERFOLGUNG() As VWSUPPLY_VERFOLGUNGDataTable
@@ -684,7 +684,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBIMPORT_PRODUKTE_DUPLIKATE() As TBIMPORT_PRODUKTE_DUPLIKATEDataTable
@@ -694,7 +694,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBCHANGE_LOG_GERAET() As TBCHANGE_LOG_GERAETDataTable
@@ -704,7 +704,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property TBSERVICE_IMP_LOG() As TBSERVICE_IMP_LOGDataTable
@@ -714,7 +714,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWGERAETE_MELDUNG_STATUS() As VWGERAETE_MELDUNG_STATUSDataTable
@@ -724,7 +724,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property ViewSUPPLY_STATUS_VERFOLGUNG() As ViewSUPPLY_STATUS_VERFOLGUNGDataTable
@@ -734,7 +734,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLIES_BESTELLUNG_GESENDET() As VWSUPPLIES_BESTELLUNG_GESENDETDataTable
@@ -744,7 +744,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWRPT_SUPPLIES_TOORDER() As VWRPT_SUPPLIES_TOORDERDataTable
@@ -754,7 +754,7 @@ Partial Public Class MyDataset
End Property
_
Public ReadOnly Property VWSUPPLIES_2_ORDER() As VWSUPPLIES_2_ORDERDataTable
@@ -764,7 +764,7 @@ Partial Public Class MyDataset
End Property
_
Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode
@@ -777,7 +777,7 @@ Partial Public Class MyDataset
End Property
_
Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection
Get
@@ -786,7 +786,7 @@ Partial Public Class MyDataset
End Property
_
Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection
Get
@@ -795,7 +795,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Overrides Sub InitializeDerivedDataSet()
Me.BeginInit
Me.InitClass
@@ -803,7 +803,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public Overrides Function Clone() As Global.System.Data.DataSet
Dim cln As MyDataset = CType(MyBase.Clone,MyDataset)
cln.InitVars
@@ -812,19 +812,19 @@ Partial Public Class MyDataset
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Overrides Function ShouldSerializeTables() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Overrides Function ShouldSerializeRelations() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader)
If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then
Me.Reset
@@ -977,7 +977,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema
Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream()
Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing))
@@ -986,13 +986,13 @@ Partial Public Class MyDataset
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Friend Overloads Sub InitVars()
Me.InitVars(true)
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Friend Overloads Sub InitVars(ByVal initTable As Boolean)
Me.tableTBGERAET = CType(MyBase.Tables("TBGERAET"),TBGERAETDataTable)
If (initTable = true) Then
@@ -1277,7 +1277,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Sub InitClass()
Me.DataSetName = "MyDataset"
Me.Prefix = ""
@@ -1407,271 +1407,271 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBGERAET() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLIES() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUS1() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUS2() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUS3() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUSFILTER() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSUPPLY_VERFOLGUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBKONFIGURATION() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSTATUS() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_MARKT() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLIES_AKTUELL() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWGERAET_ORDER() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLIES_TO_ORDER() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSUPPLIES() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUS4() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_STATUS5() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSUPPLY_BESTELLUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_SUPPLIES_MARKT() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLY_BESTELLUNG_FRONTEND() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBGERAETByMarkt() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBIMPORT_PRODUKT() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBVERTRAEGE() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBPRODUKT_VERTRAG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBGERAETE_NOTINLIST() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBWH_MODELL() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSUPPLY_DEFINITION() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBGERAET_SUPPLY_ZUORDNUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWGeraet_Supply_Zuordnung() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBUSER_RECHTE() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBMELDEDATUM() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBGERAETE_VERFOLGUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWMarkt_Verfolgung() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWGERAETE_VERFOLGUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBREFLISTE_HISTORY() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBMANDANTEN() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLY_VERFOLGUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBIMPORT_PRODUKTE_DUPLIKATE() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBCHANGE_LOG_GERAET() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeTBSERVICE_IMP_LOG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWGERAETE_MELDUNG_STATUS() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeViewSUPPLY_STATUS_VERFOLGUNG() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLIES_BESTELLUNG_GESENDET() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWRPT_SUPPLIES_TOORDER() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Function ShouldSerializeVWSUPPLIES_2_ORDER() As Boolean
Return false
End Function
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs)
If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then
Me.InitVars
@@ -1679,7 +1679,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType
Dim ds As MyDataset = New MyDataset()
Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType()
@@ -1728,136 +1728,136 @@ Partial Public Class MyDataset
Return type
End Function
- _
+ _
Public Delegate Sub TBGERAETRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGERAETRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLIESRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLIESRowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUS1RowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUS1RowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUS2RowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUS2RowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUS3RowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUS3RowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUSFILTERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUSFILTERRowChangeEvent)
- _
+ _
Public Delegate Sub TBSUPPLY_VERFOLGUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSUPPLY_VERFOLGUNGRowChangeEvent)
- _
+ _
Public Delegate Sub TBKONFIGURATIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBKONFIGURATIONRowChangeEvent)
- _
+ _
Public Delegate Sub TBSTATUSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSTATUSRowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_MARKTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_MARKTRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLIES_AKTUELLRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLIES_AKTUELLRowChangeEvent)
- _
+ _
Public Delegate Sub VWGERAET_ORDERRowChangeEventHandler(ByVal sender As Object, ByVal e As VWGERAET_ORDERRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLIES_TO_ORDERRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLIES_TO_ORDERRowChangeEvent)
- _
+ _
Public Delegate Sub TBSUPPLIESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSUPPLIESRowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUS4RowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUS4RowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_STATUS5RowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_STATUS5RowChangeEvent)
- _
+ _
Public Delegate Sub TBSUPPLY_BESTELLUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSUPPLY_BESTELLUNGRowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_SUPPLIES_MARKTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_SUPPLIES_MARKTRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLY_BESTELLUNG_FRONTENDRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLY_BESTELLUNG_FRONTENDRowChangeEvent)
- _
+ _
Public Delegate Sub TBGERAETByMarktRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGERAETByMarktRowChangeEvent)
- _
+ _
Public Delegate Sub TBIMPORT_PRODUKTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBIMPORT_PRODUKTRowChangeEvent)
- _
+ _
Public Delegate Sub TBVERTRAEGERowChangeEventHandler(ByVal sender As Object, ByVal e As TBVERTRAEGERowChangeEvent)
- _
+ _
Public Delegate Sub TBPRODUKT_VERTRAGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPRODUKT_VERTRAGRowChangeEvent)
- _
+ _
Public Delegate Sub TBGERAETE_NOTINLISTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGERAETE_NOTINLISTRowChangeEvent)
- _
+ _
Public Delegate Sub TBWH_MODELLRowChangeEventHandler(ByVal sender As Object, ByVal e As TBWH_MODELLRowChangeEvent)
- _
+ _
Public Delegate Sub TBSUPPLY_DEFINITIONRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSUPPLY_DEFINITIONRowChangeEvent)
- _
+ _
Public Delegate Sub TBGERAET_SUPPLY_ZUORDNUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGERAET_SUPPLY_ZUORDNUNGRowChangeEvent)
- _
+ _
Public Delegate Sub VWGeraet_Supply_ZuordnungRowChangeEventHandler(ByVal sender As Object, ByVal e As VWGeraet_Supply_ZuordnungRowChangeEvent)
- _
+ _
Public Delegate Sub TBUSER_RECHTERowChangeEventHandler(ByVal sender As Object, ByVal e As TBUSER_RECHTERowChangeEvent)
- _
+ _
Public Delegate Sub TBMELDEDATUMRowChangeEventHandler(ByVal sender As Object, ByVal e As TBMELDEDATUMRowChangeEvent)
- _
+ _
Public Delegate Sub TBGERAETE_VERFOLGUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGERAETE_VERFOLGUNGRowChangeEvent)
- _
+ _
Public Delegate Sub VWMarkt_VerfolgungRowChangeEventHandler(ByVal sender As Object, ByVal e As VWMarkt_VerfolgungRowChangeEvent)
- _
+ _
Public Delegate Sub VWGERAETE_VERFOLGUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As VWGERAETE_VERFOLGUNGRowChangeEvent)
- _
+ _
Public Delegate Sub TBREFLISTE_HISTORYRowChangeEventHandler(ByVal sender As Object, ByVal e As TBREFLISTE_HISTORYRowChangeEvent)
- _
+ _
Public Delegate Sub TBMANDANTENRowChangeEventHandler(ByVal sender As Object, ByVal e As TBMANDANTENRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLY_VERFOLGUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLY_VERFOLGUNGRowChangeEvent)
- _
+ _
Public Delegate Sub TBIMPORT_PRODUKTE_DUPLIKATERowChangeEventHandler(ByVal sender As Object, ByVal e As TBIMPORT_PRODUKTE_DUPLIKATERowChangeEvent)
- _
+ _
Public Delegate Sub TBCHANGE_LOG_GERAETRowChangeEventHandler(ByVal sender As Object, ByVal e As TBCHANGE_LOG_GERAETRowChangeEvent)
- _
+ _
Public Delegate Sub TBSERVICE_IMP_LOGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBSERVICE_IMP_LOGRowChangeEvent)
- _
+ _
Public Delegate Sub VWGERAETE_MELDUNG_STATUSRowChangeEventHandler(ByVal sender As Object, ByVal e As VWGERAETE_MELDUNG_STATUSRowChangeEvent)
- _
+ _
Public Delegate Sub ViewSUPPLY_STATUS_VERFOLGUNGRowChangeEventHandler(ByVal sender As Object, ByVal e As ViewSUPPLY_STATUS_VERFOLGUNGRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLIES_BESTELLUNG_GESENDETRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLIES_BESTELLUNG_GESENDETRowChangeEvent)
- _
+ _
Public Delegate Sub VWRPT_SUPPLIES_TOORDERRowChangeEventHandler(ByVal sender As Object, ByVal e As VWRPT_SUPPLIES_TOORDERRowChangeEvent)
- _
+ _
Public Delegate Sub VWSUPPLIES_2_ORDERRowChangeEventHandler(ByVal sender As Object, ByVal e As VWSUPPLIES_2_ORDERRowChangeEvent)
'''
@@ -1919,7 +1919,7 @@ Partial Public Class MyDataset
Private columnMandant_KZ As Global.System.Data.DataColumn
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public Sub New()
MyBase.New
Me.TableName = "TBGERAET"
@@ -1929,7 +1929,7 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Friend Sub New(ByVal table As Global.System.Data.DataTable)
MyBase.New
Me.TableName = table.TableName
@@ -1947,14 +1947,14 @@ Partial Public Class MyDataset
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext)
MyBase.New(info, context)
Me.InitVars
End Sub
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn
Get
Return Me.columnGUID
@@ -1962,7 +1962,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property BEZEICHNUNGColumn() As Global.System.Data.DataColumn
Get
Return Me.columnBEZEICHNUNG
@@ -1970,7 +1970,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property IP_ADRESSEColumn() As Global.System.Data.DataColumn
Get
Return Me.columnIP_ADRESSE
@@ -1978,7 +1978,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property SERIENNRColumn() As Global.System.Data.DataColumn
Get
Return Me.columnSERIENNR
@@ -1986,7 +1986,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property MARKTColumn() As Global.System.Data.DataColumn
Get
Return Me.columnMARKT
@@ -1994,7 +1994,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property PAGE_COUNTColumn() As Global.System.Data.DataColumn
Get
Return Me.columnPAGE_COUNT
@@ -2002,7 +2002,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property PPMColumn() As Global.System.Data.DataColumn
Get
Return Me.columnPPM
@@ -2010,7 +2010,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property BEMERKUNGColumn() As Global.System.Data.DataColumn
Get
Return Me.columnBEMERKUNG
@@ -2018,7 +2018,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property ERFASSTWANNColumn() As Global.System.Data.DataColumn
Get
Return Me.columnERFASSTWANN
@@ -2026,7 +2026,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property GEAENDERTWERColumn() As Global.System.Data.DataColumn
Get
Return Me.columnGEAENDERTWER
@@ -2034,7 +2034,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property GEAENDERTWANNColumn() As Global.System.Data.DataColumn
Get
Return Me.columnGEAENDERTWANN
@@ -2042,7 +2042,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property BESTELLUNGColumn() As Global.System.Data.DataColumn
Get
Return Me.columnBESTELLUNG
@@ -2050,7 +2050,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property MARKERColumn() As Global.System.Data.DataColumn
Get
Return Me.columnMARKER
@@ -2058,7 +2058,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property PC_INITIALColumn() As Global.System.Data.DataColumn
Get
Return Me.columnPC_INITIAL
@@ -2066,7 +2066,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property DATE_INITIALColumn() As Global.System.Data.DataColumn
Get
Return Me.columnDATE_INITIAL
@@ -2074,7 +2074,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property MODEL_NRColumn() As Global.System.Data.DataColumn
Get
Return Me.columnMODEL_NR
@@ -2082,7 +2082,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property UMGEZOGENColumn() As Global.System.Data.DataColumn
Get
Return Me.columnUMGEZOGEN
@@ -2090,7 +2090,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property VERTRAGSNRColumn() As Global.System.Data.DataColumn
Get
Return Me.columnVERTRAGSNR
@@ -2098,7 +2098,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property ONHOLDColumn() As Global.System.Data.DataColumn
Get
Return Me.columnONHOLD
@@ -2106,7 +2106,7 @@ Partial Public Class MyDataset
End Property
_
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Public ReadOnly Property ONHOLD_DATEColumn() As Global.System.Data.DataColumn
Get
Return Me.columnONHOLD_DATE
@@ -2114,7 +2114,7 @@ Partial Public Class MyDataset
End Property