Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx =================================================================== diff -u -r1893 -r1895 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1893) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1895) @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True @@ -141,9 +144,6 @@ True - - True - Index: TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb =================================================================== diff -u -r1870 -r1895 --- TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1870) +++ TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1895) @@ -365,7 +365,8 @@ Const query As String = " SELECT PickSequence, PickPlace, PalletID, SlotNbr, LeftRight, FeedbackERP, PickTimeStamp, MillingTimeStamp, DropTimeStamp, InsertTimeStamp, BatchID, SequenceNbr, ProductCode, Color, PickListID, NettoLength, NettoHeight, OversizeLength, OversizeHeight, ProgramLeftInner, ProgramLeftOuter, ProgramRightInner, ProgramRightOuter, PrintBarcodeLeft, PrintBarcodeRight, PrintTextLeft1, PrintTextLeft2, PrintTextLeft3, PrintTextRight1, PrintTextRight2, PrintTextRight3, PrintTextLeft4, PrintTextRight4, tablework, adjustment_X1, adjustment_X2, adjustment_YA, adjustment_YB, adjustment_YC, adjustment_YD FROM [Automilling].[dbo].[Production] - where PickTimeStamp IS NOT NULL and MillingTimeStamp IS NULL" + where PickTimeStamp IS NOT NULL and MillingTimeStamp IS NULL + order by PickTimeStamp desc" Dim result As List(Of ZijkamerFreesProductieData) = getList(query) LogBestandTextMapper.writeToFile("Automilling", "De uitgeworpen latjes opvragen (PickTimeStamp en millingtimestamp op NULL)", true) Return result Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb =================================================================== diff -u -r1893 -r1895 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1893) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1895) @@ -31,6 +31,7 @@ Me.lblVerwerking = New System.Windows.Forms.Label() Me.btnTerug = New System.Windows.Forms.Button() Me.btnRework = New System.Windows.Forms.Button() + Me.picktimestampcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.nettoheightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.nettolengthcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colorcol = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -39,7 +40,6 @@ Me.leftrightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcodeleftcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcoderightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.picktimestampcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Panel1.SuspendLayout CType(Me.DataGridViewUitgeworpen,System.ComponentModel.ISupportInitialize).BeginInit Me.SuspendLayout @@ -64,7 +64,7 @@ Me.DataGridViewUitgeworpen.AllowUserToResizeRows = false Me.DataGridViewUitgeworpen.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left),System.Windows.Forms.AnchorStyles) Me.DataGridViewUitgeworpen.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells - DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText @@ -74,8 +74,8 @@ 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.nettoheightcol, Me.nettolengthcol, Me.colorcol, Me.batchidcol, Me.palletidcol, Me.leftrightcol, Me.printbarcodeleftcol, Me.printbarcoderightcol, Me.picktimestampcol}) - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + Me.DataGridViewUitgeworpen.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.picktimestampcol, Me.nettoheightcol, Me.nettolengthcol, Me.colorcol, Me.batchidcol, Me.palletidcol, Me.leftrightcol, Me.printbarcodeleftcol, Me.printbarcoderightcol}) + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter 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)) DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText @@ -86,7 +86,7 @@ Me.DataGridViewUitgeworpen.Location = New System.Drawing.Point(15, 111) Me.DataGridViewUitgeworpen.Name = "DataGridViewUitgeworpen" Me.DataGridViewUitgeworpen.ReadOnly = true - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 15!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte)) DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText @@ -95,6 +95,7 @@ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.DataGridViewUitgeworpen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3 Me.DataGridViewUitgeworpen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + Me.DataGridViewUitgeworpen.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter Me.DataGridViewUitgeworpen.RowTemplate.Height = 50 Me.DataGridViewUitgeworpen.RowTemplate.ReadOnly = true Me.DataGridViewUitgeworpen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -135,6 +136,15 @@ Me.btnRework.Text = "Rework" Me.btnRework.UseVisualStyleBackColor = true ' + '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 + ' 'nettoheightcol ' Me.nettoheightcol.HeaderText = "Hoogte" @@ -207,15 +217,6 @@ 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,6 +239,7 @@ Friend WithEvents btnTerug As Button Friend WithEvents btnRework As Button Friend WithEvents DataGridViewUitgeworpen As DataGridView + Friend WithEvents picktimestampcol As DataGridViewTextBoxColumn Friend WithEvents nettoheightcol As DataGridViewTextBoxColumn Friend WithEvents nettolengthcol As DataGridViewTextBoxColumn Friend WithEvents colorcol As DataGridViewTextBoxColumn @@ -246,5 +248,4 @@ Friend WithEvents leftrightcol As DataGridViewTextBoxColumn Friend WithEvents printbarcodeleftcol As DataGridViewTextBoxColumn Friend WithEvents printbarcoderightcol As DataGridViewTextBoxColumn - Friend WithEvents picktimestampcol As DataGridViewTextBoxColumn End Class Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb =================================================================== diff -u -r1893 -r1895 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1893) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1895) @@ -31,15 +31,16 @@ 'Data tonen in grid For Each item as ZijkamerFreesProductieData In Domeincontroller.getInstance().geefUitgeworpenAutomilling() 'Rij per rij toevoegen - dim rij = New String(){ item.PrintBarcodeLeft.Chars(2) _ + dim rij = New String(){ item.PickTimeStamp _ + ,item.PrintBarcodeLeft.Chars(1) _ ,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)