Index: TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj
===================================================================
diff -u -r1617 -r1618
--- TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1617)
+++ TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1618)
@@ -29,7 +29,7 @@
TAOR rework
Robin De Bock
false
- 0
+ 1
5.1.2.%2a
false
true
Index: TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb
===================================================================
diff -u -r1614 -r1618
--- TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 1614)
+++ TAOR-rework-bugfixing/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 1618)
@@ -121,7 +121,7 @@
'Opbouwen query.
Const lijstKolommen = "PartId, OrderId, PartRef, PartQty, PartMat, PartL, PartW, PartCalc, PartRemark, PartRemark2, PartRemark3, PartGroup, PartLevel, PartExt01, PartExt02, PartExt03, PartExt04, PartExt05, PartExt06, PartExt07, PartExt08, PartExt09, PartD, PartProd, GroupCode, Status, Inserted, LastChanged, PartQtyCut, PartExt10, PartExt11"
- Dim query As String = $"Select top 1 {lijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartCalc='{barcodeId}'"
+ Dim query As String = $"Select top 1 {lijstKolommen} From [VH_Ardis_TST].[dbo].[Parts] where PartCalc='{barcodeId}' order by Inserted desc"
'Query uitvoeren en resultaat retourneren.
Dim resultaat = ExecuteIntoResultset(query)
LogBestandTextMapper.writeToFile("Ardis", $"Opvragen van Ardisdata met barcode '{barcodeId}'", True)
Index: TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb
===================================================================
diff -u -r1609 -r1618
--- TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb (.../HoofdAansturingRework.vb) (revision 1609)
+++ TAOR-rework-bugfixing/TAOR rework/Rework/HoofdAansturingRework.vb (.../HoofdAansturingRework.vb) (revision 1618)
@@ -171,9 +171,11 @@
ElseIf linksEnOfRechts.Contains("L") Then
'Herzaag links.
HerzaagZijkant(rework, "L", trayNummer, slotNummer)
- Else
+ ElseIf linksEnOfRechts.Contains("R") Then
'Herzaag rechts.
HerzaagZijkant(rework, "R", trayNummer, slotNummer)
+ Else
+ Throw New Exception($"Kon zijkant niet zagen, onbekende oriƫntatie (correct is LR L en R): '{linksEnOfRechts}'.")
End If
End If
End If
@@ -199,7 +201,7 @@
'Controleren of het een speciaal gegenereerd plankje is.
If Not (ardisData.isSpecialGegenereerd()) Then
'Zo neen, de barcodes ophalen aan de hand van de data.
- barcodes = ArdisMapper.geefBarcodes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL, linksOfRechts)
+ barcodes = ArdisMapper.GeefBarcodes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL, linksOfRechts)
Else
'Als het een speciale zijkant is moeten we het corresponderende plankje vinden, aka A of B
barcodes = ArdisMapper.GeefBarcodesGegenereerdePlankjes(ardisData.PartGroup, ardisData.PartExt02, ardisData.PartL)