Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb =================================================================== diff -u -r1875 -r1893 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1875) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1893) @@ -28,18 +28,18 @@ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(FormReworkAutomilling)) Me.Panel1 = New System.Windows.Forms.Panel() Me.DataGridViewUitgeworpen = New System.Windows.Forms.DataGridView() + Me.lblVerwerking = New System.Windows.Forms.Label() + Me.btnTerug = New System.Windows.Forms.Button() + Me.btnRework = New System.Windows.Forms.Button() + Me.nettoheightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.nettolengthcol = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colorcol = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.batchidcol = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.palletidcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.leftrightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcodeleftcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcoderightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.batchidcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.pickplacecol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.palletidcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.picktimestampcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.nettolengthcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colorcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.lblVerwerking = New System.Windows.Forms.Label() - Me.btnTerug = New System.Windows.Forms.Button() - Me.btnRework = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout CType(Me.DataGridViewUitgeworpen,System.ComponentModel.ISupportInitialize).BeginInit Me.SuspendLayout @@ -51,9 +51,9 @@ Me.Panel1.Controls.Add(Me.lblVerwerking) Me.Panel1.Controls.Add(Me.btnTerug) Me.Panel1.Controls.Add(Me.btnRework) - Me.Panel1.Location = New System.Drawing.Point(280, 10) + Me.Panel1.Location = New System.Drawing.Point(397, 10) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1224, 653) + Me.Panel1.Size = New System.Drawing.Size(1058, 639) Me.Panel1.TabIndex = 70 ' 'DataGridViewUitgeworpen @@ -74,7 +74,7 @@ Me.DataGridViewUitgeworpen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1 Me.DataGridViewUitgeworpen.ColumnHeadersHeight = 50 Me.DataGridViewUitgeworpen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - Me.DataGridViewUitgeworpen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.leftrightcol, Me.printbarcodeleftcol, Me.printbarcoderightcol, Me.batchidcol, Me.pickplacecol, Me.palletidcol, Me.picktimestampcol, Me.nettolengthcol, Me.colorcol}) + Me.DataGridViewUitgeworpen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.nettoheightcol, Me.nettolengthcol, Me.colorcol, Me.batchidcol, Me.palletidcol, Me.leftrightcol, Me.printbarcodeleftcol, Me.printbarcoderightcol, Me.picktimestampcol}) DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) @@ -83,7 +83,7 @@ DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] Me.DataGridViewUitgeworpen.DefaultCellStyle = DataGridViewCellStyle2 - Me.DataGridViewUitgeworpen.Location = New System.Drawing.Point(31, 106) + Me.DataGridViewUitgeworpen.Location = New System.Drawing.Point(15, 111) Me.DataGridViewUitgeworpen.Name = "DataGridViewUitgeworpen" Me.DataGridViewUitgeworpen.ReadOnly = true DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft @@ -98,96 +98,15 @@ Me.DataGridViewUitgeworpen.RowTemplate.Height = 50 Me.DataGridViewUitgeworpen.RowTemplate.ReadOnly = true Me.DataGridViewUitgeworpen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.DataGridViewUitgeworpen.Size = New System.Drawing.Size(1175, 355) + Me.DataGridViewUitgeworpen.Size = New System.Drawing.Size(1054, 355) Me.DataGridViewUitgeworpen.TabIndex = 94 ' - 'leftrightcol - ' - Me.leftrightcol.HeaderText = "LeftRight" - Me.leftrightcol.Name = "leftrightcol" - Me.leftrightcol.ReadOnly = true - Me.leftrightcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.leftrightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.leftrightcol.Width = 94 - ' - 'printbarcodeleftcol - ' - Me.printbarcodeleftcol.HeaderText = "PrintBarcodeLeft" - Me.printbarcodeleftcol.Name = "printbarcodeleftcol" - Me.printbarcodeleftcol.ReadOnly = true - Me.printbarcodeleftcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.printbarcodeleftcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.printbarcodeleftcol.Width = 162 - ' - 'printbarcoderightcol - ' - Me.printbarcoderightcol.HeaderText = "PrintBarcodeRight" - Me.printbarcoderightcol.Name = "printbarcoderightcol" - Me.printbarcoderightcol.ReadOnly = true - Me.printbarcoderightcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.printbarcoderightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.printbarcoderightcol.Width = 174 - ' - 'batchidcol - ' - Me.batchidcol.HeaderText = "BatchID" - Me.batchidcol.Name = "batchidcol" - Me.batchidcol.ReadOnly = true - Me.batchidcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.batchidcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.batchidcol.Width = 87 - ' - 'pickplacecol - ' - Me.pickplacecol.HeaderText = "PickPlace" - Me.pickplacecol.Name = "pickplacecol" - Me.pickplacecol.ReadOnly = true - Me.pickplacecol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.pickplacecol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.pickplacecol.Width = 104 - ' - 'palletidcol - ' - Me.palletidcol.HeaderText = "PalletID" - Me.palletidcol.Name = "palletidcol" - Me.palletidcol.ReadOnly = true - Me.palletidcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.palletidcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.palletidcol.Width = 85 - ' - 'picktimestampcol - ' - Me.picktimestampcol.HeaderText = "PickTimeStamp" - Me.picktimestampcol.Name = "picktimestampcol" - Me.picktimestampcol.ReadOnly = true - Me.picktimestampcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.picktimestampcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.picktimestampcol.Width = 156 - ' - 'nettolengthcol - ' - Me.nettolengthcol.HeaderText = "NettoLength" - Me.nettolengthcol.Name = "nettolengthcol" - Me.nettolengthcol.ReadOnly = true - Me.nettolengthcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.nettolengthcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.nettolengthcol.Width = 124 - ' - 'colorcol - ' - Me.colorcol.HeaderText = "Color" - Me.colorcol.Name = "colorcol" - Me.colorcol.ReadOnly = true - Me.colorcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] - Me.colorcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable - Me.colorcol.Width = 65 - ' 'lblVerwerking ' Me.lblVerwerking.AutoSize = true Me.lblVerwerking.Font = New System.Drawing.Font("Microsoft Sans Serif", 20.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) Me.lblVerwerking.ForeColor = System.Drawing.Color.DarkRed - Me.lblVerwerking.Location = New System.Drawing.Point(31, 595) + Me.lblVerwerking.Location = New System.Drawing.Point(9, 596) Me.lblVerwerking.Name = "lblVerwerking" Me.lblVerwerking.Size = New System.Drawing.Size(277, 31) Me.lblVerwerking.TabIndex = 93 @@ -197,7 +116,7 @@ ' Me.btnTerug.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right),System.Windows.Forms.AnchorStyles) Me.btnTerug.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.btnTerug.Location = New System.Drawing.Point(978, 12) + Me.btnTerug.Location = New System.Drawing.Point(812, 12) Me.btnTerug.Name = "btnTerug" Me.btnTerug.Size = New System.Drawing.Size(228, 68) Me.btnTerug.TabIndex = 65 @@ -208,14 +127,95 @@ ' Me.btnRework.Enabled = false Me.btnRework.Font = New System.Drawing.Font("Microsoft Sans Serif", 25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) - Me.btnRework.Location = New System.Drawing.Point(255, 512) + Me.btnRework.Location = New System.Drawing.Point(222, 507) Me.btnRework.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3) Me.btnRework.Name = "btnRework" Me.btnRework.Size = New System.Drawing.Size(689, 68) Me.btnRework.TabIndex = 64 Me.btnRework.Text = "Rework" Me.btnRework.UseVisualStyleBackColor = true ' + 'nettoheightcol + ' + Me.nettoheightcol.HeaderText = "Hoogte" + Me.nettoheightcol.Name = "nettoheightcol" + Me.nettoheightcol.ReadOnly = true + Me.nettoheightcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.nettoheightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.nettoheightcol.Width = 81 + ' + 'nettolengthcol + ' + Me.nettolengthcol.HeaderText = "Diepte" + Me.nettolengthcol.Name = "nettolengthcol" + Me.nettolengthcol.ReadOnly = true + Me.nettolengthcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.nettolengthcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.nettolengthcol.Width = 74 + ' + 'colorcol + ' + Me.colorcol.HeaderText = "Kleur" + Me.colorcol.Name = "colorcol" + Me.colorcol.ReadOnly = true + Me.colorcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.colorcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.colorcol.Width = 64 + ' + 'batchidcol + ' + Me.batchidcol.HeaderText = "Batch" + Me.batchidcol.Name = "batchidcol" + Me.batchidcol.ReadOnly = true + Me.batchidcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.batchidcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.batchidcol.Width = 68 + ' + 'palletidcol + ' + Me.palletidcol.HeaderText = "TrayNr" + Me.palletidcol.Name = "palletidcol" + Me.palletidcol.ReadOnly = true + Me.palletidcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.palletidcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.palletidcol.Width = 78 + ' + 'leftrightcol + ' + Me.leftrightcol.HeaderText = "Type" + Me.leftrightcol.Name = "leftrightcol" + Me.leftrightcol.ReadOnly = true + Me.leftrightcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.leftrightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.leftrightcol.Width = 63 + ' + 'printbarcodeleftcol + ' + Me.printbarcodeleftcol.HeaderText = "PrintBarcode L" + Me.printbarcodeleftcol.Name = "printbarcodeleftcol" + Me.printbarcodeleftcol.ReadOnly = true + Me.printbarcodeleftcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.printbarcodeleftcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.printbarcodeleftcol.Width = 146 + ' + 'printbarcoderightcol + ' + Me.printbarcoderightcol.HeaderText = "PrintBarcode R" + Me.printbarcoderightcol.Name = "printbarcoderightcol" + Me.printbarcoderightcol.ReadOnly = true + Me.printbarcoderightcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.printbarcoderightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.printbarcoderightcol.Width = 148 + ' + 'picktimestampcol + ' + Me.picktimestampcol.HeaderText = "Tijdstip" + Me.picktimestampcol.Name = "picktimestampcol" + Me.picktimestampcol.ReadOnly = true + Me.picktimestampcol.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.picktimestampcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable + Me.picktimestampcol.Width = 80 + ' 'FormReworkAutomilling ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) @@ -238,13 +238,13 @@ Friend WithEvents btnTerug As Button Friend WithEvents btnRework As Button Friend WithEvents DataGridViewUitgeworpen As DataGridView + Friend WithEvents nettoheightcol As DataGridViewTextBoxColumn + Friend WithEvents nettolengthcol As DataGridViewTextBoxColumn + Friend WithEvents colorcol As DataGridViewTextBoxColumn + Friend WithEvents batchidcol As DataGridViewTextBoxColumn + Friend WithEvents palletidcol As DataGridViewTextBoxColumn Friend WithEvents leftrightcol As DataGridViewTextBoxColumn Friend WithEvents printbarcodeleftcol As DataGridViewTextBoxColumn Friend WithEvents printbarcoderightcol As DataGridViewTextBoxColumn - Friend WithEvents batchidcol As DataGridViewTextBoxColumn - Friend WithEvents pickplacecol As DataGridViewTextBoxColumn - Friend WithEvents palletidcol As DataGridViewTextBoxColumn Friend WithEvents picktimestampcol As DataGridViewTextBoxColumn - Friend WithEvents nettolengthcol As DataGridViewTextBoxColumn - Friend WithEvents colorcol As DataGridViewTextBoxColumn End Class Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb =================================================================== diff -u -r1873 -r1893 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1873) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1893) @@ -29,18 +29,18 @@ 'Lijst van automilling data opvragen Try 'Data tonen in grid - For Each item In Domeincontroller.getInstance().geefUitgeworpenAutomilling() + For Each item as ZijkamerFreesProductieData In Domeincontroller.getInstance().geefUitgeworpenAutomilling() 'Rij per rij toevoegen - dim rij = New String(){ item.LeftRight _ - ,item.PrintBarcodeLeft.Trim() _ - ,item.PrintBarcodeRight.Trim() _ - ,item.BatchID _ - ,item.PickPlace _ - ,item.PalletID _ - ,item.PickTimeStamp _ - ,item.NettoLength _ - ,item.NettoHeight _ - ,item.Color } + dim rij = New String(){ item.PrintBarcodeLeft.Chars(2) _ + ,item.NettoLength _ + ,item.Color _ + ,item.BatchID _ + ,item.PalletID _ + ,item.LeftRight _ + ,item.PrintBarcodeLeft.Trim() _ + ,item.PrintBarcodeRight.Trim() _ + ,item.PickTimeStamp } + 'LeftRight, PrintBarcodeLeft, PrintBarcodeRight, BatchID, PickPlace, PalletID, PickTimeStamp, NettoLength, NettoHeight, Color DataGridViewUitgeworpen.Rows.Add(rij) Next Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx =================================================================== diff -u -r1875 -r1893 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1875) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1893) @@ -117,31 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True True - + True - + True - + True - + True - + True