Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb =================================================================== diff -u -r2089 -r2106 --- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2089) +++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 2106) @@ -984,8 +984,17 @@ .Where(Function(zijkamerFreesProductieData) Not IsNothing(zijkamerFreesProductieData)) _ .GroupBy(Function(zijkamerfreesProductieData) zijkamerfreesProductieData.PrintBarcodeLeft) _ .Select(Function(zijkamerfreesProductieData) zijkamerfreesProductieData.First()) _ - .Select(Function(zijkamerfreesProductieData) New AutomillingDto(zijkamerfreesProductieData)).ToList() + .Select(Function(zijkamerfreesProductieData) New AutomillingDto(zijkamerfreesProductieData, AutomillingDto.OorsprongDatabaseEnum.Productie)) _ + .ToList() ) + automilling.AddRange( + ardisDataList.Select(Function(ardisData) AutomillingMapper.OphalenUitHistoriek(ardisData.PartCalc)) _ + .Where(Function(zijkamerFreesProductieData) Not IsNothing(zijkamerFreesProductieData)) _ + .GroupBy(Function(zijkamerfreesProductieData) zijkamerfreesProductieData.PrintBarcodeLeft) _ + .Select(Function(zijkamerfreesProductieData) zijkamerfreesProductieData.First()) _ + .Select(Function(zijkamerfreesProductieData) New AutomillingDto(zijkamerfreesProductieData, AutomillingDto.OorsprongDatabaseEnum.Historiek)) _ + .ToList() + ) End Sub Public Sub RushGeefInformatieMetBatch(batch As String, ByRef ardis As List(Of ArdisDataDto), ByRef automilling As List(Of AutomillingDto)) Index: TAOR rework/TAOR rework/formulieren/Specials/FormRush.resx =================================================================== diff -u -r2088 -r2106 --- TAOR rework/TAOR rework/formulieren/Specials/FormRush.resx (.../FormRush.resx) (revision 2088) +++ TAOR rework/TAOR rework/formulieren/Specials/FormRush.resx (.../FormRush.resx) (revision 2106) @@ -117,30 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - Index: TAOR rework/TAOR rework/databases/Automilling/AutomillingDto.vb =================================================================== diff -u -r2087 -r2106 --- TAOR rework/TAOR rework/databases/Automilling/AutomillingDto.vb (.../AutomillingDto.vb) (revision 2087) +++ TAOR rework/TAOR rework/databases/Automilling/AutomillingDto.vb (.../AutomillingDto.vb) (revision 2106) @@ -2,6 +2,19 @@ Private ReadOnly _zijkamerFreesProductieData As ZijkamerFreesProductieData + Enum OorsprongDatabaseEnum + Historiek + Productie + End Enum + + Private _oorsprongDatabase As OorsprongDatabaseEnum + + Public ReadOnly Property OorsprongDatabase As OorsprongDatabaseEnum + Get + Return _oorsprongDatabase + End Get + End Property + Public ReadOnly Property PrintBarcodeLeft() As String Get Return _zijkamerFreesProductieData.PrintBarcodeLeft @@ -26,7 +39,14 @@ End Get End Property - Sub New(zijkamerFreesProductieData As ZijkamerFreesProductieData) + Public ReadOnly Property PickPlace() As String + Get + Return _zijkamerFreesProductieData.PickPlace + End Get + End Property + + Sub New(zijkamerFreesProductieData As ZijkamerFreesProductieData, oorsprongDatabase As OorsprongDatabaseEnum) _zijkamerFreesProductieData = zijkamerFreesProductieData + _oorsprongDatabase = oorsprongDatabase End Sub End Class Index: TAOR rework/TAOR rework/databases/Ardis/ArdisDataDto.vb =================================================================== diff -u -r2087 -r2106 --- TAOR rework/TAOR rework/databases/Ardis/ArdisDataDto.vb (.../ArdisDataDto.vb) (revision 2087) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisDataDto.vb (.../ArdisDataDto.vb) (revision 2106) @@ -32,6 +32,18 @@ End Get End Property + Public ReadOnly Property PartQtyCut() As String + Get + Return _ardisData.PartQtyCut + End Get + End Property + + Public ReadOnly Property PartRef() As String + Get + Return _ardisData.PartRef + End Get + End Property + Public Sub New(ardisData As ArdisData) _ardisData = ardisData End Sub Index: TAOR rework/TAOR rework/formulieren/Specials/FormRush.vb =================================================================== diff -u -r2088 -r2106 --- TAOR rework/TAOR rework/formulieren/Specials/FormRush.vb (.../FormRush.vb) (revision 2088) +++ TAOR rework/TAOR rework/formulieren/Specials/FormRush.vb (.../FormRush.vb) (revision 2106) @@ -12,50 +12,19 @@ End Sub Private Sub TextBoxZoekwaarde_TextChanged(sender As Object, e As EventArgs) Handles TextBoxZoekwaarde.TextChanged - btnZoek.Enabled = Not String.IsNullOrEmpty(TextBoxZoekwaarde.Text) - btnRush.Enabled = False + ButtonZoek.Enabled = Not String.IsNullOrEmpty(TextBoxZoekwaarde.Text) + ButtonRush.Enabled = False End Sub - Private Sub DataGridViewOnderdelenOplijstingArdis_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridViewOnderdelenOplijstingArdis.SelectionChanged - DataGridViewOnderdelenOplijstingArdis.ClearSelection() - End Sub - - Private Sub DataGridViewOnderdelenOplijstingAutomilling_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridViewOnderdelenOplijstingAutomilling.SelectionChanged - DataGridViewOnderdelenOplijstingAutomilling.ClearSelection() - End Sub - #Region "Zoeken" - Private Sub VisualiseerDatas(ByRef ardisDatas As List(Of ArdisDataDto), ByRef automillingDatas As List(Of AutomillingDto)) - 'Ardis - DataGridViewOnderdelenOplijstingArdis.Rows.Clear() - LabelAantalArdis.Text = ardisDatas.Count - For Each ardisData In ardisDatas - DataGridViewOnderdelenOplijstingArdis.Rows.Add(New String() {ardisData.PartCalc, - ardisData.Inserted, - ardisData.PartRemark3, - ardisData.PartExt04 - }) - Next - 'Automilling - DataGridViewOnderdelenOplijstingAutomilling.Rows.Clear() - LabelAantalAutomilling.Text = automillingDatas.Count - For Each automillingData In automillingDatas - DataGridViewOnderdelenOplijstingAutomilling.Rows.Add(New String() {automillingData.PrintBarcodeLeft.Trim(), - automillingData.PrintBarcodeRight.Trim(), - automillingData.PrintTextLeft1.Trim(), - automillingData.PrintTextRight1.Trim() - }) - Next - End Sub - - Private Sub btnZoek_Click(sender As Object, e As EventArgs) Handles btnZoek.Click + Private Sub Zoek() Dim ardisDatas As New List(Of ArdisDataDto) Dim automillingDatas As New List(Of AutomillingDto) 'Zoekbutton disablen, zodat geen twee keer kan gedrukt worden tijdens opzoeken. - btnZoek.Enabled = False - btnRush.Enabled = False + ButtonZoek.Enabled = False + ButtonRush.Enabled = False Try If radioBatchNummer.Checked Then @@ -66,7 +35,7 @@ VisualiseerDatas(ardisDatas, automillingDatas) End If - btnRush.Enabled = Not (ardisDatas.Count = 0 Or automillingDatas.Count = 0) + ButtonRush.Enabled = Not (ardisDatas.Count = 0 Or automillingDatas.Count = 0) Catch ex As Exception 'Tekst in input selecteren. TextBoxZoekwaarde.SelectAll() @@ -75,17 +44,47 @@ MessageBox.Show($"{ex.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) End Try - btnZoek.Enabled = True + ButtonZoek.Enabled = True End Sub + Private Sub VisualiseerDatas(ByRef ardisDatas As List(Of ArdisDataDto), ByRef automillingDatas As List(Of AutomillingDto)) + 'Ardis + LabelAantalArdis.Text = ardisDatas.Count + Dim nogTeZagen = ardisDatas.Where(Function(x) IsNothing(x.PartQtyCut)) + LabelAantalTeZagenArdis.Text = nogTeZagen.Count() + LabelAantalZijkantenArdis.Text = nogTeZagen.Where(Function(x) x.PartRef.Equals("ZijkantPlaat")).Count() + LabelAantalBodemsArdis.Text = nogTeZagen.Where(Function(x) x.PartRef.Equals("Bodem")).Count() + LabelAantalRuggenArdis.Text = nogTeZagen.Where(Function(x) x.PartRef.Equals("Rug")).Count() + LabelAantalFrontenArdis.Text = nogTeZagen.Where(Function(x) x.PartRef.Equals("Front")).Count() + LabelAantalAlGerushedArdis.Text = ardisDatas.Where(Function(x) x.PartRemark3.Equals("Rush")).Count() + + 'Automilling + LabelAantalProductionAutomilling.Text = automillingDatas.Where(Function(x) x.OorsprongDatabase = AutomillingDto.OorsprongDatabaseEnum.Productie) _ + .Where(Function(x) x.PickPlace.Equals("C")).Count() + + LabelAantalHistoryAutomilling.Text = automillingDatas.Where(Function(x) x.OorsprongDatabase = AutomillingDto.OorsprongDatabaseEnum.Historiek) _ + .Where(Function(x) x.PickPlace.Equals("C")).Count() + End Sub + + Private Sub TextBoxZoekwaarde_KeyDown(sender As Object, e As KeyEventArgs) Handles TextBoxZoekwaarde.KeyDown + If e.KeyCode = Keys.Enter Then + Zoek() + e.Handled = True + End If + End Sub + + Private Sub ButtonZoek_Click(sender As Object, e As EventArgs) Handles ButtonZoek.Click + Zoek() + End Sub + #End Region #Region "Rushen" - Private Sub btnRush_Click(sender As Object, e As EventArgs) Handles btnRush.Click + Private Sub btnRush_Click(sender As Object, e As EventArgs) Handles ButtonRush.Click 'Buttons disablen, zodat geen twee keer kan gedrukt worden. - btnZoek.Enabled = False - btnRush.Enabled = False + ButtonZoek.Enabled = False + ButtonRush.Enabled = False Try If radioBatchNummer.Checked Then @@ -97,7 +96,7 @@ MessageBox.Show($"{ex.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) End Try - btnZoek.Enabled = True + ButtonZoek.Enabled = True End Sub #End Region Index: TAOR rework/TAOR rework/formulieren/Specials/FormRush.Designer.vb =================================================================== diff -u -r2088 -r2106 --- TAOR rework/TAOR rework/formulieren/Specials/FormRush.Designer.vb (.../FormRush.Designer.vb) (revision 2088) +++ TAOR rework/TAOR rework/formulieren/Specials/FormRush.Designer.vb (.../FormRush.Designer.vb) (revision 2106) @@ -22,140 +22,162 @@ 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormRush)) Me.Panel1 = New System.Windows.Forms.Panel() - Me.LabelAantalAutomilling = New System.Windows.Forms.Label() + Me.LabelAantalTeZagenArdis = New System.Windows.Forms.Label() + Me.LabelAantalHistoryAutomilling = New System.Windows.Forms.Label() + Me.Label19 = New System.Windows.Forms.Label() + Me.LabelAantalProductionAutomilling = New System.Windows.Forms.Label() + Me.Label21 = New System.Windows.Forms.Label() + Me.LabelAantalAlGerushedArdis = New System.Windows.Forms.Label() + Me.Label11 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() Me.Label4 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.DataGridViewOnderdelenOplijstingAutomilling = New System.Windows.Forms.DataGridView() Me.radioBatchNummer = New System.Windows.Forms.RadioButton() Me.radioLadeCode = New System.Windows.Forms.RadioButton() Me.LabelAantalArdis = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.btnRush = New System.Windows.Forms.Button() - Me.btnZoek = New System.Windows.Forms.Button() + Me.ButtonRush = New System.Windows.Forms.Button() + Me.ButtonZoek = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.TextBoxZoekwaarde = New System.Windows.Forms.TextBox() Me.Label9 = New System.Windows.Forms.Label() - Me.DataGridViewOnderdelenOplijstingArdis = New System.Windows.Forms.DataGridView() Me.lblVerwerking = New System.Windows.Forms.Label() Me.btnTerug = New System.Windows.Forms.Button() - Me.PrintBarcodeLeft = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PrintBarcodeRight = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PrintTextLeft1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PrintTextRight1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PartCalc = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.Inserted = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PartRemark3 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.PartExt04 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.LabelAantalZijkantenArdis = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.LabelAantalBodemsArdis = New System.Windows.Forms.Label() + Me.Label8 = New System.Windows.Forms.Label() + Me.LabelAantalRuggenArdis = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.LabelAantalFrontenArdis = New System.Windows.Forms.Label() + Me.Label13 = New System.Windows.Forms.Label() Me.Panel1.SuspendLayout() - CType(Me.DataGridViewOnderdelenOplijstingAutomilling, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DataGridViewOnderdelenOplijstingArdis, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel1 ' Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top - Me.Panel1.Controls.Add(Me.LabelAantalAutomilling) - Me.Panel1.Controls.Add(Me.Label4) + Me.Panel1.Controls.Add(Me.LabelAantalFrontenArdis) + Me.Panel1.Controls.Add(Me.Label13) + Me.Panel1.Controls.Add(Me.LabelAantalRuggenArdis) + Me.Panel1.Controls.Add(Me.Label7) + Me.Panel1.Controls.Add(Me.LabelAantalBodemsArdis) + Me.Panel1.Controls.Add(Me.Label8) + Me.Panel1.Controls.Add(Me.LabelAantalZijkantenArdis) Me.Panel1.Controls.Add(Me.Label5) - Me.Panel1.Controls.Add(Me.DataGridViewOnderdelenOplijstingAutomilling) + Me.Panel1.Controls.Add(Me.LabelAantalTeZagenArdis) + Me.Panel1.Controls.Add(Me.LabelAantalHistoryAutomilling) + Me.Panel1.Controls.Add(Me.Label19) + Me.Panel1.Controls.Add(Me.LabelAantalProductionAutomilling) + Me.Panel1.Controls.Add(Me.Label21) + Me.Panel1.Controls.Add(Me.LabelAantalAlGerushedArdis) + Me.Panel1.Controls.Add(Me.Label11) + Me.Panel1.Controls.Add(Me.Label6) + Me.Panel1.Controls.Add(Me.Label4) Me.Panel1.Controls.Add(Me.radioBatchNummer) Me.Panel1.Controls.Add(Me.radioLadeCode) Me.Panel1.Controls.Add(Me.LabelAantalArdis) Me.Panel1.Controls.Add(Me.Label1) - Me.Panel1.Controls.Add(Me.btnRush) - Me.Panel1.Controls.Add(Me.btnZoek) + Me.Panel1.Controls.Add(Me.ButtonRush) + Me.Panel1.Controls.Add(Me.ButtonZoek) Me.Panel1.Controls.Add(Me.Label2) Me.Panel1.Controls.Add(Me.TextBoxZoekwaarde) Me.Panel1.Controls.Add(Me.Label9) - Me.Panel1.Controls.Add(Me.DataGridViewOnderdelenOplijstingArdis) Me.Panel1.Controls.Add(Me.lblVerwerking) Me.Panel1.Controls.Add(Me.btnTerug) Me.Panel1.Location = New System.Drawing.Point(58, 34) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1789, 886) Me.Panel1.TabIndex = 71 ' - 'LabelAantalAutomilling + 'LabelAantalTeZagenArdis ' - Me.LabelAantalAutomilling.AutoSize = True - Me.LabelAantalAutomilling.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelAantalAutomilling.Location = New System.Drawing.Point(921, 324) - Me.LabelAantalAutomilling.Name = "LabelAantalAutomilling" - Me.LabelAantalAutomilling.Size = New System.Drawing.Size(0, 31) - Me.LabelAantalAutomilling.TabIndex = 116 + Me.LabelAantalTeZagenArdis.AutoSize = True + Me.LabelAantalTeZagenArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalTeZagenArdis.Location = New System.Drawing.Point(216, 371) + Me.LabelAantalTeZagenArdis.Name = "LabelAantalTeZagenArdis" + Me.LabelAantalTeZagenArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalTeZagenArdis.TabIndex = 131 ' + 'LabelAantalHistoryAutomilling + ' + Me.LabelAantalHistoryAutomilling.AutoSize = True + Me.LabelAantalHistoryAutomilling.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalHistoryAutomilling.Location = New System.Drawing.Point(613, 369) + Me.LabelAantalHistoryAutomilling.Name = "LabelAantalHistoryAutomilling" + Me.LabelAantalHistoryAutomilling.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalHistoryAutomilling.TabIndex = 130 + ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label19.Location = New System.Drawing.Point(508, 371) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(108, 31) + Me.Label19.TabIndex = 129 + Me.Label19.Text = "History:" + ' + 'LabelAantalProductionAutomilling + ' + Me.LabelAantalProductionAutomilling.AutoSize = True + Me.LabelAantalProductionAutomilling.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalProductionAutomilling.Location = New System.Drawing.Point(657, 331) + Me.LabelAantalProductionAutomilling.Name = "LabelAantalProductionAutomilling" + Me.LabelAantalProductionAutomilling.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalProductionAutomilling.TabIndex = 128 + ' + 'Label21 + ' + Me.Label21.AutoSize = True + Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label21.Location = New System.Drawing.Point(508, 331) + Me.Label21.Name = "Label21" + Me.Label21.Size = New System.Drawing.Size(166, 31) + Me.Label21.TabIndex = 127 + Me.Label21.Text = "Production: " + ' + 'LabelAantalAlGerushedArdis + ' + Me.LabelAantalAlGerushedArdis.AutoSize = True + Me.LabelAantalAlGerushedArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalAlGerushedArdis.Location = New System.Drawing.Point(175, 590) + Me.LabelAantalAlGerushedArdis.Name = "LabelAantalAlGerushedArdis" + Me.LabelAantalAlGerushedArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalAlGerushedArdis.TabIndex = 125 + ' + 'Label11 + ' + Me.Label11.AutoSize = True + Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label11.Location = New System.Drawing.Point(13, 590) + Me.Label11.Name = "Label11" + Me.Label11.Size = New System.Drawing.Size(173, 31) + Me.Label11.TabIndex = 122 + Me.Label11.Text = "Al gerushed: " + ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(36, 371) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(183, 31) + Me.Label6.TabIndex = 117 + Me.Label6.Text = "Nog te zagen:" + ' 'Label4 ' Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label4.AutoSize = True Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.Location = New System.Drawing.Point(1142, 282) + Me.Label4.Location = New System.Drawing.Point(589, 282) Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(322, 31) + Me.Label4.Size = New System.Drawing.Size(157, 31) Me.Label4.TabIndex = 115 - Me.Label4.Text = "Automilling (production)" + Me.Label4.Text = "Automilling" ' - 'Label5 - ' - Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Label5.AutoSize = True - Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(815, 324) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(106, 31) - Me.Label5.TabIndex = 114 - Me.Label5.Text = "Aantal: " - ' - 'DataGridViewOnderdelenOplijstingAutomilling - ' - Me.DataGridViewOnderdelenOplijstingAutomilling.AllowUserToAddRows = False - Me.DataGridViewOnderdelenOplijstingAutomilling.AllowUserToDeleteRows = False - Me.DataGridViewOnderdelenOplijstingAutomilling.AllowUserToResizeColumns = False - Me.DataGridViewOnderdelenOplijstingAutomilling.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.DataGridViewOnderdelenOplijstingAutomilling.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.DataGridViewOnderdelenOplijstingAutomilling.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.DataGridViewOnderdelenOplijstingAutomilling.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells - Me.DataGridViewOnderdelenOplijstingAutomilling.BackgroundColor = System.Drawing.SystemColors.Control - Me.DataGridViewOnderdelenOplijstingAutomilling.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.DataGridViewOnderdelenOplijstingAutomilling.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewOnderdelenOplijstingAutomilling.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 - Me.DataGridViewOnderdelenOplijstingAutomilling.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DataGridViewOnderdelenOplijstingAutomilling.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.PrintBarcodeLeft, Me.PrintBarcodeRight, Me.PrintTextLeft1, Me.PrintTextRight1}) - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridViewOnderdelenOplijstingAutomilling.DefaultCellStyle = DataGridViewCellStyle3 - Me.DataGridViewOnderdelenOplijstingAutomilling.Location = New System.Drawing.Point(821, 358) - Me.DataGridViewOnderdelenOplijstingAutomilling.MultiSelect = False - Me.DataGridViewOnderdelenOplijstingAutomilling.Name = "DataGridViewOnderdelenOplijstingAutomilling" - Me.DataGridViewOnderdelenOplijstingAutomilling.ReadOnly = True - Me.DataGridViewOnderdelenOplijstingAutomilling.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None - Me.DataGridViewOnderdelenOplijstingAutomilling.RowHeadersVisible = False - Me.DataGridViewOnderdelenOplijstingAutomilling.RowTemplate.Height = 40 - Me.DataGridViewOnderdelenOplijstingAutomilling.Size = New System.Drawing.Size(965, 503) - Me.DataGridViewOnderdelenOplijstingAutomilling.TabIndex = 113 - Me.DataGridViewOnderdelenOplijstingAutomilling.TabStop = False - ' 'radioBatchNummer ' Me.radioBatchNummer.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ @@ -188,7 +210,7 @@ ' Me.LabelAantalArdis.AutoSize = True Me.LabelAantalArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelAantalArdis.Location = New System.Drawing.Point(118, 324) + Me.LabelAantalArdis.Location = New System.Drawing.Point(108, 324) Me.LabelAantalArdis.Name = "LabelAantalArdis" Me.LabelAantalArdis.Size = New System.Drawing.Size(0, 31) Me.LabelAantalArdis.TabIndex = 110 @@ -197,35 +219,35 @@ ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Underline), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(331, 282) + Me.Label1.Location = New System.Drawing.Point(127, 282) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(81, 31) Me.Label1.TabIndex = 108 Me.Label1.Text = "Ardis" ' - 'btnRush + 'ButtonRush ' - Me.btnRush.Enabled = False - Me.btnRush.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnRush.Location = New System.Drawing.Point(372, 150) - Me.btnRush.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) - Me.btnRush.Name = "btnRush" - Me.btnRush.Size = New System.Drawing.Size(344, 68) - Me.btnRush.TabIndex = 107 - Me.btnRush.Text = "Rush" - Me.btnRush.UseVisualStyleBackColor = True + Me.ButtonRush.Enabled = False + Me.ButtonRush.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonRush.Location = New System.Drawing.Point(372, 150) + Me.ButtonRush.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) + Me.ButtonRush.Name = "ButtonRush" + Me.ButtonRush.Size = New System.Drawing.Size(344, 68) + Me.ButtonRush.TabIndex = 107 + Me.ButtonRush.Text = "Rush" + Me.ButtonRush.UseVisualStyleBackColor = True ' - 'btnZoek + 'ButtonZoek ' - Me.btnZoek.Enabled = False - Me.btnZoek.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnZoek.Location = New System.Drawing.Point(19, 150) - Me.btnZoek.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) - Me.btnZoek.Name = "btnZoek" - Me.btnZoek.Size = New System.Drawing.Size(344, 68) - Me.btnZoek.TabIndex = 103 - Me.btnZoek.Text = "Zoek" - Me.btnZoek.UseVisualStyleBackColor = True + Me.ButtonZoek.Enabled = False + Me.ButtonZoek.Font = New System.Drawing.Font("Microsoft Sans Serif", 25.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ButtonZoek.Location = New System.Drawing.Point(19, 150) + Me.ButtonZoek.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) + Me.ButtonZoek.Name = "ButtonZoek" + Me.ButtonZoek.Size = New System.Drawing.Size(344, 68) + Me.ButtonZoek.TabIndex = 103 + Me.ButtonZoek.Text = "Zoek" + Me.ButtonZoek.UseVisualStyleBackColor = True ' 'Label2 ' @@ -252,53 +274,12 @@ ' Me.Label9.AutoSize = True Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label9.Location = New System.Drawing.Point(22, 324) + Me.Label9.Location = New System.Drawing.Point(13, 324) Me.Label9.Name = "Label9" - Me.Label9.Size = New System.Drawing.Size(106, 31) + Me.Label9.Size = New System.Drawing.Size(105, 31) Me.Label9.TabIndex = 95 - Me.Label9.Text = "Aantal: " + Me.Label9.Text = "Totaal: " ' - 'DataGridViewOnderdelenOplijstingArdis - ' - Me.DataGridViewOnderdelenOplijstingArdis.AllowUserToAddRows = False - Me.DataGridViewOnderdelenOplijstingArdis.AllowUserToDeleteRows = False - Me.DataGridViewOnderdelenOplijstingArdis.AllowUserToResizeColumns = False - Me.DataGridViewOnderdelenOplijstingArdis.AllowUserToResizeRows = False - DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) - Me.DataGridViewOnderdelenOplijstingArdis.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4 - Me.DataGridViewOnderdelenOplijstingArdis.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells - Me.DataGridViewOnderdelenOplijstingArdis.BackgroundColor = System.Drawing.SystemColors.Control - Me.DataGridViewOnderdelenOplijstingArdis.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.DataGridViewOnderdelenOplijstingArdis.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None - DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle5.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewOnderdelenOplijstingArdis.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 - Me.DataGridViewOnderdelenOplijstingArdis.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.DataGridViewOnderdelenOplijstingArdis.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.PartCalc, Me.Inserted, Me.PartRemark3, Me.PartExt04}) - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle6.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.DataGridViewOnderdelenOplijstingArdis.DefaultCellStyle = DataGridViewCellStyle6 - Me.DataGridViewOnderdelenOplijstingArdis.Location = New System.Drawing.Point(19, 358) - Me.DataGridViewOnderdelenOplijstingArdis.MultiSelect = False - Me.DataGridViewOnderdelenOplijstingArdis.Name = "DataGridViewOnderdelenOplijstingArdis" - Me.DataGridViewOnderdelenOplijstingArdis.ReadOnly = True - Me.DataGridViewOnderdelenOplijstingArdis.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None - Me.DataGridViewOnderdelenOplijstingArdis.RowHeadersVisible = False - Me.DataGridViewOnderdelenOplijstingArdis.RowTemplate.Height = 40 - Me.DataGridViewOnderdelenOplijstingArdis.Size = New System.Drawing.Size(760, 503) - Me.DataGridViewOnderdelenOplijstingArdis.TabIndex = 94 - Me.DataGridViewOnderdelenOplijstingArdis.TabStop = False - ' 'lblVerwerking ' Me.lblVerwerking.AutoSize = True @@ -321,65 +302,81 @@ Me.btnTerug.Text = "Terug" Me.btnTerug.UseVisualStyleBackColor = True ' - 'PrintBarcodeLeft + 'LabelAantalZijkantenArdis ' - Me.PrintBarcodeLeft.HeaderText = "Barcode links" - Me.PrintBarcodeLeft.MinimumWidth = 2 - Me.PrintBarcodeLeft.Name = "PrintBarcodeLeft" - Me.PrintBarcodeLeft.ReadOnly = True - Me.PrintBarcodeLeft.Width = 148 + Me.LabelAantalZijkantenArdis.AutoSize = True + Me.LabelAantalZijkantenArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalZijkantenArdis.Location = New System.Drawing.Point(216, 410) + Me.LabelAantalZijkantenArdis.Name = "LabelAantalZijkantenArdis" + Me.LabelAantalZijkantenArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalZijkantenArdis.TabIndex = 133 ' - 'PrintBarcodeRight + 'Label5 ' - Me.PrintBarcodeRight.HeaderText = "Barcode rechts" - Me.PrintBarcodeRight.MinimumWidth = 2 - Me.PrintBarcodeRight.Name = "PrintBarcodeRight" - Me.PrintBarcodeRight.ReadOnly = True - Me.PrintBarcodeRight.Width = 162 + Me.Label5.AutoSize = True + Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.Location = New System.Drawing.Point(86, 409) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(133, 31) + Me.Label5.TabIndex = 132 + Me.Label5.Text = "Zijkanten:" ' - 'PrintTextLeft1 + 'LabelAantalBodemsArdis ' - Me.PrintTextLeft1.HeaderText = "Etiket links" - Me.PrintTextLeft1.Name = "PrintTextLeft1" - Me.PrintTextLeft1.ReadOnly = True - Me.PrintTextLeft1.Width = 122 + Me.LabelAantalBodemsArdis.AutoSize = True + Me.LabelAantalBodemsArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalBodemsArdis.Location = New System.Drawing.Point(216, 455) + Me.LabelAantalBodemsArdis.Name = "LabelAantalBodemsArdis" + Me.LabelAantalBodemsArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalBodemsArdis.TabIndex = 135 ' - 'PrintTextRight1 + 'Label8 ' - Me.PrintTextRight1.HeaderText = "Etiket rechts" - Me.PrintTextRight1.Name = "PrintTextRight1" - Me.PrintTextRight1.ReadOnly = True - Me.PrintTextRight1.Width = 136 + Me.Label8.AutoSize = True + Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.Location = New System.Drawing.Point(99, 454) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(121, 31) + Me.Label8.TabIndex = 134 + Me.Label8.Text = "Bodems:" ' - 'PartCalc + 'LabelAantalRuggenArdis ' - Me.PartCalc.HeaderText = "Barcode" - Me.PartCalc.MinimumWidth = 2 - Me.PartCalc.Name = "PartCalc" - Me.PartCalc.ReadOnly = True - Me.PartCalc.Width = 106 + Me.LabelAantalRuggenArdis.AutoSize = True + Me.LabelAantalRuggenArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalRuggenArdis.Location = New System.Drawing.Point(214, 498) + Me.LabelAantalRuggenArdis.Name = "LabelAantalRuggenArdis" + Me.LabelAantalRuggenArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalRuggenArdis.TabIndex = 137 ' - 'Inserted + 'Label7 ' - Me.Inserted.HeaderText = "Inserted" - Me.Inserted.MinimumWidth = 2 - Me.Inserted.Name = "Inserted" - Me.Inserted.ReadOnly = True - Me.Inserted.Width = 102 + Me.Label7.AutoSize = True + Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.Location = New System.Drawing.Point(102, 497) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(117, 31) + Me.Label7.TabIndex = 136 + Me.Label7.Text = "Ruggen:" ' - 'PartRemark3 + 'LabelAantalFrontenArdis ' - Me.PartRemark3.HeaderText = "Status" - Me.PartRemark3.Name = "PartRemark3" - Me.PartRemark3.ReadOnly = True - Me.PartRemark3.Width = 85 + Me.LabelAantalFrontenArdis.AutoSize = True + Me.LabelAantalFrontenArdis.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.LabelAantalFrontenArdis.Location = New System.Drawing.Point(213, 541) + Me.LabelAantalFrontenArdis.Name = "LabelAantalFrontenArdis" + Me.LabelAantalFrontenArdis.Size = New System.Drawing.Size(0, 31) + Me.LabelAantalFrontenArdis.TabIndex = 139 ' - 'PartExt04 + 'Label13 ' - Me.PartExt04.HeaderText = "Label" - Me.PartExt04.Name = "PartExt04" - Me.PartExt04.ReadOnly = True - Me.PartExt04.Width = 81 + Me.Label13.AutoSize = True + Me.Label13.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label13.Location = New System.Drawing.Point(101, 540) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(116, 31) + Me.Label13.TabIndex = 138 + Me.Label13.Text = "Fronten:" ' 'FormRush ' @@ -392,8 +389,6 @@ Me.Text = "TA'OR rework - Rush" Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.DataGridViewOnderdelenOplijstingAutomilling, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DataGridViewOnderdelenOplijstingArdis, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -402,25 +397,33 @@ Friend WithEvents lblVerwerking As Label Friend WithEvents btnTerug As Button Friend WithEvents Label9 As Label - Friend WithEvents DataGridViewOnderdelenOplijstingArdis As DataGridView - Friend WithEvents btnRush As Button - Friend WithEvents btnZoek As Button + Friend WithEvents ButtonRush As Button + Friend WithEvents ButtonZoek As Button Friend WithEvents Label2 As Label Friend WithEvents TextBoxZoekwaarde As TextBox Friend WithEvents Label1 As Label Friend WithEvents LabelAantalArdis As Label Friend WithEvents radioBatchNummer As RadioButton Friend WithEvents radioLadeCode As RadioButton - Friend WithEvents LabelAantalAutomilling As Label Friend WithEvents Label4 As Label - Friend WithEvents Label5 As Label - Friend WithEvents DataGridViewOnderdelenOplijstingAutomilling As DataGridView Friend WithEvents PrintBarcodeLeft As DataGridViewTextBoxColumn Friend WithEvents PrintBarcodeRight As DataGridViewTextBoxColumn Friend WithEvents PrintTextLeft1 As DataGridViewTextBoxColumn Friend WithEvents PrintTextRight1 As DataGridViewTextBoxColumn - Friend WithEvents PartCalc As DataGridViewTextBoxColumn - Friend WithEvents Inserted As DataGridViewTextBoxColumn - Friend WithEvents PartRemark3 As DataGridViewTextBoxColumn - Friend WithEvents PartExt04 As DataGridViewTextBoxColumn + Friend WithEvents Label6 As Label + Friend WithEvents Label11 As Label + Friend WithEvents LabelAantalAlGerushedArdis As Label + Friend WithEvents LabelAantalHistoryAutomilling As Label + Friend WithEvents Label19 As Label + Friend WithEvents LabelAantalProductionAutomilling As Label + Friend WithEvents Label21 As Label + Friend WithEvents LabelAantalTeZagenArdis As Label + Friend WithEvents LabelAantalBodemsArdis As Label + Friend WithEvents Label8 As Label + Friend WithEvents LabelAantalZijkantenArdis As Label + Friend WithEvents Label5 As Label + Friend WithEvents LabelAantalFrontenArdis As Label + Friend WithEvents Label13 As Label + Friend WithEvents LabelAantalRuggenArdis As Label + Friend WithEvents Label7 As Label End Class Index: TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb =================================================================== diff -u -r2087 -r2106 --- TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 2087) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisData.vb (.../ArdisData.vb) (revision 2106) @@ -63,7 +63,7 @@ End Sub Public Function isRework() As Boolean - Return PartExt04.Contains("/***REWORK***") + Return PartRemark3.Equals("Rework") End Function Public Function geefLinksOfRechts() As String