Index: WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml =================================================================== diff -u -r62824 -r62825 --- WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 62824) +++ WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler.cls.xml (.../DnaCodeInVhossKastBepaler.cls.xml) (revision 62825) @@ -125,20 +125,21 @@ #dim tempZijVlak = $lg(tempVhossEnZijvlak,2) If ##class(TECH.StringUtils).StartsWith(tempDnaCode.PalletCode,"O1") { + Do ##class(Tools.Wlip).%New(127).String(Pallet_"/"_tempDnaCode.PalletCode_"/"_tempInternVhossId_"/"_InternVhossId_"/"_tempZijVlak_"/"_ZijVlak) If (Pallet = tempDnaCode.PalletCode) && ($$$Not(tempInternVhossId = InternVhossId) || $$$Not(tempZijVlak = ZijVlak)) { Set Resultaat = 0 } If $$$Not(Pallet = tempDnaCode.PalletCode) && ((tempInternVhossId = InternVhossId) && (tempZijVlak = ZijVlak)) { Set Resultaat = 1 } + If (Pallet = tempDnaCode.PalletCode) && ((tempInternVhossId = InternVhossId) && $$$Not(tempZijVlak = ZijVlak)) { + Set Resultaat = 2 + } If Resultaat=1 { If (tempInternVhossId = InternVhossId) && (tempZijVlak = ZijVlak) { Set Resultaat = (tempDnaCode.PalletCode = Pallet) } - If (tempInternVhossId = InternVhossId) && $$$Not(tempZijVlak = ZijVlak) { - Set Resultaat = 2 - } } } } Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml =================================================================== diff -u -r62824 -r62825 --- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml (.../Test.cls.xml) (revision 62824) +++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeInVhossKastBepaler/MagDnaCodeInVhossKast/Test.cls.xml (.../Test.cls.xml) (revision 62825) @@ -427,7 +427,7 @@ Set Bepaler = ##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New(SequentieServiceStub, DnaCodeRepositoryStub) - #dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCodeAchterkant,BatchId) + #dim Antwoord As %Integer = Bepaler.MagDnaCodeInVhossKast(AfTeScannenDnaCode,PalletCodeVoorkant,BatchId) Do $$$AssertEquals(Antwoord,2) ]]>