Update 20260717
This commit is contained in:
+44
-11
@@ -20,6 +20,7 @@ using System.Linq.Expressions;
|
||||
using System.Net;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Runtime.InteropServices.ComTypes;
|
||||
using System.Runtime.Remoting.Messaging;
|
||||
using System.Security;
|
||||
using System.Security.Policy;
|
||||
@@ -439,10 +440,6 @@ namespace Versandstrasse
|
||||
using (StringReader reader = new StringReader(xml))
|
||||
{
|
||||
vscript = (versandscript)(serializer.Deserialize(reader));
|
||||
}
|
||||
foreach (vsdokument vsd in vscript.dokuments)
|
||||
{
|
||||
|
||||
}
|
||||
if (vscript.Split_Doc != "")
|
||||
{
|
||||
@@ -458,6 +455,7 @@ namespace Versandstrasse
|
||||
{
|
||||
vscript.dokuments[0].sourcedokument = dok.dokument;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -511,11 +509,8 @@ namespace Versandstrasse
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
loadedDocument.Save(outputStream);
|
||||
|
||||
|
||||
|
||||
byte[] bytes;
|
||||
bytes = outputStream.ToArray();
|
||||
vdok.pdfdokument = Convert.ToBase64String(bytes);
|
||||
@@ -549,6 +544,44 @@ namespace Versandstrasse
|
||||
finalDoc.Save(outputStream);
|
||||
|
||||
PdfLoadedDocument loadeddoc = new PdfLoadedDocument(outputStream);
|
||||
|
||||
|
||||
loadeddoc.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B);
|
||||
|
||||
loadeddoc.Save(outputStream);
|
||||
|
||||
|
||||
byte[] bytes;
|
||||
bytes = outputStream.ToArray();
|
||||
dok.dokument = Convert.ToBase64String(bytes);
|
||||
vscript.FinalDoc = Convert.ToBase64String(bytes);
|
||||
finalDoc.Close();
|
||||
finalDoc.Dispose();
|
||||
streams = null;
|
||||
vscript.FinalDoc = vscript.FinalDoc;
|
||||
outputStream = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
int i = 0;
|
||||
Stream[] streams = new Stream[vscript.dokuments.Count];
|
||||
|
||||
foreach (vsdokument vdoc in vscript.dokuments)
|
||||
{
|
||||
var stream = new MemoryStream(Convert.FromBase64String(vdoc.pdfdokument));
|
||||
streams[i] = stream;
|
||||
i++;
|
||||
|
||||
}
|
||||
PdfDocument finalDoc = new PdfDocument();
|
||||
|
||||
PdfDocumentBase.Merge(finalDoc, streams);
|
||||
MemoryStream outputStream = new MemoryStream();
|
||||
string filename = tempdir + Guid.NewGuid().ToString() + ".pdf";
|
||||
|
||||
finalDoc.Save(outputStream);
|
||||
|
||||
PdfLoadedDocument loadeddoc = new PdfLoadedDocument(outputStream);
|
||||
|
||||
|
||||
loadeddoc.ConvertToPDFA(PdfConformanceLevel.Pdf_A1B);
|
||||
@@ -565,10 +598,8 @@ namespace Versandstrasse
|
||||
streams = null;
|
||||
vscript.FinalDoc = vscript.FinalDoc;
|
||||
outputStream = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
vscript.FinalDoc = vscript.dokuments[0].pdfdokument.ToString();
|
||||
|
||||
// vscript.FinalDoc = vscript.dokuments[0].pdfdokument.ToString();
|
||||
}
|
||||
|
||||
writelog("Merge Ende");
|
||||
@@ -772,6 +803,7 @@ namespace Versandstrasse
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1049,6 +1081,7 @@ namespace Versandstrasse
|
||||
|
||||
public string Split_Doc { get; set; } = "";
|
||||
public string PartCopies { get; set; } = "";
|
||||
|
||||
|
||||
public string FinalDoc { get; set; } = "";
|
||||
public List<vsdokument> dokuments { get; set; } = new List<vsdokument>();
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -15,8 +15,6 @@ E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\obj\Debug\Versandstrasse.csproj.
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\obj\Debug\Versands.808873AD.Up2Date
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\obj\Debug\Versandstrasse.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\obj\Debug\Versandstrasse.pdb
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Database.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OnDocOffice.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\VBFileManagement.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Helper.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Logging.dll
|
||||
@@ -53,17 +51,19 @@ E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\NLog.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\NLog.Database.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.OfficeChart.Base.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\FastReport.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OfficePrinter.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\DOCGEN.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OfficePrinter.pdb
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Database.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OnDocOffice.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.XlsIO.Base.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.DocToPDFConverter.Base.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.ExcelToPDFConverter.Base.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OfficePrinter.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.Presentation.Base.dll
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\DOCGEN.pdb
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\DOCGEN.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\DOCGEN.dll.config
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Newtonsoft.Json.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.XlsIO.Base.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.DocToPDFConverter.Base.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.ExcelToPDFConverter.Base.xml
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\OfficePrinter.pdb
|
||||
E:\Software-Projekte\OnDoc\OnDoc\Versandstrasse\bin\Debug\Syncfusion.Presentation.Base.xml
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user