Index: vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler/BepaalEtiketData/Test.cls.xml =================================================================== diff -u -r72888 -r72903 --- vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler/BepaalEtiketData/Test.cls.xml (.../Test.cls.xml) (revision 72888) +++ vhUnitTest/APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler/BepaalEtiketData/Test.cls.xml (.../Test.cls.xml) (revision 72903) @@ -178,12 +178,24 @@ Do LadeMock.IndienMethodCall("GeefFronten").DanReturn(##class(TECH.ListUtils).CreateListOfObjects(##class(DOM.PM.Maatwerk.LadeInfo.Fronten).%New())) Do LadeMock.IndienMethodCall("GeefKleur").DanReturn(##class(DOM.PM.enu.TAORLadeKleur).WalnutMediumBrown()) Do ..LadeOnderdeel.ZetLade(LadeMock) - Set ..UitvoeringInfo.PartijID = "K||8365" + Set ..UitvoeringInfo.PartijID = ##class(DOM.VKP.enu.Klant).Lodder() Do ..AssertEtiketInfo("Lijn1", 3, "502x152") ]]> + + + + 1 1 + +%String +"K||8365" +1 +1 + + %String "K||32383" Index: APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml =================================================================== diff -u -r72883 -r72903 --- APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml (.../OpdeelzaagOptimalisatieDataAanvuller.cls.xml) (revision 72883) +++ APPS/Halux/PPS/Activiteit/impl/TAOR/Front/OpdeelzaagOptimalisatieDataAanvuller.cls.xml (.../OpdeelzaagOptimalisatieDataAanvuller.cls.xml) (revision 72903) @@ -46,7 +46,7 @@ #dim ZaagDimensie As DOM.PM.Maatwerk.LadeInfo.dto.BalkDimensies = ..OpdeelzaagDimensieBepaler.GeefDimensie(..FrontPlaat) #dim FrontPlaatKleur As DOM.PM.enu.TAORLadeKleur = ..FrontPlaat.GeefKleur() #dim IsKleurWalnutMediumBrown As %Boolean = (FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).WalnutMediumBrown()) - #dim IsKlantLodder As %Boolean = (UitvoeringInfo.PartijID = "K||8365") + #dim IsKlantLodder As %Boolean = (UitvoeringInfo.PartijID = ##class(DOM.VKP.enu.Klant).Lodder()) If ((FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).OudZwart()) || (FrontPlaatKleur = ##class(DOM.PM.enu.TAORLadeKleur).WalnutMediumBrown()) || ..IsEindklantSnaideroOnderPersonalityHaefeleItalie(UitvoeringInfo)) { Set UitvoeringInfo.OptimalisatieData.Rol = "Monster" Index: DOM/VKP/enu/Klant/Verwerker.cls.xml =================================================================== diff -u -r72621 -r72903 --- DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72621) +++ DOM/VKP/enu/Klant/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 72903) @@ -150,6 +150,8 @@ Do ..VerwerkLenssenProduktie() } ElseIf Klant = "K||6819" { Do ..VerwerkLijstPrijsKlant() + } ElseIf Klant = "K||8365" { + Do ..VerwerkLodder() } ElseIf Klant = "K||32383" { Do ..VerwerkMartens() } ElseIf Klant = "K||2999" { @@ -665,6 +667,12 @@ + +1 +1 + + + 1 1 Index: DOM/VKP/enu/Klant.cls.xml =================================================================== diff -u -r72621 -r72903 --- DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 72621) +++ DOM/VKP/enu/Klant.cls.xml (.../Klant.cls.xml) (revision 72903) @@ -7,7 +7,7 @@ TECH.Enumeration -,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199 +,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||27132,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||8092,K||3145,K||2265,K||4943,K||19485,K||1736,K||4875,K||4598,K||2254,K||2595,K||4026,K||14604,K||13446,K||13823,K||29070,K||30531,K||31008,K||14348,K||23930,K||30935,K||30924,K||30961,K||29009,K||25319,K||19454,K||24402,K||19455,K||15260,K||7189,K||32503,K||4826,K||3878,K||2865,K||29279,K||10421,K||21672,K||22062,K||3513,K||32672,K||1445,K||32903,K||32915,K||19422,K||2856,K||2264,K||8868,K||14292,K||1254,K||3042,K||17999,K||35412,K||35415,K||30467,K||35697,K||35698,K||35864,K||26329,K||36412,K||36413,K||36605,K||2913,K||32383,K||34258,K||37598,K||4250,K||39199,K||8365 @@ -824,6 +824,13 @@ ]]> + +1 +DOM.VKP.enu.Klant + + + 1 KlantNummer:%String Index: APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler.cls.xml =================================================================== diff -u -r72890 -r72903 --- APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler.cls.xml (.../EtiketInfoBepaler.cls.xml) (revision 72890) +++ APPS/Halux/PPS/Activiteit/impl/TAOR/common/EtiketInfoBepaler.cls.xml (.../EtiketInfoBepaler.cls.xml) (revision 72903) @@ -226,7 +226,7 @@ #dim Lade As DOM.PM.Maatwerk.LadeInfo.Lade = LadeOnderdeel.GeefLade() #dim IsFrontAanwezig As %Boolean = (Lade.GeefFronten().Count() > 0) #dim IsLadeKleurWalnutMediumBrown As %Boolean = (Lade.GeefKleur() = ##class(DOM.PM.enu.TAORLadeKleur).WalnutMediumBrown()) - #dim IsKlantLodder As %Boolean = (UitvoeringInfo.PartijID = "K||8365") + #dim IsKlantLodder As %Boolean = (UitvoeringInfo.PartijID = ##class(DOM.VKP.enu.Klant).Lodder()) If (IsFrontAanwezig && IsLadeKleurWalnutMediumBrown && IsKlantLodder) { #dim Lengte = $Piece(DimensieString, "x", 1) - $$$OvermaatWijzigingVoorLodderW7