Index: vhUnitTest/APPS/Halux/Machine/Kantenband/impl/PassageBepaler/TestZijkant.cls.xml
===================================================================
diff -u -r58614 -r58641
--- vhUnitTest/APPS/Halux/Machine/Kantenband/impl/PassageBepaler/TestZijkant.cls.xml (.../TestZijkant.cls.xml) (revision 58614)
+++ vhUnitTest/APPS/Halux/Machine/Kantenband/impl/PassageBepaler/TestZijkant.cls.xml (.../TestZijkant.cls.xml) (revision 58641)
@@ -83,8 +83,8 @@
Do $$$AssertEquals(Passages.Count(), 4)
- Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.NE13, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.NN13, $$$True, $$$True)
+ Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.NN13, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.NE13, $$$True, $$$True)
Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Schiele, $$$True, $$$False)
Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
]]>
@@ -97,10 +97,10 @@
Do $$$AssertEquals(Passages.Count(), 4)
- Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.NE13, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.PVC13, $$$True, $$$True)
- Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Transfer, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
+ Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.PVC13, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.NE13, $$$True, $$$True)
+ Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Schiele, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Transfer, $$$False, $$$False, ..Uitgang)
]]>
@@ -111,10 +111,10 @@
Do $$$AssertEquals(Passages.Count(), 4)
- Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.PVC13, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.NE13, $$$True, $$$True)
- Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Schiele, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Transfer, $$$False, $$$False, ..Uitgang)
+ Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.NE13, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.PVC13, $$$True, $$$True)
+ Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Transfer, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
]]>
@@ -125,10 +125,10 @@
Do $$$AssertEquals(Passages.Count(), 4)
- Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.BINE13, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.PVC13, $$$True, $$$True)
- Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Transfer, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
+ Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.PVC13, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.BINE13, $$$True, $$$True)
+ Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Schiele, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Transfer, $$$False, $$$False, ..Uitgang)
]]>
@@ -139,10 +139,10 @@
Do $$$AssertEquals(Passages.Count(), 4)
- Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.PVC13, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.BINE13, $$$True, $$$True)
- Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Schiele, $$$True, $$$False)
- Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Transfer, $$$False, $$$False, ..Uitgang)
+ Do ..AssertPassage(Passages.GetAt(1), ..ProgrammaNaam.BINE13, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(2), ..ProgrammaNaam.PVC13, $$$True, $$$True)
+ Do ..AssertPassage(Passages.GetAt(3), ..ProgrammaNaam.Transfer, $$$True, $$$False)
+ Do ..AssertPassage(Passages.GetAt(4), ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
]]>
Index: APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder/Zijkant.cls.xml
===================================================================
diff -u -r58614 -r58641
--- APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder/Zijkant.cls.xml (.../Zijkant.cls.xml) (revision 58614)
+++ APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder/Zijkant.cls.xml (.../Zijkant.cls.xml) (revision 58641)
@@ -81,8 +81,8 @@
Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, ..Kleur.BrutEik, ..Kleur.BrutEik).MetWaarde(..Passage.Een, ..ProgrammaNaam.XE13, $$$True, $$$False)
Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, ..Kleur.BrutEik, ..Kleur.BrutEik).MetWaarde(..Passage.Twee, ..ProgrammaNaam.XE13, $$$False, $$$True, ..Uitgang)
} Else {
- Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Een, KantenbandDefinitie.ProgrammaNaamBoven, $$$True, $$$False)
- Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Twee, KantenbandDefinitie.ProgrammaNaamOnder, $$$True, $$$True)
+ Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Een, KantenbandDefinitie.ProgrammaNaamOnder, $$$True, $$$False)
+ Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Twee, KantenbandDefinitie.ProgrammaNaamBoven, $$$True, $$$True)
Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Drie, ..ProgrammaNaam.Schiele, $$$True, $$$False)
Do ..VoegToe(KantenbandDefinitie.PlaatAfwerking, KantenbandDefinitie.KleurBoven, KantenbandDefinitie.KleurOnder).MetWaarde(..Passage.Vier, ..ProgrammaNaam.Schiele, $$$False, $$$False, ..Uitgang)
}
@@ -202,10 +202,10 @@
KantenbandDefinitie:APPS.Halux.Machine.Kantenband.PassageDefinitieDefinieerder.KantenbandDefinitie
1
@@ -241,10 +241,10 @@
KantenbandDefinitie:APPS.Halux.Machine.Kantenband.PassageDefinitieDefinieerder.KantenbandDefinitie
1
Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestMultiColour/StartBatch/External_SQL.DB_KantenbandData.xml
===================================================================
diff -u -r58594 -r58641
--- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestMultiColour/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 58594)
+++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestMultiColour/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 58641)
@@ -10,25 +10,25 @@
Pass1Edgeband = W1D08B17
Pass1Exit = ""
Pass1PrinterText = [1B][01][20][01][CC]TA'OR ZCW50L00001
-Pass1Program = PVC_13
+Pass1Program = NE_13
Pass1Tilting180 = 0
Pass1Turning180 = 1
Pass2Edgeband = NED08B17
Pass2Exit = ""
Pass2PrinterText = ""
-Pass2Program = NE_13
+Pass2Program = PVC_13
Pass2Tilting180 = 1
Pass2Turning180 = 1
Pass3Edgeband = ""
Pass3Exit = ""
Pass3PrinterText = ""
-Pass3Program = SCHIELE
+Pass3Program = TRANSFER
Pass3Tilting180 = 0
Pass3Turning180 = 1
Pass4Edgeband = ""
Pass4Exit = D
Pass4PrinterText = ""
-Pass4Program = TRANSFER
+Pass4Program = SCHIELE
Pass4Tilting180 = 0
Pass4Turning180 = 0
PassNumber = 0
@@ -47,25 +47,25 @@
Pass1Edgeband = W1D08B17
Pass1Exit = ""
Pass1PrinterText = [1B][01][20][01][CC]TA'OR ZCW50R00001
-Pass1Program = PVC_13
+Pass1Program = NE_13
Pass1Tilting180 = 0
Pass1Turning180 = 1
Pass2Edgeband = NED08B17
Pass2Exit = ""
Pass2PrinterText = ""
-Pass2Program = NE_13
+Pass2Program = PVC_13
Pass2Tilting180 = 1
Pass2Turning180 = 1
Pass3Edgeband = ""
Pass3Exit = ""
Pass3PrinterText = ""
-Pass3Program = SCHIELE
+Pass3Program = TRANSFER
Pass3Tilting180 = 0
Pass3Turning180 = 1
Pass4Edgeband = ""
Pass4Exit = D
Pass4PrinterText = ""
-Pass4Program = TRANSFER
+Pass4Program = SCHIELE
Pass4Tilting180 = 0
Pass4Turning180 = 0
PassNumber = 0