Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r31681 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 31681) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -90,7 +90,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/AcceptatieTest/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r31681 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/AcceptatieTest/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 31681) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/AcceptatieTest/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -497,7 +497,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00004D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -645,7 +645,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00005D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -793,7 +793,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00006D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2125,7 +2125,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00016D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2273,7 +2273,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00017D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2421,7 +2421,7 @@ Pass2Edgeband = WD08B18 Pass2Exit = E Pass2PrinterText = [1B][01][20][01][CC]TA'OR RNV05690VS00018D1 -Pass2Program = AFKANTEN MELAMINE +Pass2Program = AFKANTEN MELAMINE MET GROEF Pass2Tilting180 = 0 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2569,7 +2569,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2717,7 +2717,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -2865,7 +2865,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" @@ -3013,7 +3013,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r31681 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 31681) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -28,7 +28,7 @@ Pass4Edgeband = "" Pass4Exit = D Pass4PrinterText = "" -Pass4Program = SCHIELE ZIJKANTGROEF +Pass4Program = SCHIELE ZONDER GROEF Pass4Tilting180 = 0 Pass4Turning180 = 0 PassNumber = 0 @@ -65,7 +65,7 @@ Pass4Edgeband = "" Pass4Exit = D Pass4PrinterText = "" -Pass4Program = SCHIELE ZIJKANTGROEF +Pass4Program = SCHIELE ZONDER GROEF Pass4Tilting180 = 0 Pass4Turning180 = 0 PassNumber = 0 @@ -162,17 +162,17 @@ Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = WD08B18 -Pass2Exit = "" +Pass2Exit = D Pass2PrinterText = [1B][01][20][01][CC]TA'OR ZFV40A00002 Pass2Program = AFKANTEN MELAMINE Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" -Pass3Exit = D +Pass3Exit = "" Pass3PrinterText = "" -Pass3Program = GROEF -Pass3Tilting180 = 0 -Pass3Turning180 = 0 +Pass3Program = "" +Pass3Tilting180 = "" +Pass3Turning180 = "" Pass4Edgeband = "" Pass4Exit = "" Pass4PrinterText = "" @@ -199,17 +199,17 @@ Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = WD08B18 -Pass2Exit = "" +Pass2Exit = D Pass2PrinterText = [1B][01][20][01][CC]TA'OR ZFV40B00002 Pass2Program = AFKANTEN MELAMINE Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" -Pass3Exit = D +Pass3Exit = "" Pass3PrinterText = "" -Pass3Program = GROEF -Pass3Tilting180 = 0 -Pass3Turning180 = 0 +Pass3Program = "" +Pass3Tilting180 = "" +Pass3Turning180 = "" Pass4Edgeband = "" Pass4Exit = "" Pass4PrinterText = "" Index: APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml =================================================================== diff -u -r30916 -r38326 --- APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml (.../PassageDefinitieDefinieerder.cls.xml) (revision 30916) +++ APPS/Halux/Machine/Kantenband/PassageDefinitieDefinieerder.cls.xml (.../PassageDefinitieDefinieerder.cls.xml) (revision 38326) @@ -28,13 +28,8 @@ do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("1","AFKANTEN FINEER","1","","") do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("2","AFKANTEN FINEER","1","1","") do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") - do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("4","SCHIELE ZIJKANTGROEF","","","D") + do ..VoegToe("Baliko","Fineer","Zijkant").MetWaarde("4","SCHIELE ZONDER GROEF","","","D") - do ..VoegToe("Baliko","Fineer","Zijkant","N").MetWaarde("1","AFKANTEN FINEER","1","","") - do ..VoegToe("Baliko","Fineer","Zijkant","N").MetWaarde("2","AFKANTEN FINEER","1","1","") - do ..VoegToe("Baliko","Fineer","Zijkant","N").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") - do ..VoegToe("Baliko","Fineer","Zijkant","N").MetWaarde("4","SCHIELE ZONDER GROEF","","","D") - do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("1","AFKANTEN FINEER","1","","") do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("2","AFKANTEN FINEER","1","1","") do ..VoegToe("Baliko","Fineer","Rug").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") @@ -46,12 +41,8 @@ do ..VoegToe("Baliko","Fineer","Front").MetWaarde("4","SCHIELE ZONDER GROEF","","","E") do ..VoegToe("Baliko","Melamine","Zijkant").MetWaarde("1","AFKANTEN MELAMINE","1","","") - do ..VoegToe("Baliko","Melamine","Zijkant").MetWaarde("2","AFKANTEN MELAMINE","","1","") - do ..VoegToe("Baliko","Melamine","Zijkant").MetWaarde("3","GROEF","","","D") + do ..VoegToe("Baliko","Melamine","Zijkant").MetWaarde("2","AFKANTEN MELAMINE","","1","D") - do ..VoegToe("Baliko","Melamine","Zijkant","N").MetWaarde("1","AFKANTEN MELAMINE","1","","") - do ..VoegToe("Baliko","Melamine","Zijkant","N").MetWaarde("2","AFKANTEN MELAMINE","","1","D") - do ..VoegToe("Baliko","Melamine","Rug").MetWaarde("1","AFKANTEN MELAMINE","1","","") do ..VoegToe("Baliko","Melamine","Rug").MetWaarde("2","AFKANTEN MELAMINE","","","E") @@ -79,12 +70,12 @@ do ..VoegToe("Valinge","Fineer","Rug","F").MetWaarde("4","SCHIELE ZONDER GROEF","1","1","E") do ..VoegToe("Valinge","Fineer","Rug","N").MetWaarde("1","AFKANTEN FINEER","1","","") - do ..VoegToe("Valinge","Fineer","Rug","N").MetWaarde("2","AFKANTEN FINEER","","1","") + do ..VoegToe("Valinge","Fineer","Rug","N").MetWaarde("2","AFKANTEN FINEER MET GROEF","","1","") do ..VoegToe("Valinge","Fineer","Rug","N").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") do ..VoegToe("Valinge","Fineer","Rug","N").MetWaarde("4","SCHIELE ZONDER GROEF","1","1","E") do ..VoegToe("Valinge","Fineer","Rug","M").MetWaarde("1","AFKANTEN FINEER","1","","") - do ..VoegToe("Valinge","Fineer","Rug","M").MetWaarde("2","AFKANTEN FINEER","","1","") + do ..VoegToe("Valinge","Fineer","Rug","M").MetWaarde("2","AFKANTEN FINEER MET GROEF","","1","") do ..VoegToe("Valinge","Fineer","Rug","M").MetWaarde("3","SCHIELE ZONDER GROEF","1","","") do ..VoegToe("Valinge","Fineer","Rug","M").MetWaarde("4","SCHIELE ZONDER GROEF","1","1","E") @@ -106,10 +97,10 @@ do ..VoegToe("Valinge","Melamine","Rug","F").MetWaarde("2","AFKANTEN MELAMINE MET GROEF","","","E") do ..VoegToe("Valinge","Melamine","Rug","N").MetWaarde("1","AFKANTEN MELAMINE","1","","") - do ..VoegToe("Valinge","Melamine","Rug","N").MetWaarde("2","AFKANTEN MELAMINE","","","E") + do ..VoegToe("Valinge","Melamine","Rug","N").MetWaarde("2","AFKANTEN MELAMINE MET GROEF","","","E") do ..VoegToe("Valinge","Melamine","Rug","M").MetWaarde("1","AFKANTEN MELAMINE","1","","") - do ..VoegToe("Valinge","Melamine","Rug","M").MetWaarde("2","AFKANTEN MELAMINE","","","E") + do ..VoegToe("Valinge","Melamine","Rug","M").MetWaarde("2","AFKANTEN MELAMINE MET GROEF","","","E") do ..VoegToe("Valinge","Melamine","Front").MetWaarde("1","AFKANTEN MELAMINE 9MM","1","","") do ..VoegToe("Valinge","Melamine","Front").MetWaarde("2","AFKANTEN MELAMINE 9MM","","","E") Index: vhDeploy/D20161208xUpdateKantenbandPassageDefinities.cls.xml =================================================================== diff -u --- vhDeploy/D20161208xUpdateKantenbandPassageDefinities.cls.xml (revision 0) +++ vhDeploy/D20161208xUpdateKantenbandPassageDefinities.cls.xml (revision 38326) @@ -0,0 +1,21 @@ + + + +vhDeploy.Deploy + + +%String +Update Kantenband Passage Definities + + + +1 + + + + + + Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test002ProboxMetOnderdelen/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r30916 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test002ProboxMetOnderdelen/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 30916) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test002ProboxMetOnderdelen/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -90,7 +90,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestVerlaagdeRug/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r37029 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestVerlaagdeRug/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 37029) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestVerlaagdeRug/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -90,7 +90,7 @@ Pass2Edgeband = NND08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/ResetBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r31681 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 31681) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Valigne/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -90,7 +90,7 @@ Pass2Edgeband = NED08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r31681 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 31681) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test001Baliko/ResetBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -28,7 +28,7 @@ Pass4Edgeband = "" Pass4Exit = D Pass4PrinterText = "" -Pass4Program = SCHIELE ZIJKANTGROEF +Pass4Program = SCHIELE ZONDER GROEF Pass4Tilting180 = 0 Pass4Turning180 = 0 PassNumber = 0 @@ -65,7 +65,7 @@ Pass4Edgeband = "" Pass4Exit = D Pass4PrinterText = "" -Pass4Program = SCHIELE ZIJKANTGROEF +Pass4Program = SCHIELE ZONDER GROEF Pass4Tilting180 = 0 Pass4Turning180 = 0 PassNumber = 0 @@ -162,17 +162,17 @@ Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = WD08B18 -Pass2Exit = "" +Pass2Exit = D Pass2PrinterText = [1B][01][20][01][CC]TA'OR ZFV40A00002 Pass2Program = AFKANTEN MELAMINE Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" -Pass3Exit = D +Pass3Exit = "" Pass3PrinterText = "" -Pass3Program = GROEF -Pass3Tilting180 = 0 -Pass3Turning180 = 0 +Pass3Program = "" +Pass3Tilting180 = "" +Pass3Turning180 = "" Pass4Edgeband = "" Pass4Exit = "" Pass4PrinterText = "" @@ -199,17 +199,17 @@ Pass1Tilting180 = 0 Pass1Turning180 = 1 Pass2Edgeband = WD08B18 -Pass2Exit = "" +Pass2Exit = D Pass2PrinterText = [1B][01][20][01][CC]TA'OR ZFV40B00002 Pass2Program = AFKANTEN MELAMINE Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = "" -Pass3Exit = D +Pass3Exit = "" Pass3PrinterText = "" -Pass3Program = GROEF -Pass3Tilting180 = 0 -Pass3Turning180 = 0 +Pass3Program = "" +Pass3Tilting180 = "" +Pass3Turning180 = "" Pass4Edgeband = "" Pass4Exit = "" Pass4PrinterText = "" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_KantenbandData.xml =================================================================== diff -u -r37029 -r38326 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 37029) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestFlatpackV1/StartBatch/External_SQL.DB_KantenbandData.xml (.../External_SQL.DB_KantenbandData.xml) (revision 38326) @@ -386,7 +386,7 @@ Pass2Edgeband = NND08B17 Pass2Exit = "" Pass2PrinterText = "" -Pass2Program = AFKANTEN FINEER +Pass2Program = AFKANTEN FINEER MET GROEF Pass2Tilting180 = 1 Pass2Turning180 = 0 Pass3Edgeband = ""