Index: WS/Transsmart/tns/GetDocsResponsePackageLabel.cls.xml
===================================================================
diff -u -r59489 -r74443
--- WS/Transsmart/tns/GetDocsResponsePackageLabel.cls.xml (.../GetDocsResponsePackageLabel.cls.xml) (revision 59489)
+++ WS/Transsmart/tns/GetDocsResponsePackageLabel.cls.xml (.../GetDocsResponsePackageLabel.cls.xml) (revision 74443)
@@ -84,8 +84,15 @@
+
+
+
+
-%xsd.base64Binary
+%GlobalCharacterStream
Index: APPS/common/Print/impl/ZPLPrinter.cls.xml
===================================================================
diff -u -r59695 -r74443
--- APPS/common/Print/impl/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 59695)
+++ APPS/common/Print/impl/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 74443)
@@ -38,7 +38,8 @@
set LabelIterator = ##class(TECH.ListIterator).%New(..ZPLLabels)
While LabelIterator.HasNext() {
Set ZPLLabel = LabelIterator.Next()
- Do ..PrintZPLLabel(ZPLLabel)
+ ;Do ..PrintZPLLabel(ZPLLabel)
+ Do ..PrintZPLLabelFromBase64EncodedStream(ZPLLabel)
}
]]>
@@ -60,6 +61,31 @@
]]>
+
+ZPLLabelStream:%GlobalCharacterStream
+0){
+ w $system.Encryption.Base64Decode(Chunk)
+ Set Chunk = ZPLLabelStream.Read(.ChunkLength, .ReturnCode)
+ }
+ Close ..DeviceString
+ } catch {
+ Close ..DeviceString
+ #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+ Do ##class(TECH.ExceptionHandler).LogEnRethrow(Exception)
+ }
+]]>
+
+
Index: APPS/common/Print/ZPLPrinter.cls.xml
===================================================================
diff -u -r59691 -r74443
--- APPS/common/Print/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 59691)
+++ APPS/common/Print/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 74443)
@@ -20,6 +20,11 @@
ZPLLabel:%String
+
+1
+ZPLLabelStream:%GlobalCharacterStream
+
+
1
Index: APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r73780 -r74443
--- APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml (.../CommunicatieService.cls.xml) (revision 73780)
+++ APPS/TRANSP/Transsmart/impl/CommunicatieService.cls.xml (.../CommunicatieService.cls.xml) (revision 74443)
@@ -71,7 +71,9 @@
// Do ..UitgesteldeZendingLijst.Rapport(RitID)
Do ..ControleerRitVoorBevestiging(RitID)
If (Rit.GeefTransporteur() = Transporteur.Schenker) {
- Do ..ManifesteerTransporteur("SNB","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3),Rit.GeefID())
+ If ($$$Not(..ProjectSettingsAPI.IsTranssmartESchenkerConnectieActief())){ ;alleen voor SNB, ESC is een directe verbinding, dus geen manifest
+ Do ..ManifesteerTransporteur("SNB","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3),Rit.GeefID())
+ }
}
If (Rit.GeefTransporteur() = Transporteur.Dachser) {
Do ..ManifesteerTransporteur("DAC","",##class(TECH.DateTime).BerekenWerkdag($h,-2),##class(TECH.DateTime).BerekenWerkdag($h,3),Rit.GeefID())
Index: vhTest/Mock/APPS/common/Print/ZPLPrinter.cls.xml
===================================================================
diff -u -r59691 -r74443
--- vhTest/Mock/APPS/common/Print/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 59691)
+++ vhTest/Mock/APPS/common/Print/ZPLPrinter.cls.xml (.../ZPLPrinter.cls.xml) (revision 74443)
@@ -25,6 +25,12 @@
]]>
+
+ZPLLabelStream:%GlobalCharacterStream
+
+
+