Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx
===================================================================
diff -u -r1869 -r1870
--- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1869)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.resx (.../FormReworkAutomilling.resx) (revision 1870)
@@ -117,4 +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
+
\ No newline at end of file
Index: TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb
===================================================================
diff -u -r1513 -r1870
--- TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1513)
+++ TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1870)
@@ -103,7 +103,7 @@
result.Add(productieData)
End While
Catch ex As Exception
- Throw New Exception("De Automilling databank kan niet bereikt worden " + ex.Message)
+ Throw New Exception("De Automilling databank kan niet bereikt worden" + vbNewLine + ex.Message)
Finally
If Not (dr Is Nothing OrElse dr.IsClosed) Then
dr.Close()
@@ -356,5 +356,19 @@
LogBestandTextMapper.writeToFile("Automilling", "Updaten barcodes van originele barcodes links en rechts: " & origineleBarcodeL & vbNewLine & origineleBarcodeR, True)
End Sub
+ '''
+ ''' De uitgeworpen latjes waarbij de PickTimeStamp en millingtimestamp op NULL staan
+ '''
+ '''
+ public function geefUitgeworpen() As List(Of ZijkamerFreesProductieData)
+ LogBestandTextMapper.writeToFile("Automilling", "De uitgeworpen latjes opvragen (PickTimeStamp en millingtimestamp op NULL)")
+ 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"
+ Dim result As List(Of ZijkamerFreesProductieData) = getList(query)
+ LogBestandTextMapper.writeToFile("Automilling", "De uitgeworpen latjes opvragen (PickTimeStamp en millingtimestamp op NULL)", true)
+ Return result
+ End function
End Module
Index: TAOR rework/TAOR rework/controllers/Domeincontroller.vb
===================================================================
diff -u -r1869 -r1870
--- TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1869)
+++ TAOR rework/TAOR rework/controllers/Domeincontroller.vb (.../Domeincontroller.vb) (revision 1870)
@@ -300,8 +300,15 @@
#End Region
+#Region "verworpen automilling reworken"
+ public Function geefUitgeworpenAutomilling As List(Of ZijkamerFreesProductieData)
+ 'ZijkamerFreesProductieData bevat meer dan enkel properties, maar de frontend moet toch enkel displayen
+ Return AutomillingMapper.geefUitgeworpen()
+ End Function
#End Region
+#End Region
+
#Region "opvragen info rework trays en verwijderen"
Public Function geefTypeInReworkTray() As ItemType
Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb
===================================================================
diff -u -r1869 -r1870
--- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1869)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1870)
@@ -4,9 +4,61 @@
Me.ControlBox = False
'tonen of er wel verwerkt mag worden
lblVerwerking.Visible = Not Configs.geefVerwerkStatus
+ 'TODO zorgen dat scherm niet gebruikt kan worden of waarschuwing geven als reworks in wachtrij staan
+ laadData()
End Sub
Private Sub BtnTerug_Click(sender As Object, e As EventArgs) Handles btnTerug.Click
FormController.getInstance.laadFormSpecialMenu(Me)
End Sub
+
+ Private Sub laadData()
+ 'Lijst van automilling data opvragen
+ Try
+ 'Data tonen in grid
+ For Each item 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 }
+ 'LeftRight, PrintBarcodeLeft, PrintBarcodeRight, BatchID, PickPlace, PalletID, PickTimeStamp, NettoLength, NettoHeight, Color
+ DataGridViewUitgeworpen.Rows.Add(rij)
+ Next
+ 'First row gets selected automatically
+ DataGridViewUitgeworpen.ClearSelection()
+ Catch ex As Exception
+ MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ FormController.getInstance.laadFormSpecialMenu(Me)
+ End Try
+ End Sub
+
+ Private Sub DataGridViewUitgeworpen_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridViewUitgeworpen.SelectionChanged
+ Dim aantal = DataGridViewUitgeworpen.SelectedRows.Count
+ _btnRework.Enabled = aantal > 0
+ btnRework.Text = $"Rework ({aantal})"
+ End Sub
+
+ Private Sub BtnRework_Click(sender As Object, e As EventArgs) Handles btnRework.Click
+ Try
+ 'Barcodes ophalen van de geselecteerde rij(en)
+ For Each rij As DataGridViewRow In DataGridViewUitgeworpen.SelectedRows
+ dim barcodeLeft As String = rij.Cells.Item("printbarcodeleftcol").Value.ToString()
+ dim barcodeRight As String = rij.Cells.Item("printbarcoderightcol").Value.ToString()
+ 'TODO Barcodes toevoegen als rework
+
+ Next
+ catch ex As ArgumentException
+ MessageBox.Show($"Kon barcode links of rechts niet opvragen: {ex.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ Catch ex As Exception
+ MessageBox.Show(ex.Message, "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ End Try
+ End Sub
+
End Class
\ No newline at end of file
Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb
===================================================================
diff -u -r1869 -r1870
--- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1869)
+++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1870)
@@ -22,24 +22,84 @@
'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()
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.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.Panel1.SuspendLayout
+ CType(Me.DataGridViewUitgeworpen,System.ComponentModel.ISupportInitialize).BeginInit
Me.SuspendLayout
'
'Panel1
'
Me.Panel1.Anchor = System.Windows.Forms.AnchorStyles.Top
+ Me.Panel1.Controls.Add(Me.DataGridViewUitgeworpen)
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(156, 10)
+ Me.Panel1.Location = New System.Drawing.Point(280, 10)
Me.Panel1.Name = "Panel1"
- Me.Panel1.Size = New System.Drawing.Size(800, 653)
+ Me.Panel1.Size = New System.Drawing.Size(1224, 653)
Me.Panel1.TabIndex = 70
'
+ 'DataGridViewUitgeworpen
+ '
+ Me.DataGridViewUitgeworpen.AllowUserToAddRows = false
+ Me.DataGridViewUitgeworpen.AllowUserToDeleteRows = false
+ Me.DataGridViewUitgeworpen.AllowUserToResizeColumns = false
+ 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.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
+ DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ 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})
+ 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))
+ DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+ DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ 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.Name = "DataGridViewUitgeworpen"
+ Me.DataGridViewUitgeworpen.ReadOnly = true
+ DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+ 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
+ DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+ DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+ DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+ Me.DataGridViewUitgeworpen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
+ Me.DataGridViewUitgeworpen.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing
+ 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.TabIndex = 94
+ '
'lblVerwerking
'
Me.lblVerwerking.AutoSize = true
@@ -55,7 +115,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(554, 12)
+ Me.btnTerug.Location = New System.Drawing.Point(978, 12)
Me.btnTerug.Name = "btnTerug"
Me.btnTerug.Size = New System.Drawing.Size(228, 68)
Me.btnTerug.TabIndex = 65
@@ -66,24 +126,107 @@
'
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(31, 507)
+ Me.btnRework.Location = New System.Drawing.Point(255, 512)
Me.btnRework.Margin = New System.Windows.Forms.Padding(3, 3, 125, 3)
Me.btnRework.Name = "btnRework"
- Me.btnRework.Size = New System.Drawing.Size(736, 68)
+ Me.btnRework.Size = New System.Drawing.Size(689, 68)
Me.btnRework.TabIndex = 64
Me.btnRework.Text = "Rework"
Me.btnRework.UseVisualStyleBackColor = true
'
+ '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
+ '
'FormReworkAutomilling
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(1112, 673)
+ Me.ClientSize = New System.Drawing.Size(1904, 1042)
Me.Controls.Add(Me.Panel1)
Me.Name = "FormReworkAutomilling"
- Me.Text = "FormReworkAutomilling"
+ Me.Text = "TA'OR rework - Rework automilling"
+ Me.WindowState = System.Windows.Forms.FormWindowState.Maximized
Me.Panel1.ResumeLayout(false)
Me.Panel1.PerformLayout
+ CType(Me.DataGridViewUitgeworpen,System.ComponentModel.ISupportInitialize).EndInit
Me.ResumeLayout(false)
End Sub
@@ -92,4 +235,14 @@
Friend WithEvents lblVerwerking As Label
Friend WithEvents btnTerug As Button
Friend WithEvents btnRework As Button
+ Friend WithEvents DataGridViewUitgeworpen As DataGridView
+ 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