Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestLosseComponentLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_011_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r67821 -r67824 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestLosseComponentLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_011_ImportFile_15000_20141114_091500.txt (.../Productie_011_ImportFile_15000_20141114_091500.txt) (revision 67821) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/TestLosseComponentLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_011_ImportFile_15000_20141114_091500.txt (.../Productie_011_ImportFile_15000_20141114_091500.txt) (revision 67824) @@ -49,16 +49,16 @@ Rug 1 MELAMINE.W7.130 RCV05690PS00028D1 28 MPGJ 574 169.5 13 W7 Melamine RUG/W7-W7-W7/574x169.5/MPGJ/// 14a/000(28)/ T3/LOS COMP/UNITTEST KLA/2225 RCV05690PS00028D1/B:569xH:164.5 NoRework 15000000 2014111400 Rug 1 MELAMINE.W7.130 RCV05690PS00029D1 29 MPGJ 574 169.5 13 W7 Melamine RUG/W7-W7-W7/574x169.5/MPGJ/// 14a/000(29)/ T3/LOS COMP/UNITTEST KLA/2225 RCV05690PS00029D1/B:569xH:164.5 NoRework 15000000 2014111400 Rug 1 MELAMINE.W7.130 RCV05690PS00030D1 30 MPGJ 574 169.5 13 W7 Melamine RUG/W7-W7-W7/574x169.5/MPGJ/// 14a/000(30)/ T3/LOS COMP/UNITTEST KLA/2225 RCV05690PS00030D1/B:569xH:164.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00031D1 31 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(31)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00031D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00032D1 32 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(32)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00032D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00033D1 33 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(33)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00033D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00034D1 34 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(34)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00034D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00035D1 35 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(35)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00035D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00036D1 36 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(36)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00036D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00037D1 37 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(37)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00037D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00038D1 38 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(38)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00038D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00039D1 39 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(39)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00039D1/B:590xH:191.5 NoRework 15000000 2014111400 -Front 1 MELAMINE.W7.130 FCV05900PS00040D1 40 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(40)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00040D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00031D1 31 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(31)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00031D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00032D1 32 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(32)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00032D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00033D1 33 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(33)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00033D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00034D1 34 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(34)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00034D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00035D1 35 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(35)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00035D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00036D1 36 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(36)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00036D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00037D1 37 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(37)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00037D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00038D1 38 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(38)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00038D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00039D1 39 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(39)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00039D1/B:590xH:191.5 NoRework 15000000 2014111400 +Monster 1 MELAMINE.W7.130 FCV05900PS00040D1 40 MPGK 595 196.5 13 W7 Melamine FRO/W7-W7/595x196.5/MPGK/// 14a/000(40)/ T3/LOS COMP/UNITTEST KLA/2226 FCV05900PS00040D1/B:590xH:191.5 NoRework 15000000 2014111400 Bodem 1 MELAMINE.W7.065 B50P05690VS00041P1 41 MPGL 574 485 6.5 W7 Melamine BOD(DRE)/W7/574x485/MPGL/// 14a/000(41)/ T3/LOS COMP/UNITTEST KLA/2227 B50P05690VS00041P1/B:569xD:480 NoRework 15000000 2014111400 Bodem 1 MELAMINE.W7.065 B50P05690VS00042P1 42 MPGL 574 485 6.5 W7 Melamine BOD(DRE)/W7/574x485/MPGL/// 14a/000(42)/ T3/LOS COMP/UNITTEST KLA/2227 B50P05690VS00042P1/B:569xD:480 NoRework 15000000 2014111400 Bodem 1 MELAMINE.W7.065 B50P05690VS00043P1 43 MPGL 574 485 6.5 W7 Melamine BOD(DRE)/W7/574x485/MPGL/// 14a/000(43)/ T3/LOS COMP/UNITTEST KLA/2227 B50P05690VS00043P1/B:569xD:480 NoRework 15000000 2014111400 Index: APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml =================================================================== diff -u -r65820 -r67824 --- APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml (.../OpdeelzaagOptimalisatieDataAanvuller.cls.xml) (revision 65820) +++ APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml (.../OpdeelzaagOptimalisatieDataAanvuller.cls.xml) (revision 67824) @@ -32,7 +32,7 @@ #dim ZaagDimensie As DOM.PM.Maatwerk.LadeInfo.dto.BalkDimensies = ..OpdeelzaagDimensieBepaler.GeefDimensie(..FrontPlaat) #dim FrontPlaatKleur As DOM.PM.enu.TAORLadeKleur = ..FrontPlaat.GeefKleur() - If (FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).OudZwart()) { + If ((FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).OudZwart()) || (FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).WalnutMediumBrown())) { Set UitvoeringInfo.OptimalisatieData.Rol = "Monster" } Else { Set UitvoeringInfo.OptimalisatieData.Rol = "Front" Index: vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test006BinnenladeLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_006_ImportFile_15000_20141114_091500.txt =================================================================== diff -u -r67821 -r67824 --- vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test006BinnenladeLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_006_ImportFile_15000_20141114_091500.txt (.../Productie_006_ImportFile_15000_20141114_091500.txt) (revision 67821) +++ vhTestFiles/IntegratieTests/Productie.Planning.ActieveBatches.Taorbox.Aansturing/Test006BinnenladeLadeKleurWalnutMediumBrown/StartBatch/Ardis/ImportAuto/Productie_006_ImportFile_15000_20141114_091500.txt (.../Productie_006_ImportFile_15000_20141114_091500.txt) (revision 67824) @@ -5,4 +5,4 @@ ZijkantPlaat 1 MELAMINE.W7.065 ZCP50R00001 1 LI7K 500 179.5 6.5 W7 Melamine ZIJ-R/W7-W7-W7/500x179.5/LI7K/AL/+SWS/OP 14a/000(1)/KAR 1:1/1* T1/V1/UNITTEST KLA/2222-1:1 nolabel ZCP50R00001/D:495xH:174.5 NoRework 15000001 2014111400 1001 1 Rug 1 MELAMINE.W7.130 RCV08990PS00001D2 1 LI7K 904 169.5 13 W7 Melamine RUG/W7-W7-W7/904x169.5/LI7K/AL/+SWS/OP 14a/000(1)/KAR 1:1/1* T1/V1/UNITTEST KLA/2222-1:1 RCV08990PS00001D2/B:899xH:164.5 NoRework 15000001 2014111400 1001 1 Bodem 1 MELAMINE.W7.065 B50P08990VS00001P1 1 LI7K 904 485 6.5 W7 Melamine BOD(SCH:B+M)/W7/904x485/LI7K/AL/+SWS/OP 14a/000(1)/KAR 1:1/1* T1/V1/UNITTEST KLA/2222-1:1 B50P08990VS00001P1/B:899xD:480 NoRework 15000001 2014111400 1001 1 -Front 1 MELAMINE.W7.130 FCV09200PS00001D2 1 LI7K 925 196.5 13 W7 Melamine FRO/W7-W7/925x196.5/LI7K/AL/+SWS/OP 14a/000(1)/KAR 1:1/1* T1/V1/UNITTEST KLA/2222-1:1 FCV09200PS00001D2/B:920xH:191.5 NoRework 15000001 2014111400 1001 1 +Monster 1 MELAMINE.W7.130 FCV09200PS00001D2 1 LI7K 925 196.5 13 W7 Melamine FRO/W7-W7/925x196.5/LI7K/AL/+SWS/OP 14a/000(1)/KAR 1:1/1* T1/V1/UNITTEST KLA/2222-1:1 FCV09200PS00001D2/B:920xH:191.5 NoRework 15000001 2014111400 1001 1