Index: APPS/Verpakking/DoosService.cls.xml
===================================================================
diff -u -r69113 -r69163
--- APPS/Verpakking/DoosService.cls.xml	(.../DoosService.cls.xml)	(revision 69113)
+++ APPS/Verpakking/DoosService.cls.xml	(.../DoosService.cls.xml)	(revision 69163)
@@ -43,8 +43,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProductTypeAPI">
+<Type>DOM.PM.ProductTypeAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DoosFactory:APPS.Verpakking.DoosFactory="",DoosAanvuller:APPS.Verpakking.DoosAanvuller="",Optimizer:APPS.Verpakking.Optimizer="",SnijDoosService:WS.APPS.Verpakking.SnijDoosService="",SnijRequestMaker:WS.APPS.Verpakking.Service.MaakSnijRequest="",ProductAPI:DOM.PM.ProductAPI=""</FormalSpec>
+<FormalSpec>DoosFactory:APPS.Verpakking.DoosFactory="",DoosAanvuller:APPS.Verpakking.DoosAanvuller="",Optimizer:APPS.Verpakking.Optimizer="",SnijDoosService:WS.APPS.Verpakking.SnijDoosService="",SnijRequestMaker:WS.APPS.Verpakking.Service.MaakSnijRequest="",ProductAPI:DOM.PM.ProductAPI="",ProductTypeAPI:DOM.PM.ProductTypeAPI=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -56,6 +61,7 @@
 	Set ..SnijDoosService = $$$Inject(SnijDoosService, ##class(WS.APPS.Verpakking.SnijDoosService).%New())
 	Set ..SnijRequestMaker = $$$Inject(SnijRequestMaker, ##class(WS.APPS.Verpakking.Service.MaakSnijRequest).%New())
 	Set ..ProductAPI = $$$Inject(ProductAPI, ##class(DOM.DomeinContext).Instance().GeefProductAPI())
+	Set ..ProductTypeAPI = $$$Inject(ProductTypeAPI, ##class(DOM.DomeinContext).Instance().GeefProductTypeAPI())
 	Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
 	Set ..Logger = ##class(vhLib.Logger).%New("VH doos service")
 	
@@ -67,22 +73,43 @@
 <FormalSpec><![CDATA[ProductGroep:%String,ReceptNaam:%String,MachineID:APPS.Verpakking.enu.MachineID,Aantal:%Integer,&Params:%String,ProductId:%String,Prioriteit:%String="-1",BaseRef:%String,&CallBack:%List=""]]></FormalSpec>
 <Implementation><![CDATA[
 	If $$$Not(MachineID = ##class(APPS.Verpakking.enu.MachineID).VH()) {
+		Set BaseRef = $Piece(BaseRef,".",1,2) //Bij TAOR komt er nog een 3e piece achter, dit zou verder in de flow anders voor fouten zorgen
 		#dim MachineTechnologie As APPS.Verpakking.enu.MachineTechnologie = ..GeefMachineTechnologie(MachineID)
 		#dim Doos As APPS.Verpakking.Doos = ..DoosFactory.MaakDoos(ProductGroep, ReceptNaam)
 		Do ..DoosAanvuller.VulAanBasisInformatieDoos(.Doos, .Params, ProductGroep, Prioriteit, MachineTechnologie)
 		Do ..Optimizer.Optimize(.Doos, ProductGroep)
+		/*
+		If (##class(TECH.StringUtils).Equals(ProductId, "3715382", "3715383", "3715394", "3715396", "3715398", "3715400", "3098795", "1239215")) {
+			Set ..SnijDoosService.Location = "http://docker02-prd:1880/ws/cut-request/v2"
+		}
+		*/
+		#dim Product As DOM.PM.Product = ..ProductAPI.GeefProduct(ProductId)
 		
-		#dim Product As DOM.PM.Product = ##class(DOM.DomeinContext).Instance().GeefProductAPI().GeefProduct(ProductId)
+		#dim SnijData As DS.Prod.OptiBox.SnijData = ""
+		#dim OptiData As DS.Prod.OptiBox.OptiData
+		#dim SnijDef As DS.Prod.OptiBox.sub.emSnijDef
 		
-		#dim OptiData As DS.Prod.OptiBox.OptiData = ..MaakOptiData(Doos, BaseRef, Aantal, Product, MachineID, Prioriteit)
-		#dim SnijData As DS.Prod.OptiBox.SnijData = ..MaakSnijData(Doos, BaseRef, OptiData, Product, MachineID, Prioriteit)
-		#dim SnijDef As DS.Prod.OptiBox.sub.emSnijDef = ..MaakSnijDef(Doos, SnijData)
-		Do SnijData.SnijDefs.SetAt(SnijDef, MachineID)
-		Do SnijData.%Save()
+		If $G(CallBack) && (..GeefCodePadVanMachine(MachineTechnologie) = "NodeRed") {	//Er kan ook gesneden worden zonder CallBack: zoals rechtstreekse snijopdrachten via admin via F11 -> SnijDoos
+			Set OptiData = ..MaakOptiData(Doos, BaseRef, Aantal, Product, MachineID, Prioriteit)
+			Set SnijData = ..MaakSnijData(Doos, BaseRef, OptiData, Product, MachineID, Prioriteit)
+			Set SnijDef = ..MaakSnijDef(Doos, SnijData)
+			Do SnijData.SnijDefs.SetAt(SnijDef, MachineID)		
+			Do SnijData.%Save()
+			
+			#dim OptiboxQueue = ..MaakOptiboxQueue(SnijData, Prioriteit, CallBack, OptiData)
+			If (..ProductTypeAPI.IsLegraboxProduct(ProductId) || ..ProductTypeAPI.IsMerivoboxProduct(ProductId)) {
+				Set WerklijstItemStatusUpdater = ##class(APPS.Halux.PPS.Verpakking.impl.KartonSnijder.WerklijstItemStatusUpdater).%New()
+				Do WerklijstItemStatusUpdater.UpdateWerklijstItemStatusViaID($LG(CallBack,3), $$$False, ##class(APPS.Halux.PPS.Verpakking.enu.KartonMachineStatus).Geoptimaliseerd())
+			} ElseIf (..ProductTypeAPI.IsTandemboxProduct(ProductId) || ..ProductTypeAPI.IsTAORboxProduct(ProductId)) {
+				Set Queue = ##class(DS.PPS.TBX.Queue).%OpenId($LG(CallBack,3))
+				Set Queue.WPVerpak.SnijStatus = "Q"
+			} Else {
+				Do ..Logger.Error("GeefDoos", "Voor dit maatwerktype is nog geen implementatie voorzien in de de VHDoosService.")
+			}
+		}
 		
-		#dim OptiboxQueue = ..MaakOptiboxQueue(SnijData, Prioriteit, CallBack)
-		
-		#dim SnijRequest As WS.APPS.Verpakking.SnijDoosRequest = ..SnijRequestMaker.MaakSnijRequest(Doos, MachineTechnologie, MachineID, Prioriteit, Aantal, SnijData.Reference)
+		#dim Referentie As %String = $Select($$$Not(SnijData = ""): SnijData.Reference, 1: BaseRef)
+		#dim SnijRequest As WS.APPS.Verpakking.SnijDoosRequest = ..SnijRequestMaker.MaakSnijRequest(Doos, MachineTechnologie, MachineID, Prioriteit, Aantal, Referentie)
 		Do ..LogXmlObject(SnijRequest, "GeefDoos OUT")
 		
 		#dim SnijResponse As WS.APPS.Verpakking.SnijDoosResponse = ..SnijDoosService.SnijDoos(SnijRequest)
@@ -115,6 +142,25 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefCodePadVanMachine">
+<FormalSpec>MachineID:APPS.Verpakking.enu.MachineID</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.Verpakking.enu.MachineTechnologie</ReturnType>
+<Implementation><![CDATA[
+	#dim Codepad As %String
+	
+	If (MachineID = ##class(APPS.Verpakking.enu.MachineID).VH()) {
+		Set Codepad = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.Machine.VH_Codepad")
+	} ElseIf (MachineID = ##class(APPS.Verpakking.enu.MachineID).HALUX()) {
+		Set Codepad = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.Machine.HALUX_Codepad")
+	} ElseIf(MachineID = ##class(APPS.Verpakking.enu.MachineID).TAOR()) {
+		Set Codepad = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.Machine.TAOR_Codepad")
+	}
+	
+	Quit Codepad
+]]></Implementation>
+</Method>
+
 <Method name="LogXmlObject">
 <FormalSpec>XmlObject:%XML.Adaptor,Actie:%String</FormalSpec>
 <Private>1</Private>
@@ -160,7 +206,6 @@
 <ReturnType>DS.Prod.OptiBox.SnijData</ReturnType>
 <Implementation><![CDATA[
 	Set SnijData=##class(DS.Prod.OptiBox.SnijData).%New()
-	Set SnijData.Reference = BaseRef_ "." _ OptiData.%Id()
 	Set SnijData.OptiData = OptiData
 	Set SnijData.ObjRef = OptiData.ObjRef
 	Set SnijData.ObjType = OptiData.ObjType
@@ -192,8 +237,10 @@
 	Do SnijData.%Save()
 	
 	//Set SnijData.BoxDeelVan = SnijData.%Id() //wss ook niet van belang
-	//Do SnijData.%Save()
 	
+	Set SnijData.Reference = BaseRef_ "." _ SnijData.%Id()
+	Do SnijData.%Save()
+	
 	Quit SnijData
 ]]></Implementation>
 </Method>
@@ -225,12 +272,12 @@
 </Method>
 
 <Method name="MaakOptiboxQueue">
-<FormalSpec>SnijData:DS.Prod.OptiBox.SnijData,Prioriteit:%String,CallBack:%List</FormalSpec>
+<FormalSpec>SnijData:DS.Prod.OptiBox.SnijData,Prioriteit:%String,CallBack:%List,OptiData:DS.Prod.OptiBox.OptiData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	Set OptiboxQueue =##class(DS.Prod.OptiBox.Queue).%New()
 	Set OptiboxQueue.Type = "S" //// O: Optimizer, S : Snijden, M : Machine //Optimise niet in tabel zetten? 
-	//Set OptiboxQueue.ID = ID // ID die terugkomt van de snijcall, niet nodig dus
+	Set OptiboxQueue.ID = SnijData.%Id()
 	Set OptiboxQueue.ObjType = SnijData.ObjType
 	Set OptiboxQueue.ObjRef = SnijData.ObjRef
 	Do:(OptiboxQueue.Type = "S")&&$P(SnijData.Reference,".",3) OptiboxQueue.SnijDataSetObjectId(SnijData.Reference)
Index: vhDeploy/Deploy20220908xConfigSettingsPadKartonSnijMachine.cls.xml
===================================================================
diff -u
--- vhDeploy/Deploy20220908xConfigSettingsPadKartonSnijMachine.cls.xml	(revision 0)
+++ vhDeploy/Deploy20220908xConfigSettingsPadKartonSnijMachine.cls.xml	(revision 69163)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhDeploy.Deploy20220908xConfigSettingsPadKartonSnijMachine">
+<Super>vhDeploy.Deploy</Super>
+
+<Parameter name="Omschrijving">
+<Type>%String</Type>
+<Default>Deployen van configuratiesetting voor codepad van kartonsnijmachines</Default>
+</Parameter>
+
+<Method name="ExecCode">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[	Do ..ZetProjectSettings()
+]]></Implementation>
+</Method>
+
+<Method name="ZetProjectSettings">
+<ClassMethod>1</ClassMethod>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim ConfigManager As TECH.Config.ConfigMgr = ##class(TECH.Config.ConfigMgr).Instance()
+	
+	If $$$Not(ConfigManager.BestaatSleutel("APPS.Verpakking.Machine.VH_Codepad")) {
+		Do ConfigManager.SetString("APPS.Verpakking.Machine.VH_Codepad", "Cache")
+	}
+	
+	If $$$Not(ConfigManager.BestaatSleutel("APPS.Verpakking.Machine.HALUX_Codepad")) {
+		Do ConfigManager.SetString("APPS.Verpakking.Machine.HALUX_Codepad", "Cache")
+	}
+	
+	If $$$Not(ConfigManager.BestaatSleutel("APPS.Verpakking.Machine.TAOR_Codepad")) {
+		Do ConfigManager.SetString("APPS.Verpakking.Machine.TAOR_Codepad", "Cache")
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml
===================================================================
diff -u -r69113 -r69163
--- vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml	(.../Test.cls.xml)	(revision 69113)
+++ vhUnitTest/APPS/Verpakking/DoosService/Test.cls.xml	(.../Test.cls.xml)	(revision 69163)
@@ -10,7 +10,7 @@
 	Set OptimizerMock = ##class(vhTest.Mock.APPS.Verpakking.Optimizer).%New()
 	Set SnijDoosServiceMock = ##class(vhTest.Mock.WS.APPS.Verpakking.SnijDoosService).%New()
 	Set SnijRequestMakerMock = ##class(vhTest.Mock.WS.APPS.Verpakking.Service.MaakSnijRequest).%New()
-	Set ProductApiLadeMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
 	
 	#dim ProductGroep, ReceptNaam, MachineID, MachineTechnologie, Params, Prioriteit, PRNr, BaseRef, CallBack As %String
 	#dim Aantal As %Decimal = 1
@@ -40,19 +40,78 @@
 	Do OptimizerMock.VerwachtMethodCall("Optimize", DummyDoos, ProductGroep).DanReturn(DummyDoos).ExactAantalKeer(1)
 	Do SnijRequestMakerMock.VerwachtMethodCall("MaakSnijRequest", DummyDoos, MachineTechnologie, MachineID, Prioriteit, Aantal, BaseRef).DanReturn(DummyRequest).ExactAantalKeer(1)
 	Do SnijDoosServiceMock.VerwachtMethodCall("SnijDoos", DummyRequest).DanDoeNiks().ExactAantalKeer(1)
-	Do ProductApiLadeMock.VerwachtMethodCall("GeefProduct", DummyRequest).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", PRNr).DanDoeNiks().ExactAantalKeer(1)
 	
-	Set DoosService = ##class(APPS.Verpakking.DoosService).%New(DoosFactoryMock, DoosAanvullerMock, OptimizerMock, SnijDoosServiceMock, SnijRequestMakerMock)
+	Set DoosService = ##class(APPS.Verpakking.DoosService).%New(DoosFactoryMock, DoosAanvullerMock, OptimizerMock, SnijDoosServiceMock, SnijRequestMakerMock, ProductApiMock,)
 	Do DoosService.GeefDoos(ProductGroep, ReceptNaam, MachineID, Aantal, .Params, PRNr, Prioriteit, BaseRef, CallBack)
 	
 	Do DoosFactoryMock.Verifieer()
 	Do DoosAanvullerMock.Verifieer()
 	Do OptimizerMock.Verifieer()
 	Do SnijRequestMakerMock.Verifieer()
 	Do SnijDoosServiceMock.Verifieer()
-	Do ProductApiLadeMock.Verifieer()
+	Do ProductApiMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/*
+Method "Test: ProductType wordt niet herkend gedrag"()
+{
+	Set DoosFactoryMock = ##class(vhTest.Mock.APPS.Verpakking.DoosFactory).%New()
+	Set DoosAanvullerMock = ##class(vhTest.Mock.APPS.Verpakking.DoosAanvuller).%New()
+	Set OptimizerMock = ##class(vhTest.Mock.APPS.Verpakking.Optimizer).%New()
+	Set SnijDoosServiceMock = ##class(vhTest.Mock.WS.APPS.Verpakking.SnijDoosService).%New()
+	Set SnijRequestMakerMock = ##class(vhTest.Mock.WS.APPS.Verpakking.Service.MaakSnijRequest).%New()
+	Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Set ProductTypeApiMock = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New()
+	
+	#dim ProductGroep, ReceptNaam, MachineID, MachineTechnologie, Params, Prioriteit, PRNr, BaseRef, CallBack As %String
+	#dim Aantal As %Decimal = 1
+	Kill Params
+	Set PRNr = "3098795"
+	Set Prioriteit = "DummyPrioriteit"
+	Set ProductGroep = "TBX"
+	Set ReceptNaam = "V1 Boxkap doos"
+	Set MachineID = ##class(APPS.Verpakking.enu.MachineID).HALUX()
+	Set MachineTechnologie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.MachineTechnologie_HALUX")
+	Set BaseRef = "DummyBaseRef.Test"
+	Set CallBack = "DummyCallBack"
+	Set Params("BREEDTE") = 630
+	Set Params("DIEPTE") = 350
+	Set Params("HOOGTE") = 140
+	#dim DummyDoos As APPS.Verpakking.Doos = ##class(APPS.Verpakking.VouwErrondDoos).%New()
+	Set DummyRequest = ##class(WS.APPS.Verpakking.SnijDoosRequest).%New()
+	Set DummyRequest.CutMachine = ##class(APPS.Verpakking.enu.MachineID).HALUX()
+	Set DummyRequest.Priority = Prioriteit
+	Set DummyRequest.Quantity = Aantal
+	Set DummyRequest.Server = $$$Server
+	Set DummyRequest.Technology = MachineTechnologie
+	Set DummyRequest.Box = DummyDoos
+	
+	Do DoosFactoryMock.VerwachtMethodCall("MaakDoos", ProductGroep, ReceptNaam).DanReturn(DummyDoos).ExactAantalKeer(1)
+	Do DoosAanvullerMock.VerwachtMethodCall("VulAanBasisInformatieDoos", DummyDoos, .Params, ProductGroep, Prioriteit, MachineTechnologie).DanDoeNiks().ExactAantalKeer(1)
+	Do OptimizerMock.VerwachtMethodCall("Optimize", DummyDoos, ProductGroep).DanReturn(DummyDoos).ExactAantalKeer(1)
+	Do SnijRequestMakerMock.VerwachtMethodCall("MaakSnijRequest", DummyDoos, MachineTechnologie, MachineID, Prioriteit, Aantal, BaseRef).DanReturn(DummyRequest).ExactAantalKeer(1)
+	Do SnijDoosServiceMock.VerwachtMethodCall("SnijDoos", DummyRequest).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductApiMock.VerwachtMethodCall("GeefProduct", PRNr).DanDoeNiks().ExactAantalKeer(1)
+	Do ProductApiMock.VerwachtMethodCall("IsTandemboxProduct", PRNr).DanReturn($$$False).ExactAantalKeer(1)
+	
+	Set DoosService = ##class(APPS.Verpakking.DoosService).%New(DoosFactoryMock, DoosAanvullerMock, OptimizerMock, SnijDoosServiceMock, SnijRequestMakerMock, ProductApiMock, ProductTypeApiMock)
+	Do DoosService.GeefDoos(ProductGroep, ReceptNaam, MachineID, Aantal, .Params, PRNr, Prioriteit, BaseRef, CallBack)
+	
+	Do DoosFactoryMock.Verifieer()
+	Do DoosAanvullerMock.Verifieer()
+	Do OptimizerMock.Verifieer()
+	Do SnijRequestMakerMock.Verifieer()
+	Do SnijDoosServiceMock.Verifieer()
+	Do ProductApiMock.Verifieer()
+	Do ProductTypeApiMock.Verifieer()
+}
+*/
+]]></Content>
+</UDLText>
 </Class>