Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r63661 -r75015
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 63661)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 75015)
@@ -78,8 +78,27 @@
 <Private>1</Private>
 </Property>
 
+<Property name="DocumentGenerator">
+<Type>APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="DnaCodeHelper">
+<Type>APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="MESService">
+<Type>APPS.Halux.PPS.MES.MESService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductTypeAPI">
+<Type>DOM.PM.impl.ProductTypeAPIimpl</Type>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper="",ToeleveringService:DOM.AKP.ToeleveringService=""</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper="",ToeleveringService:DOM.AKP.ToeleveringService="",DocumentGenerator:APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective="",DnaCodeHelper:APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",VerzendDirectControleur:BL.MB.UGLYPicking.VerzendDirectControleur=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -94,11 +113,15 @@
 	Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.VKP.impl.VerkoopAPI).%New())
 	Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New())
 	Set ..DnaCodeInVhossKastBepaler = $$$Inject(DnaCodeInVhossKastBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New())
-	Set ..VerzendDirectControleur = ##class(BL.MB.UGLYPicking.VerzendDirectControleur).%New()
+	Set ..VerzendDirectControleur = $$$Inject(VerzendDirectControleur,##class(BL.MB.UGLYPicking.VerzendDirectControleur).%New())
 	Set ..SequentieService = $$$Inject(SequentieService,##class(APPS.Halux.common.impl.SequentieService).%New())
 	Set ..RondAfVhossKastHelper = $$$Inject(RondAfVhossKastHelper,##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New())
 	Set ..ToeleveringService = $$$Inject(ToeleveringService, ##class(DOM.AKP.impl.ToeleveringService).%New())
 	Set ..BufferHelper = ##class(WSimpl.Halux.AAP.DnaCodeService.BufferHelper).%New()
+	Set ..DocumentGenerator = $$$Inject(DocumentGenerator, ##class(APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New())
+	Set ..DnaCodeHelper = $$$Inject(DnaCodeHelper, ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New())
+	Set ..MESService = ##class(APPS.Halux.PPS.MES.MESService).%New()
+	Set ..ProductTypeAPI = $$$Inject(ProductTypeAPI, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -369,6 +392,15 @@
 				
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 				
+				#dim MesFaseActief As %Integer = 1
+				#dim CategorTLM As %Boolean = ((..ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer)))
+				If ((..MESService.IsActiefVoorMes(DnaCode.Lijn, MesFaseActief) && CategorTLM) && (..MESService.GeefHuidigeMESFase() = 1)) {	
+					#dim IsDnaCodeVoorSpaceStep As %Boolean = ..DnaCodeHelper.IsSpaceStepGeneriekProduct(DnaCode, DnaCode.ProductNummer)
+					If $$$Not(IsDnaCodeVoorSpaceStep) {
+						Do ..DocumentGenerator.GenereerDocumentVoorObjective(DnaCode.DnaCode)	
+					}
+				}			
+				
 				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
 					Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode)
 					Set Response.Header.Status = "200"
@@ -505,6 +537,51 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PalletBijwerkenOBJT">
+<FormalSpec>PalletBijwerkenRequest:WS.Halux.AAP.PalletBijwerkenOBJTRequest</FormalSpec>
+<ReturnType>WS.Halux.AAP.PalletBijwerkenOBJTResponse</ReturnType>
+<Implementation><![CDATA[
+	#dim DnaCode As DOM.Halux.AAP.DnaCode
+	#dim DnaCodeIterator As TECH.Iterator
+	Set Response = ##class(WS.Halux.AAP.PalletBijwerkenOBJTResponse).%New()
+	Set Response.Status = "OK"
+	
+	Try {
+		#dim ListOfDnaCodes As %ListOfObjects = ##class(%ListOfObjects).%New()
+		#dim PINCodeIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(PalletBijwerkenRequest.PINCodes)
+		
+		While PINCodeIterator.HasNext() {
+			#dim PIN As %String = PINCodeIterator.Next()
+			Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaDnaCode(PIN)
+			
+			If $$$Not(DnaCodeIterator.HasNext()) {
+				Set Response.Status = "NOK"
+				Set Response.Foutboodschap = Response.Foutboodschap_ "Unknown PIN '" _PIN_"'. "
+			} Else {
+				Set DnaCode = DnaCodeIterator.Next()
+				Set DnaCode.PalletCode = PalletBijwerkenRequest.PalletCode
+				Do ..DnaCodeRepository.Bewaar(DnaCode)
+				Do ListOfDnaCodes.Insert(DnaCode)
+			}
+		}
+		
+		If (Response.Status = "OK") {
+			Set DnaCodeIterator = 	##class(TECH.ListIterator).%New(ListOfDnaCodes)			
+			If DnaCodeIterator.HasNext() {
+				Do ..BufferHelper.DnaCodesKlaarmakenVoorBuffer(DnaCodeIterator, ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBuffer(), , PalletBijwerkenRequest.PalletCode, "")
+			}
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set Response.Status = "NOK"
+		Set Response.Foutboodschap = "Unknown exception: "_ Exception.GeefOmschrijving()
+		Do ##class(vhLib.Logger).%New().Warning("AAP",Exception.GeefOmschrijving())
+	}
+	
+	Quit Response
+]]></Implementation>
+</Method>
+
 <Method name="HernoemPallet">
 <FormalSpec>HernoemPalletRequest:WS.Halux.AAP.HernoemPalletRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.HernoemPalletResponse</ReturnType>
@@ -661,7 +738,7 @@
 <Implementation><![CDATA[
 	Try {
 		Set Response = ##class(WS.Halux.AAP.DirecteLeveringResponse).%New()
-		Set Response.IsDirecteLevering = $$$Not($$$HasLength(..VerzendDirectControleur.ControleViaToelevering(DirecteLeveringRequest.Toelevering)))
+		Set Response.IsDirecteLevering = ..GeefIsDirecteLevering(DirecteLeveringRequest.Toelevering)
 		Set Response.Header.Status = "200"
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -672,14 +749,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIsDirecteLevering">
+<FormalSpec>ToeleveringId:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$$Not($$$HasLength(..VerzendDirectControleur.ControleViaToelevering(ToeleveringId)))
+]]></Implementation>
+</Method>
+
 <Method name="GeefVolgendeTbpCode">
 <FormalSpec>GeefVolgendeTbpCodeRequest:WS.Halux.AAP.GeefVolgendeTbpCodeRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.GeefVolgendeTbpCodeResponse</ReturnType>
 <Implementation><![CDATA[
 	Try {
 		Set Response = ##class(WS.Halux.AAP.GeefVolgendeTbpCodeResponse).%New()
 		#dim PalletIDBepaler As APPS.Halux.PPS.PalletIDBepaler = ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefPalletIDBepaler()
-		Set Response.VolgendeTbpCode = PalletIDBepaler.GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox())
+		Set Response.VolgendeTbpCode = PalletIDBepaler.GeefNieuwPalletID(##class(BL.PPS.TBX.enu.PalletEtiketType).Probox(), GeefVolgendeTbpCodeRequest.ToeleveringId, GeefVolgendeTbpCodeRequest.ProductNummer)
 		Set Response.Header.Status = "200"
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
@@ -950,16 +1035,24 @@
 			If KlantinstellingenIterator.HasNext() {
 				Set Klantinstellingen = KlantinstellingenIterator.Next()
 				Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport
+				Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs
 				Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet
+				Set Klantinstellingen.HalvePallet = BewerkKlantInstellingen.HalvePallet
+				Set Klantinstellingen.KartonnenPallet = BewerkKlantInstellingen.KartonnenPallet
 				Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen
+				
 				Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen)
 			} Else {
 				If ..VerkoopAPI.BestaatKlant(BewerkKlantInstellingen.KlantId) {
 					Set Klantinstellingen = ..KlantinstellingenRepository.Maak()
 					Set Klantinstellingen.KlantId = BewerkKlantInstellingen.KlantId
 					Set Klantinstellingen.IsExport = BewerkKlantInstellingen.IsExport
+					Set Klantinstellingen.IsBlumXs = BewerkKlantInstellingen.IsBlumXs
 					Set Klantinstellingen.WegwerpPallet = BewerkKlantInstellingen.WegwerpPallet
+					Set Klantinstellingen.HalvePallet = BewerkKlantInstellingen.HalvePallet
+					Set Klantinstellingen.KartonnenPallet = BewerkKlantInstellingen.KartonnenPallet
 					Set Klantinstellingen.MeerdereToeleveringen = BewerkKlantInstellingen.MeerdereToeleveringen
+					
 					Do ..KlantinstellingenRepository.Bewaar(Klantinstellingen)
 				}
 			}
@@ -1048,7 +1141,7 @@
 	Set DnaCodeDto.AxProductieOrderNummer = DnaCode.AxProductieOrderNummer 
 	Set DnaCodeDto.ProductNummer = DnaCode.ProductNummer 
 	Set DnaCodeDto.DnaCode = DnaCode.DnaCode 
-	Set DnaCodeDto.PalletCode = DnaCode.PalletCode 
+	Set DnaCodeDto.PalletCode = DnaCode.PalletCode
 	Set DnaCodeDto.Toelevering = DnaCode.Toelevering 
 	Set DnaCodeDto.KlantNummer = DnaCode.KlantNummer 
 	Set DnaCodeDto.Locatie = DnaCode.Locatie 
@@ -1076,9 +1169,12 @@
 	Set KlantinstellingenDto = ##class(WSimpl.Halux.AAP.dto.Klantinstellingen).%New()
 	
 	Set KlantinstellingenDto.KlantId = Klantinstellingen.KlantId 
-	Set KlantinstellingenDto.IsExport = Klantinstellingen.IsExport 
+	Set KlantinstellingenDto.IsExport = Klantinstellingen.IsExport
+	Set KlantinstellingenDto.IsBlumXs = Klantinstellingen.IsBlumXs
 	Set KlantinstellingenDto.Klantnaam = ..VerkoopAPI.GeefKlant(Klantinstellingen.KlantId).GeefNaam()
 	Set KlantinstellingenDto.WegwerpPallet = Klantinstellingen.WegwerpPallet
+	Set KlantinstellingenDto.HalvePallet = Klantinstellingen.HalvePallet
+	Set KlantinstellingenDto.KartonnenPallet = Klantinstellingen.KartonnenPallet
 	Set KlantinstellingenDto.MeerdereToeleveringen = Klantinstellingen.MeerdereToeleveringen
 	
 	Quit KlantinstellingenDto