Index: TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb =================================================================== diff -u -r1953 -r1954 --- TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1953) +++ TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1954) @@ -173,7 +173,7 @@ End Function Public Function GeefNieuwTrayNummer() As String - LogBestandTextMapper.writeToFile("Automilling", "Opvragen en reserveren nieuw traynummer") + LogBestandTextMapper.WriteToFile("Automilling", "Opvragen en reserveren nieuw traynummer") 'de traynummber voor rework zijn steeds kleiner dan 1000 @@ -190,38 +190,38 @@ executeCommand("update [Automilling].[dbo].[ReservationReworkTray] set status = '2', inserttimedate = SYSDATETIME() where palletid='" & palletID & "'") End If - LogBestandTextMapper.writeToFile("Automilling", "Opvragen en reserveren nieuw traynummer", True) + LogBestandTextMapper.WriteToFile("Automilling", "Opvragen en reserveren nieuw traynummer", True) Return palletID End Function Public Function OphalenUitProductie(BarcodeID) As ZijkamerFreesProductieData - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met barcode: " & BarcodeID) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met barcode: " & BarcodeID) Dim result As ZijkamerFreesProductieData Dim lijstKolommen As String = "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" result = executeIntoResultset("Select top 1 " & lijstKolommen & " From [Automilling].[dbo].[Production] where PrintBarcodeLeft=" & "'" & BarcodeID & "'" & " OR PrintBarcodeRight=" & "'" & BarcodeID & "' order by PickPlace asc") - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met barcode: " & BarcodeID, True) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met barcode: " & BarcodeID, True) Return result End Function Public Function OphalenUitHistoriek(BarcodeID) As ZijkamerFreesProductieData - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit historiek met barcode: " & BarcodeID) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit historiek met barcode: " & BarcodeID) Dim result As ZijkamerFreesProductieData Dim lijstKolommen As String = "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" result = executeIntoResultset("Select top 1 " & lijstKolommen & " From [Automilling].[dbo].[History] where PrintBarcodeLeft= " & "'" & BarcodeID & "'" & " OR PrintBarcodeRight= " & "'" & BarcodeID & "' order by PickPlace asc") - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit historiek met barcode: " & BarcodeID, True) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit historiek met barcode: " & BarcodeID, True) Return result End Function Public Sub opslaan(zijkamerFreesProductieData As ZijkamerFreesProductieData) - LogBestandTextMapper.writeToFile("Automilling", "Opslaan van ZijkamerFreesProductieData") + LogBestandTextMapper.WriteToFile("Automilling", "Opslaan van ZijkamerFreesProductieData") zijkamerFreesProductieData.updateCijferVelden() Dim query As String = "Insert into [Automilling].[dbo].[Production] (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) VALUES (@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);" Try @@ -273,14 +273,14 @@ connectToAutomilling() addCommand.ExecuteNonQuery() - LogBestandTextMapper.writeToFile("Automilling", "Opslaan van ZijkamerFreesProductieData", True) + LogBestandTextMapper.WriteToFile("Automilling", "Opslaan van ZijkamerFreesProductieData", True) Catch ex As Exception Throw New Exception("Er is een fout opgetreden bij het wegschrijven van data naar de Automilling databank " + ex.Message) End Try End Sub Public Sub update(zijkamerFreesProductieData As ZijkamerFreesProductieData) - LogBestandTextMapper.writeToFile("Automilling", "Updaten van zijkamerFreesProductieData met barcodeLeft, barcodeRight: " & zijkamerFreesProductieData.PrintBarcodeLeft & ", " & zijkamerFreesProductieData.PrintBarcodeRight) + LogBestandTextMapper.WriteToFile("Automilling", "Updaten van zijkamerFreesProductieData met barcodeLeft, barcodeRight: " & zijkamerFreesProductieData.PrintBarcodeLeft & ", " & zijkamerFreesProductieData.PrintBarcodeRight) zijkamerFreesProductieData.updateCijferVelden() Dim query As String = "update [Automilling].[dbo].[Production] set PickSequence = @PickSequence, PickPlace = @PickPlace, PalletID = @PalletID, SlotNbr = @SlotNbr, LeftRight = @LeftRight, FeedbackERP = @FeedbackERP, PickTimeStamp = @PickTimeStamp, MillingTimeStamp = @MillingTimeStamp, DropTimeStamp = @DropTimeStamp, InsertTimeStamp = @InsertTimeStamp, BatchID = @BatchID, SequenceNbr = @SequenceNbr, ProductCode = @ProductCode, Color = @Color, PickListID = @PickListID, NettoLength = @NettoLength, NettoHeight = @NettoHeight, OversizeLength = @OversizeLength, OversizeHeight = @OversizeHeight, ProgramLeftInner = @ProgramLeftInner, ProgramLeftOuter = @ProgramLeftOuter, ProgramRightInner = @ProgramRightInner, ProgramRightOuter = @ProgramRightOuter, PrintTextLeft1 = @PrintTextLeft1, PrintTextLeft2 = @PrintTextLeft2, PrintTextLeft3 = @PrintTextLeft3, PrintTextRight1 = @PrintTextRight1, PrintTextRight2 = @PrintTextRight2, PrintTextRight3 = @PrintTextRight3, PrintTextLeft4 = @PrintTextLeft4, PrintTextRight4 = @PrintTextRight4 where PrintBarcodeLeft like @PrintBarcodeLeft and PrintBarcodeRight like @PrintBarcodeRight" Try @@ -329,47 +329,55 @@ command.Parameters.Add("@PrintBarcodeRight", SqlDbType.VarChar).Value = "%" & zijkamerFreesProductieData.PrintBarcodeRight.Trim & "%" command.ExecuteNonQuery() - LogBestandTextMapper.writeToFile("Automilling", "Updaten van zijkamerFreesProductieData met barcodeLeft, barcodeRight: " & zijkamerFreesProductieData.PrintBarcodeLeft & ", " & zijkamerFreesProductieData.PrintBarcodeRight, True) + LogBestandTextMapper.WriteToFile("Automilling", "Updaten van zijkamerFreesProductieData met barcodeLeft, barcodeRight: " & zijkamerFreesProductieData.PrintBarcodeLeft & ", " & zijkamerFreesProductieData.PrintBarcodeRight, True) Catch ex As Exception Throw New Exception("Er is een fout opgetreden bij het updaten van zijkamerfreesproductieData met barcodeLeft, barcodeRight: " & zijkamerFreesProductieData.PrintBarcodeLeft & ", " & zijkamerFreesProductieData.PrintBarcodeRight & vbNewLine & ex.Message) End Try End Sub Public Function geefMetBatch(batch As String) As List(Of ZijkamerFreesProductieData) - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met batch: " & batch) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met batch: " & batch) Dim result As List(Of ZijkamerFreesProductieData) Dim lijstKolommen As String = "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" result = getList("Select " & lijstKolommen & " From [Automilling].[dbo].[Production] where BatchID=" & "'" & batch & "'") - LogBestandTextMapper.writeToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met batch: " & batch) + LogBestandTextMapper.WriteToFile("Automilling", "Ophalen ZijkamerFreesProductieData uit productie met batch: " & batch) Return result End Function Public Sub updateBarcodes(origineleBarcodeL As String, origineleBarcodeR As String, huidigEersteStuk As String, barcodeDeelNieuw As String) - LogBestandTextMapper.writeToFile("Automilling", "Updaten barcodes van originele barcodes links en rechts: " & origineleBarcodeL & vbNewLine & origineleBarcodeR) + LogBestandTextMapper.WriteToFile("Automilling", "Updaten barcodes van originele barcodes links en rechts: " & origineleBarcodeL & vbNewLine & origineleBarcodeR) Dim query As String = "update [Automilling].[dbo].[Production] SET PrintBarcodeLeft = REPLACE(PrintBarcodeLeft, '" & huidigEersteStuk & "', '" & barcodeDeelNieuw & "') WHERE PrintBarcodeLeft=" & "'" & origineleBarcodeL & "'" executeCommand(query) query = "update [Automilling].[dbo].[Production] SET PrintBarcodeRight = REPLACE(PrintBarcodeRight, '" & huidigEersteStuk & "', '" & barcodeDeelNieuw & "') WHERE PrintBarcodeRight=" & "'" & origineleBarcodeR & "'" executeCommand(query) - LogBestandTextMapper.writeToFile("Automilling", "Updaten barcodes van originele barcodes links en rechts: " & origineleBarcodeL & vbNewLine & origineleBarcodeR, True) + 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 = " + Public Function geefUitgeworpen() As List(Of ZijkamerFreesProductieData) + LogBestandTextMapper.WriteToFile("Automilling", "De uitgeworpen latjes opvragen (PickTimeStamp en millingtimestamp op NULL)") + Const queryProduction = " 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 - 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) + where PickTimeStamp IS NOT NULL and MillingTimeStamp IS NULL" + Const queryHistory = " + 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].[History] + where PickTimeStamp IS NOT NULL + and MillingTimeStamp IS NULL + and PalletID <> '0888' + and 2 > DATEDIFF(DAY,PickTimeStamp, GETDATE())" + + Dim result As List(Of ZijkamerFreesProductieData) = getList(queryProduction) + result.AddRange(getList(queryHistory)) + LogBestandTextMapper.WriteToFile("Automilling", "De uitgeworpen latjes opvragen (PickTimeStamp en millingtimestamp op NULL)", True) Return result - End function + End Function End Module Index: TAOR rework/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r1952 -r1954 --- TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1952) +++ TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1954) @@ -29,7 +29,7 @@ TAOR rework Robin De Bock false - 3 + 4 6.1.6.%2a false true Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb =================================================================== diff -u -r1895 -r1954 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1895) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.Designer.vb (.../FormReworkAutomilling.Designer.vb) (revision 1954) @@ -28,9 +28,6 @@ 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.picktimestampcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.nettoheightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.nettolengthcol = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -40,6 +37,9 @@ Me.leftrightcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcodeleftcol = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.printbarcoderightcol = 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 @@ -99,43 +99,9 @@ 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(1054, 355) + Me.DataGridViewUitgeworpen.Size = New System.Drawing.Size(1025, 355) Me.DataGridViewUitgeworpen.TabIndex = 94 ' - '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(9, 596) - Me.lblVerwerking.Name = "lblVerwerking" - Me.lblVerwerking.Size = New System.Drawing.Size(277, 31) - Me.lblVerwerking.TabIndex = 93 - Me.lblVerwerking.Text = "Er wordt niet verwerkt" - ' - 'btnTerug - ' - 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(812, 12) - Me.btnTerug.Name = "btnTerug" - Me.btnTerug.Size = New System.Drawing.Size(228, 68) - Me.btnTerug.TabIndex = 65 - Me.btnTerug.Text = "Terug" - Me.btnTerug.UseVisualStyleBackColor = true - ' - 'btnRework - ' - 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(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 - ' 'picktimestampcol ' Me.picktimestampcol.HeaderText = "Tijdstip" @@ -217,6 +183,40 @@ Me.printbarcoderightcol.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable Me.printbarcoderightcol.Width = 148 ' + '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(9, 596) + Me.lblVerwerking.Name = "lblVerwerking" + Me.lblVerwerking.Size = New System.Drawing.Size(277, 31) + Me.lblVerwerking.TabIndex = 93 + Me.lblVerwerking.Text = "Er wordt niet verwerkt" + ' + 'btnTerug + ' + 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(812, 12) + Me.btnTerug.Name = "btnTerug" + Me.btnTerug.Size = New System.Drawing.Size(228, 68) + Me.btnTerug.TabIndex = 65 + Me.btnTerug.Text = "Terug" + Me.btnTerug.UseVisualStyleBackColor = true + ' + 'btnRework + ' + 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(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 + ' 'FormReworkAutomilling ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Index: TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb =================================================================== diff -u -r1895 -r1954 --- TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1895) +++ TAOR rework/TAOR rework/formulieren/Specials/FormReworkAutomilling.vb (.../FormReworkAutomilling.vb) (revision 1954) @@ -18,7 +18,7 @@ ''' We willen niet dat de andere reworks plots ook verwerkt worden. ''' Sub controleerToegang() - if Domeincontroller.getInstance().geefAantalReworks() > 0 Then + If Domeincontroller.getInstance().geefAantalReworks() > 0 Then 'Er zijn al reworks aanwezig, afbreken MessageBox.Show("Er zijn al reworks aanwezig. Deze moeten eerst verwerkt worden vooraleer deze functionaliteit kan gebruikt worden.") FormController.getInstance().laadFormSpecialMenu(Me) @@ -29,19 +29,21 @@ 'Lijst van automilling data opvragen Try 'Data tonen in grid - For Each item as ZijkamerFreesProductieData In Domeincontroller.getInstance().geefUitgeworpenAutomilling() + Dim items = Domeincontroller.getInstance().geefUitgeworpenAutomilling() + items.Sort(Function(x, y) DateTime.Compare(x.PickTimeStamp, y.PickTimeStamp)) + For Each item As ZijkamerFreesProductieData In items 'Rij per rij toevoegen - 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() _ + 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() } - + 'LeftRight, PrintBarcodeLeft, PrintBarcodeRight, BatchID, PickPlace, PalletID, PickTimeStamp, NettoLength, NettoHeight, Color DataGridViewUitgeworpen.Rows.Add(rij) Next @@ -62,25 +64,25 @@ Private Sub BtnRework_Click(sender As Object, e As EventArgs) Handles btnRework.Click controleerToegang() 'Rework reden opvragen en verwerken - FormController.getInstance().laadFormReworkRedenen(Me,"zijkant",AddressOf verwerkMetReworkReden) + FormController.getInstance().laadFormReworkRedenen(Me, "zijkant", AddressOf verwerkMetReworkReden) End Sub - private Sub verwerkMetReworkReden(reden As String()) + Private Sub verwerkMetReworkReden(reden As String()) 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() + Dim barcodeLeft As String = rij.Cells.Item("printbarcodeleftcol").Value.ToString() + Dim barcodeRight As String = rij.Cells.Item("printbarcoderightcol").Value.ToString() 'Barcodes toevoegen als rework - Domeincontroller.getInstance.addRework(barcodeLeft, reden, "zijkant", false) - Domeincontroller.getInstance.addRework(barcodeRight, reden, "zijkant", false) + Domeincontroller.getInstance.addRework(barcodeLeft, reden, "zijkant", False) + Domeincontroller.getInstance.addRework(barcodeRight, reden, "zijkant", False) 'Zorgen dat Ardis niet geactiveerd wordt Domeincontroller.getInstance().wijzigOpslaanArdisRework(barcodeLeft) Domeincontroller.getInstance().wijzigOpslaanArdisRework(barcodeRight) Next 'Verwerken van reworks verwerkReworks() - catch ex As ArgumentException + 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($"Kon rework niet toevoegen: {ex.Message}", "Er is een fout opgetreden...", MessageBoxButtons.OK, MessageBoxIcon.Error) @@ -93,7 +95,7 @@ Domeincontroller.getInstance.verdeelReworkZijkantenOverReworkTray() If Domeincontroller.getInstance.geefAantalReworkTrays <= 0 Then 'Er is iets misgelopen om de zijkant reworks te verdelen - throw new Exception("Er waren geen rework trays aanwezig om te verwerken.") + Throw New Exception("Er waren geen rework trays aanwezig om te verwerken.") Else FormController.getInstance.laadFormReworkTrayPrinter(Me) End If