Index: WS/APPS/Verpakking/SnijDoosService.cls.xml
===================================================================
diff -u -r68229 -r68329
--- WS/APPS/Verpakking/SnijDoosService.cls.xml (.../SnijDoosService.cls.xml) (revision 68229)
+++ WS/APPS/Verpakking/SnijDoosService.cls.xml (.../SnijDoosService.cls.xml) (revision 68329)
@@ -4,21 +4,12 @@
1
%SOAP.WebClient
-
-
+
+This is the URL used to access the web service.
+http://docker01-acp:1880/ws/cut-request
+
-/// This is the namespace used by the Service
-Parameter NAMESPACE = "http://www.vanhoecke.be";
-
-/// Use xsi:type attribute for literal types.
-Parameter OUTPUTTYPEATTRIBUTE = 1;
-*/
-]]>
-
-
This is the name of the Service
@@ -32,7 +23,7 @@
1
document
literal
-
Index: APPS/Verpakking/V1LosseOnderdelen.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/V1LosseOnderdelen.cls.xml (.../V1LosseOnderdelen.cls.xml) (revision 68229)
+++ APPS/Verpakking/V1LosseOnderdelen.cls.xml (.../V1LosseOnderdelen.cls.xml) (revision 68329)
@@ -7,26 +7,60 @@
APPS.Verpakking.V1LosseOnderdelen
-
-
+%Integer
+214
+
+
-]]>
-
+
+%String
+"TBX DRAWER"
+
+
+
-
-
+%Decimal
+4.2
+
+
+
-]]>
-
+
+%Decimal
+0.8
+
+
+
-
-
+%Decimal
+1
+
+
+
-]]>
-
+
+%Decimal
+60
+
+
+
+
+
+%Decimal
+40
+
+
+
+
+
+%Decimal
+30
+
+
+
Index: APPS/Verpakking/V1Flatpack.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/V1Flatpack.cls.xml (revision 0)
+++ APPS/Verpakking/V1Flatpack.cls.xml (revision 68329)
@@ -0,0 +1,80 @@
+
+
+
+APPS.Verpakking.Doos
+
+
+APPS.Verpakking.V1Flatpack
+
+
+
+%Integer
+206
+
+
+
+
+%String
+"TAORBOX V1 FLATPACK"
+
+
+
+
+%Decimal
+1
+
+
+
+
+
+%String
+"TBX DRAWER"
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+206
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%Decimal
+75
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+
+
Index: APPS/Verpakking/DoosService.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 68229)
+++ APPS/Verpakking/DoosService.cls.xml (.../DoosService.cls.xml) (revision 68329)
@@ -13,6 +13,11 @@
1
+
+APPS.Verpakking.DoosAanvuller
+1
+
+
WS.APPS.Verpakking.SnijDoosService
1
@@ -32,20 +37,22 @@
]]>
-
+
@@ -85,11 +92,11 @@
#dim MachineTechnologie As APPS.Verpakking.enu.MachineTechnologie
If (MachineID = ##class(APPS.Verpakking.enu.MachineID).VH()) {
- Set MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec()
+ Set MachineTechnologie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.MachineTechnologie_VH")
} ElseIf (MachineID = ##class(APPS.Verpakking.enu.MachineID).HALUX()) {
- Set MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec()
+ Set MachineTechnologie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.MachineTechnologie_HALUX")
} ElseIf(MachineID = ##class(APPS.Verpakking.enu.MachineID).TAOR()) {
- Set MachineTechnologie = ##class(APPS.Verpakking.enu.MachineTechnologie).Panotec()
+ Set MachineTechnologie = ##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.Verpakking.MachineTechnologie_TAOR")
}
Quit MachineTechnologie
FishEye: Tag 68329 refers to a dead (removed) revision in file `APPS/Verpakking/V1HogeRug/Panotec.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?
FishEye: Tag 68329 refers to a dead (removed) revision in file `APPS/Verpakking/V1LageRug/Panotec.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: APPS/Verpakking/V1HogeRug.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/V1HogeRug.cls.xml (.../V1HogeRug.cls.xml) (revision 68229)
+++ APPS/Verpakking/V1HogeRug.cls.xml (.../V1HogeRug.cls.xml) (revision 68329)
@@ -7,32 +7,100 @@
APPS.Verpakking.V1HogeRug
-
+
%String
"TBX V1 HIGH BACK"
-
+
-
-
+%Integer
+201
+
+
-]]>
-
+
+%Decimal
+10
+
+
+
-
-
+%Decimal
+0.8
+
+
+
-]]>
-
+
+%Decimal
+100
+
+
+
-
-
+%Decimal
+100
+
+
+
-]]>
-
+
+%String
+"TBX DRAWER"
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+1
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+25
+
+
+
+
+
+%Decimal
+110
+
+
+
+
+
+%Decimal
+
+
+
+
+
+%Decimal
+30
+
+
+
Index: APPS/Verpakking/V1DoosMetDeksel.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/V1DoosMetDeksel.cls.xml (revision 0)
+++ APPS/Verpakking/V1DoosMetDeksel.cls.xml (revision 68329)
@@ -0,0 +1,74 @@
+
+
+
+APPS.Verpakking.Doos
+
+
+APPS.Verpakking.V1DoosMetDeksel
+
+
+
+%Integer
+202
+
+
+
+
+%Decimal
+10
+
+
+
+
+
+%Decimal
+0.8
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%String
+"TBX DRAWER"
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+1
+
+
+
+
+
+%Decimal
+110
+
+
+
+
+
+
+
Index: APPS/Verpakking/DoosAanvuller.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/DoosAanvuller.cls.xml (revision 0)
+++ APPS/Verpakking/DoosAanvuller.cls.xml (revision 68329)
@@ -0,0 +1,305 @@
+
+
+
+TECH.RegisteredObject
+
+
+
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+1
+
+
+
+
+
+
Index: APPS/Verpakking/Doos.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/Doos.cls.xml (.../Doos.cls.xml) (revision 68229)
+++ APPS/Verpakking/Doos.cls.xml (.../Doos.cls.xml) (revision 68329)
@@ -12,9 +12,9 @@
-
+
%Decimal
-
+
@@ -27,14 +27,10 @@
-
-%Integer
-
-
-
-
+
%String
-
+
+
@@ -45,14 +41,31 @@
-
-
+%String
+
+
-*/
-]]>
-
+
+%Integer
+
+
+
+
+%String
+
+
+
+
+%Decimal
+
+
+
+
+
+%Decimal
+
+
Index: APPS/Verpakking/ComplexeScheiding.cls.xml
===================================================================
diff -u
--- APPS/Verpakking/ComplexeScheiding.cls.xml (revision 0)
+++ APPS/Verpakking/ComplexeScheiding.cls.xml (revision 68329)
@@ -0,0 +1,122 @@
+
+
+
+APPS.Verpakking.Doos
+
+
+APPS.Verpakking.ComplexeScheiding
+
+
+
+%Integer
+218
+
+
+
+
+%String
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+0
+
+
+
+
+
+%Decimal
+1
+
+
+
+
+
+
+
Index: APPS/Verpakking/Optimizer.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/Optimizer.cls.xml (.../Optimizer.cls.xml) (revision 68229)
+++ APPS/Verpakking/Optimizer.cls.xml (.../Optimizer.cls.xml) (revision 68329)
@@ -3,119 +3,257 @@
TECH.RegisteredObject
-
-
+
+
+Machinekant = 2 x 25mm
+50
+
+
+
+%Decimal
+1
+
+
+
+%Decimal
+1
+
+
+
+APPS.Verpakking.Doos
+1
+
+
+
+BasisDoos:APPS.Verpakking.Doos,ProductGroep:%String
+
+
+
+
+1
+ BasisDoos.MinWidth) && (..InitieleBreedte > BasisDoos.MinDepth)) {
+ Set BasisDoos.Width = ..InitieleDiepte
+ Set BasisDoos.Depth = ..InitieleBreedte
+ }
+
+ Set BasisDoos.Swap = 0
]]>
-
-1
-Dikte,LogoPrint,PlanoBreedte
+
+
+1
=:PlanoBreedte order by Breedte asc)
+ #dim BreedtePlanoVoorSwap As %Decimal = BasisDoos.Width + BasisDoos.Height + BasisDoos.Width + BasisDoos.Height + BasisDoos.K
+ #dim DieptePlaneVoorSwap As %Decimal = (2 * BasisDoos.Height) + BasisDoos.Depth + (2 * BasisDoos.Height)
+
+ #dim BreedtePlanoNaSwap As %Decimal = BasisDoos.Depth + BasisDoos.Height + BasisDoos.Depth + BasisDoos.Height + BasisDoos.K
+ #dim DieptePlaneNaSwap As %Decimal = (2 * BasisDoos.Height) + BasisDoos.Width + (2 * BasisDoos.Height)
+
+ #dim NodigeKartonBreedteVoorSwap = ..GetCardboardProductBreedte(BasisDoos.Thickness, BasisDoos.LogoPrint, BreedtePlanoVoorSwap)
+ #dim NodigeKartonBreedteNaSwap = ..GetCardboardProductBreedte(BasisDoos.Thickness, BasisDoos.LogoPrint, BreedtePlanoNaSwap)
+
+ #dim OppervlakteKartonOmVerpakkingUitTeSnijdenVoorSwap As %Decimal = DieptePlaneVoorSwap * NodigeKartonBreedteVoorSwap
+ #dim OppervlakteKartonOmVerpakkingUitTeSnijdenNaSwap As %Decimal = DieptePlaneNaSwap * NodigeKartonBreedteNaSwap
+
+ If ((OppervlakteKartonOmVerpakkingUitTeSnijdenNaSwap < OppervlakteKartonOmVerpakkingUitTeSnijdenVoorSwap) && (..InitieleDiepte > BasisDoos.MinWidth) && (..InitieleBreedte > BasisDoos.MinDepth)) {
+ Set BasisDoos.Width = ..InitieleDiepte
+ Set BasisDoos.Depth = ..InitieleBreedte
+ }
+
+ Set BasisDoos.Swap = 0
+]]>
+
- &sql(OPEN GetProduct)
- &sql(FETCH GetProduct)
- &sql(CLOSE GetProduct)
- Quit CardBoardID
+
+
+1
+
-
-
+
+
1
+
+
+
+
+
+1
+
+
+
+
+
+1
219
+ 2
+ 209
+ 2
+
+
+
+ } Else {
+ /*
+ 219
+ 1
+ 209
+ 1
+
+
}
- Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
- Set Param.Key = "Q"
- Set Param.Value = 1
- Do BasisDoos.Params.Insert(Param)
+ #dim BreedtePlanoVoorSwap As %Decimal = BasisDoos.K1 + BasisDoos.Depth + BasisDoos.Width + BasisDoos.Depth + BasisDoos.K1
+ #dim DieptePlaneVoorSwap As %Decimal = BasisDoos.K2 + BasisDoos.Depth - BasisDoos.T + BasisDoos.Height + BasisDoos.T + (2 * BasisDoos.Height) + BasisDoos.Depth + BasisDoos.Height
- If (ProductGroep = "TBX") {
- Set BasisDoos.Depth = Params("LODIEPTE")
- Set BasisDoos.Height = Params("LOHOOGTE")
- Set BasisDoos.Width = Params("LOBREEDTE")
-
- Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
- Set Param.Key = "T"
- Set Param.Value = Params("LOCP")
- } ElseIf (ProductGroep = "TAORBOX") {
- Set BasisDoos.Depth = Params("DIEPTE")
- Set BasisDoos.Height = Params("ZIJHOOGTE")
- Set BasisDoos.Width = Params("BREEDTE")
+ #dim BreedtePlanoNaSwap As %Decimal = BasisDoos.K2 + BasisDoos.Width - BasisDoos.T + BasisDoos.Height + BasisDoos.T + (2 * BasisDoos.Height) + BasisDoos.Width + BasisDoos.Height
+ #dim DieptePlaneNaSwap As %Decimal = BasisDoos.K1 + BasisDoos.Width + BasisDoos.Depth + BasisDoos.Width + BasisDoos.K1
- Set Param = ##class(APPS.Verpakking.Doos.Param).%New()
- Set Param.Key = "T"
- Set Param.Value = Params("BREEDTECP")
+ #dim NodigeKartonBreedteVoorSwap = ..GetCardboardProductBreedte(BasisDoos.Thickness, BasisDoos.LogoPrint, BreedtePlanoVoorSwap)
+ #dim NodigeKartonBreedteNaSwap = ..GetCardboardProductBreedte(BasisDoos.Thickness, BasisDoos.LogoPrint, BreedtePlanoNaSwap)
+
+ #dim OppervlakteKartonOmVerpakkingUitTeSnijdenVoorSwap As %Decimal = DieptePlaneVoorSwap * NodigeKartonBreedteVoorSwap
+ #dim OppervlakteKartonOmVerpakkingUitTeSnijdenNaSwap As %Decimal = DieptePlaneNaSwap * NodigeKartonBreedteNaSwap
+
+ If ((OppervlakteKartonOmVerpakkingUitTeSnijdenNaSwap < OppervlakteKartonOmVerpakkingUitTeSnijdenVoorSwap)) {
+ Set BasisDoos.Width = ..InitieleDiepte
+ Set BasisDoos.Depth = ..InitieleBreedte
}
- Do BasisDoos.Params.Insert(Param)
+ Set BasisDoos.Swap = 0
+
+ */
]]>
-
-
+
+
1
-
-
+
+1
+Dikte:%Decimal,LogoPrint:%String,PlanoBreedte:%Decimal
1
+%String
=:PlanoBreedte order by Breedte asc)
+
+ &sql(OPEN GetProduct)
+ &sql(FETCH GetProduct)
+ &sql(CLOSE GetProduct)
+
+ Quit CardBoardID
]]>
+
+
+1
+Dikte:%Decimal,LogoPrint:%String,PlanoBreedte:%Decimal
+1
+%Decimal
+=:PlanoBreedte order by Breedte asc)
+
+ &sql(OPEN GetProductWidth)
+ &sql(FETCH GetProductWidth)
+ &sql(CLOSE GetProductWidth)
+
+ Quit Breedte
+]]>
+
Index: APPS/Verpakking/V1LageRug.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/V1LageRug.cls.xml (.../V1LageRug.cls.xml) (revision 68229)
+++ APPS/Verpakking/V1LageRug.cls.xml (.../V1LageRug.cls.xml) (revision 68329)
@@ -7,16 +7,72 @@
APPS.Verpakking.V1LageRug
-
+
%String
"TBX V1 LOW BACK"
-
+
+
+%Integer
+202
+
+
+
+
+%Decimal
+10
+
+
+
+
+
+%Decimal
+0.8
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%Decimal
+100
+
+
+
+
+
+%String
+"TBX DRAWER"
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+1
+
+
+
+
%Decimal
110
-
+
+
Index: APPS/Verpakking/VouwErrondDoos.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/VouwErrondDoos.cls.xml (.../VouwErrondDoos.cls.xml) (revision 68229)
+++ APPS/Verpakking/VouwErrondDoos.cls.xml (.../VouwErrondDoos.cls.xml) (revision 68329)
@@ -7,16 +7,59 @@
APPS.Verpakking.VouwErrondDoos
+
+%Integer
+219
+
+
+
+
+%Decimal
+10
+
+
+
+
+
+%Decimal
+4.2
+
+
+
+
+
+%Decimal
+1
+
+
+
+
+
+%Decimal
+209
+
+
+
+
+
+%Decimal
+1
+
+
+
+
%Decimal
-"0"
-1
-
+60
+
+
%Decimal
-
+100
+
+
FishEye: Tag 68329 refers to a dead (removed) revision in file `APPS/Verpakking/V1LosseOnderdelen/Panotec.cls.xml'.
FishEye: No comparison available. Pass `N' to diff?
Index: APPS/Verpakking/DoosFactory.cls.xml
===================================================================
diff -u -r68229 -r68329
--- APPS/Verpakking/DoosFactory.cls.xml (.../DoosFactory.cls.xml) (revision 68229)
+++ APPS/Verpakking/DoosFactory.cls.xml (.../DoosFactory.cls.xml) (revision 68329)
@@ -3,63 +3,45 @@
TECH.RegisteredObject
-
-ProductGroep:%String,ReceptNaam:%String,Technologie:APPS.Verpakking.enu.MachineTechnologie
+
+ProductGroep:%String,ReceptNaam:%String
APPS.Verpakking.Doos