Index: BL/PPS/OL/sub/pxLabel.cls.xml
===================================================================
diff -u -r1074 -r1699
--- BL/PPS/OL/sub/pxLabel.cls.xml (.../pxLabel.cls.xml) (revision 1074)
+++ BL/PPS/OL/sub/pxLabel.cls.xml (.../pxLabel.cls.xml) (revision 1699)
@@ -43,6 +43,14 @@
%String
+
+%String
+
+
+
+%String
+
+
%String
@@ -86,8 +94,19 @@
%Status
Index: BL/PPS/OL/Inpak.cls.xml
===================================================================
diff -u -r1695 -r1699
--- BL/PPS/OL/Inpak.cls.xml (.../Inpak.cls.xml) (revision 1695)
+++ BL/PPS/OL/Inpak.cls.xml (.../Inpak.cls.xml) (revision 1699)
@@ -43,11 +43,11 @@
Parameter LabelPrinter1 = "\\FOP\OL Verpak2 6x10";
Parameter LabelPrinter2 = "\\FOP\OL Verpak2 6x10";
Parameter LabelPrinter1 = "OrgaluxColor";
-\\OLTest\OrgaluxColor2
+\\Orgalux1\OrgaluxColor
-\\OLTest\OrgaluxColor2
+\\Orgalux2\OrgaluxColor
@@ -494,24 +494,25 @@
Set MasterSnijData = %blProdOptiBoxSnijden.GetMaster(SnijItemId)
kill arInfo
-
+
Do %blProdOptiBoxSnijden.GetInfo(MasterSnijData,.arInfo)
;d WLIP^vhDBG(..#DbgIP, "PV:GetInfo "_MasterSnijData)
- ;d WAIP^vhDBG(..#DbgIP, "arInfo",.arInfo)
+ ;d WAIP^vhDBG(..#DbgIP, "arInfo",.arInfo)
Set ProductList = %blProdOptiBoxSnijden.GetProductList(MasterSnijData)
// Alle producten in de productlijst van de px steken
- For i=1:1:$LL(ProductList) do
- . Set Prd = $LG(ProductList, i)
- . Set ProductInfo = ##class(BL.PPS.OL.pxInpakInfoProduct).%New()
- . Set ProductInfo.PRNr = $LG(Prd,1)
- . Set ProductInfo.KortTekst = $$$ProductGet(ProductInfo.PRNr,$$$KortTekst)
- . //Set ProductInfo.LangTekst = $$$ProductGet(ProductInfo.PRNr,$$$OmschrijvingN1)
- . Set ProductInfo.LangTekst = ##class(Prod.ProductTekst).GetOmschrijvingViaPRNr(ProductInfo.PRNr, "N", "
", 1)
- . Set ProductInfo.LangTekst=ProductInfo.LangTekst_"
"_"Onderdelen:"_"
"_..BouwStenenTekst(ProductInfo.PRNr,"
"," : ") ;""
- . Set ProductInfo.Image=..GetURL($LG(Prd,1))
- . Set ProductInfo.Aantal = $LG(Prd,2)
- . do pxInpakInfo.ProductInfo.Insert(ProductInfo)
+ For i=1:1:$LL(ProductList) {
+ Set Prd = $LG(ProductList, i)
+ Set ProductInfo = ##class(BL.PPS.OL.pxInpakInfoProduct).%New()
+ Set ProductInfo.PRNr = $LG(Prd,1)
+ Set ProductInfo.KortTekst = $$$ProductGet(ProductInfo.PRNr,$$$KortTekst)
+ //Set ProductInfo.LangTekst = $$$ProductGet(ProductInfo.PRNr,$$$OmschrijvingN1)
+ Set ProductInfo.LangTekst = ##class(Prod.ProductTekst).GetOmschrijvingViaPRNr(ProductInfo.PRNr, "N", "
", 1)
+ Set ProductInfo.LangTekst=ProductInfo.LangTekst_"
"_"Onderdelen:"_"
"_..BouwStenenTekst(ProductInfo.PRNr,"
"," : ") ;""
+ Set ProductInfo.Image=..GetURL($LG(Prd,1))
+ Set ProductInfo.Aantal = $LG(Prd,2)
+ do pxInpakInfo.ProductInfo.Insert(ProductInfo)
+ }
// Algemene info opvullen in de px
Set pxInpakInfo.KlantNaam = ..KlantNaam
Set pxInpakInfo.BONNr = ..BONNr
@@ -521,50 +522,41 @@
Set pxInpakInfo.AantalDozen = $LG(arInfo,$$$snAantalGevraagd)
Set ProductSnijData = ##class(DS.Prod.OptiBox.SnijData).%OpenId(SnijItemId)
- //write "Status:", ProductSnijData.Status, ", BoxImage:", ProductSnijData.BoxImage, ", StapelImage:", ProductSnijData.StapelImage, !
- //Set:$C(0)'[ProductSnijData.BoxImage pxInpakInfo.BoxImage=##class(Res.VertalingLink).GetRootDirPath("OptiBox","FLEX")_"\"_ProductSnijData.BoxImage
- //Set:$C(0)'[ProductSnijData.StapelImage pxInpakInfo.StapelImage=##class(Res.VertalingLink).GetRootDirPath("OptiBox","FLEX")_"\"_ProductSnijData.StapelImage
-
Set pxInpakInfo.BoxImage=%blProdOptiBoxSnijden.GetPathAndFile(ProductSnijData.BoxImage,"FLEX")
Set pxInpakInfo.StapelImage=%blProdOptiBoxSnijden.GetPathAndFile(ProductSnijData.StapelImage,"FLEX")
-
-
- If $zu(110)="CACHE02" Do
- . Set pxInpakInfo.BoxImage = "http://res.vanhoecke.be/OLProdCat/28132_L.399726.29980_OL.VLIV60GRVLAKVERD_1.JPG"
- . Set pxInpakInfo.StapelImage = "http://res.vanhoecke.be/OLProdCat/28132_L.399726.29980_default_01_06.JPG"
- .
- ;Do WLIP^vhDBG(..#DbgIP, "BoxImage:* "_pxInpakInfo.BoxImage)
- ;Do WLIP^vhDBG(..#DbgIP, "StapelImage:* "_pxInpakInfo.StapelImage)
- //Do WLIP^vhDBG(..#DbgIP, "ProductImage"_pxInpakInfo.ProductInfo.GetAt(1).Image)
-
+
+ If ##class(TECH.Config.ConfigMgr).Instance().GetOmgeving()["DEV" {
+ Set pxInpakInfo.BoxImage = "http://res.vanhoecke.be/OLProdCat/28132_L.399726.29980_OL.VLIV60GRVLAKVERD_1.JPG"
+ Set pxInpakInfo.StapelImage = "http://res.vanhoecke.be/OLProdCat/28132_L.399726.29980_default_01_06.JPG"
+ }
//Alle elementen uit arInfo in de px steken
-
+
// product is voorverpakt, tenzij er een item bij is waarvoor een doos moet gesneden worden
Set pxInpakInfo.VoorVerpakt = 1
- //Set Node = "arInfo("""")"
- //For set Node=$Query(@Node) q:Node="" do
- Set SnijID = ""
- For set SnijID=$Order(arInfo(SnijID)) quit:SnijID="" do
- . Set dtl = ##class(BL.PPS.OL.pxInpakInfoDtl).%New()
- . Set dtl.SnijID = SnijID
- . Set dtl.BoxUsage = $LI(arInfo(SnijID),$$$snLabel)
- . Set dtl.AantalGevraagd = $LI(arInfo(SnijID),$$$snAantalGevraagd)
- . Set dtl.AantalAf = $LI(arInfo(SnijID),$$$snProductAantal)
- . if $LI(arInfo(SnijID),$$$snHasSnijDef) do
- . . Set pxInpakInfo.VoorVerpakt = 0
- . . do pxInpakInfo.Detail.Insert(dtl)
-
- Set pxInpakInfo.AantalIdentiekeProducten = 1
- if (SequenceID > 0) do
- . Set pxInpakInfo.AbrevCurrent = $LG(..SequenceList.GetAt(SequenceID),$$$lbPosAbrev)
- . Set:SequenceID>1 pxInpakInfo.AbrevPrevious = $LG(..SequenceList.GetAt(SequenceID-1),$$$lbPosAbrev)
- . Set:SequenceID<..SequenceList.Count() pxInpakInfo.AbrevNext = $LG(..SequenceList.GetAt(SequenceID+1),$$$lbPosAbrev)
- . if (pxInpakInfo.AbrevCurrent'="") do
- . . Set pxInpakInfo.AantalIdentiekeProducten = 0
- . . For i=1:1:..SequenceList.Count() do
+ //Set Node = "arInfo("""")"
+ //For set Node=$Query(@Node) q:Node="" do
+ Set SnijID = ""
+ For set SnijID=$Order(arInfo(SnijID)) quit:SnijID="" do
+ . Set dtl = ##class(BL.PPS.OL.pxInpakInfoDtl).%New()
+ . Set dtl.SnijID = SnijID
+ . Set dtl.BoxUsage = $LI(arInfo(SnijID),$$$snLabel)
+ . Set dtl.AantalGevraagd = $LI(arInfo(SnijID),$$$snAantalGevraagd)
+ . Set dtl.AantalAf = $LI(arInfo(SnijID),$$$snProductAantal)
+ . if $LI(arInfo(SnijID),$$$snHasSnijDef) do
+ . . Set pxInpakInfo.VoorVerpakt = 0
+ . . do pxInpakInfo.Detail.Insert(dtl)
+
+ Set pxInpakInfo.AantalIdentiekeProducten = 1
+ if (SequenceID > 0) do
+ . Set pxInpakInfo.AbrevCurrent = $LG(..SequenceList.GetAt(SequenceID),$$$lbPosAbrev)
+ . Set:SequenceID>1 pxInpakInfo.AbrevPrevious = $LG(..SequenceList.GetAt(SequenceID-1),$$$lbPosAbrev)
+ . Set:SequenceID<..SequenceList.Count() pxInpakInfo.AbrevNext = $LG(..SequenceList.GetAt(SequenceID+1),$$$lbPosAbrev)
+ . if (pxInpakInfo.AbrevCurrent'="") do
+ . . Set pxInpakInfo.AantalIdentiekeProducten = 0
+ . . For i=1:1:..SequenceList.Count() do
. . . Set:($LG(..SequenceList.GetAt(i),$$$lbPosAbrev)=$LG(..SequenceList.GetAt(SequenceID),$$$lbPosAbrev)) pxInpakInfo.AantalIdentiekeProducten = pxInpakInfo.AantalIdentiekeProducten + 1
- Quit $$$pxStatusOK
+ Quit $$$pxStatusOK
]]>
@@ -807,7 +799,6 @@
BONNr,Aantal
Printen")
-
; Ophalen gegevens uit leveringsbon
Set pxLabel=##class(BL.PPS.OL.sub.pxLabel).Create()
Do ..LabelDataFromBon(BONNr,pxLabel)
@@ -924,10 +915,8 @@
// Added by WimV on 15/07/2011
If KLNr=$$$KlantSFS {
; Specifiek voor SFS, maar kan ook voor andere klanten gerbruikt worden
- Set OverrideEtiketKlantNaam=$P($G(^KUL(KLNr,FakSoort,BONNr,1)),"\",51)
- Set OverrideEtiketWoonplaats=$P($G(^KUL(KLNr,FakSoort,BONNr,1)),"\",52)
- Set:($L(OverrideEtiketKlantNaam)) pxLabel.KlantNaam=OverrideEtiketKlantNaam
- Set:($L(OverrideEtiketWoonplaats)) pxLabel.Gemeente=OverrideEtiketWoonplaats
+ set pxLabel.EindklantNaam = $P($G(^KUL(KLNr,FakSoort,BONNr,1)),"\",51)
+ set pxLabel.EindklantGemeente = $P($G(^KUL(KLNr,FakSoort,BONNr,1)),"\",52)
}
Set BLNr=99