Index: OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml
===================================================================
diff -u -r67854 -r67859
--- OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml (.../DocumentBuilder.cls.xml) (revision 67854)
+++ OBJTimpl/WMSOrder/GepicktePallet/DocumentBuilder.cls.xml (.../DocumentBuilder.cls.xml) (revision 67859)
@@ -53,30 +53,38 @@
Do Document.VoegLijnToe("\\\\ 2","\")
#dim InhoudIterator as TECH.ResultSetIterator = ..InhoudOphaler.GeefIterator(ConsolidatieNummer,LPN)
+ #dim PrevPRNR as %String = ""
+
While InhoudIterator.HasNext() {
#dim rs as %ResultSet = InhoudIterator.Next()
Do Document.GeefKolom(1).Insert(+rs.GetDataByName("QTYTARGET"))
Do Document.GeefKolom(2).Insert(+rs.GetDataByName("AANTAL"))
- #dim PrevPRNR as %String = ""
+
#dim identrs as %ResultSet = ..IdentLookupService.GeefAdminIdentNrs(rs.GetDataByName("IDENTNR"))
if identrs.HasNext() {
#dim rsi = identrs.Next()
#dim PRNr as %String = rsi.GetDataByName("Product")
Do Document.GeefKolom(3).Insert(rsi.GetDataByName("ItemID"))
Do Document.GeefKolom(4).Insert(rsi.GetDataByName("KortTekst"))
do Document.GeefKolom(5).Insert($$SORTKEY^PRODUKT(PRNr))
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(5).Insert($$SORTKEY^PRODUKT(PRNr) _ "1")
+ If $$$Not(PrevPRNR = PRNr) {
+ Do Document.GeefKolom(5).Insert($$SORTKEY^PRODUKT(PRNr) _ "1")
+ }
} else {
- Do Document.GeefKolom(3).Insert(rsi.GetDataByName("IDENTNR"))
+ Do Document.GeefKolom(3).Insert(rs.GetDataByName("IDENTNR"))
Do Document.GeefKolom(4).Insert("gn korttekst")
- Do Document.GeefKolom(5).Insert(rsi.GetDataByName("IDENTNR"))
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(5).Insert(rsi.GetDataByName("IDENTNR" _ "1"))
+ Do Document.GeefKolom(5).Insert(rs.GetDataByName("IDENTNR"))
+ If $$$Not(PrevPRNR = PRNr) {
+ Do Document.GeefKolom(5).Insert(rs.GetDataByName("IDENTNR" _ "1"))
+ }
}
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(1).Insert("")
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(2).Insert("")
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(3).Insert("")
- Do:($$$Not(PrevPRNR=PRNr)) Document.GeefKolom(4).Insert("")
+ if $$$Not(PrevPRNR = PRNr) {
+ Do Document.GeefKolom(1).Insert("")
+ Do Document.GeefKolom(2).Insert("")
+ Do Document.GeefKolom(3).Insert("")
+ Do Document.GeefKolom(4).Insert("")
+ }
Set PrevPRNR = PRNr
}
Index: OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml
===================================================================
diff -u -r67854 -r67859
--- OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml (.../Docs.cls.xml) (revision 67854)
+++ OBJTimpl/WMSOrder/GepicktePallet/Docs.cls.xml (.../Docs.cls.xml) (revision 67859)
@@ -23,19 +23,19 @@
d ##class(OBJTimpl.WMSOrder.GepicktePallet.Docs).%New().GepicktePalletInhoud("AAAAA","BBBBB")
-ConsolidatieNr:%String,LPN:%String
+ConsolidatieNr:%String,LPN:%String,Printer:%String=""
-LPN:%String
+LPN:%String,Printer:%String=""