diff --git a/API_NetFramework/Controllers/DocumentController.cs b/API_NetFramework/Controllers/DocumentController.cs index dda4ca52..70caeaaf 100644 --- a/API_NetFramework/Controllers/DocumentController.cs +++ b/API_NetFramework/Controllers/DocumentController.cs @@ -249,29 +249,31 @@ namespace API_NetFramework.Controllers dokdata.As_Faksimile = "True"; dokdata.sign = true; docgendata.digitaleunterschrift = true; if (dokdata.Unterschrift_Links != "-1") { dokdata.approval1 = 1; } if (dokdata.Unterschrift_Rechts != "-1") { dokdata.approval2 = 1; } - if (dokdata.Unterschrift_Links != "-1" && dokdata.Unterschrift_Rechts == "-1") - { - if (dokdata.Ersteller == dokdata.Unterschrift_Links) - { - dokdata.approved = 1; - } - else - { - dokdata.sign = false; - dokdata.toapprove = 1; - dokdata.approved = 0; - dokdata.approval1 = 0; - dokdata.approval2 = 1; - docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; - } - - } - else - { - docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; - dokdata.toapprove = 1; - dokdata.sign = true; - } + dokdata.approved = 1; + docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; + //if (dokdata.Unterschrift_Links != "-1" && dokdata.Unterschrift_Rechts != "-1") + //{ + // if (dokdata.Ersteller == dokdata.Unterschrift_Links) + // { + // dokdata.approved = 1; + // } + // else + // { + // dokdata.sign = false; + // dokdata.toapprove = 0; + // dokdata.approved = 1; + // dokdata.approval1 = 1; + // dokdata.approval2 = 1; + // docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; + // } + + //} + //else + //{ + // docgendata.erstellungsart = Erstellungsart.DokumentBearbeiten; + // dokdata.toapprove = 1; + // dokdata.sign = true; + //} } @@ -380,7 +382,20 @@ namespace API_NetFramework.Controllers { APIDokumentResult aPIDokumentResult = new APIDokumentResult(); aPIDokumentResult.dokumentid = dokumennt.DokumentID; - aPIDokumentResult.dokument = vs1.Prepare_PDF(dokumennt.DokumentID.ToString(), "", connectionstring, OwnHost, key.ToString(), imagepath); + + if (paket.Result_FileType != "PDF") + { + DOCGEN.DocGet gd = new DocGet(connectionstring); + clsdok dok = new clsdok("", "", "", ""); + dok = gd.GetDoc(dokumennt.DokumentID); + aPIDokumentResult.dokument = dok.dokument; + dok = null; + gd = null; + } + else + { + aPIDokumentResult.dokument = vs1.Prepare_PDF(dokumennt.DokumentID.ToString(), "", connectionstring, OwnHost, key.ToString(), imagepath); + } Dokumente.Add(aPIDokumentResult); } @@ -482,6 +497,8 @@ namespace API_NetFramework.Controllers if (!(ParamCheck("yesno", dokument.FaksimileUnterschrift))) { return "Parameter Faxsimile " + dokument.FaksimileUnterschrift + " ist ungültig"; } if (!(ParamCheck("yesno", dokument.OhneUnterschrift))) { return "Parameter Form ohne Unterschrift " + dokument.OhneUnterschrift + " ist ungültig"; } if (!(ParamCheck("yesno", dokument.PrintLogo))) { return "Parameter PrintLogo " + dokument.PrintLogo + " ist ungültig"; } + if (!(ParamCheck("yesno", dokument.UnterschriftLinksGeprueft))) { return "Parameter UnterschriftLinksGeprueft" + dokument.UnterschriftLinksGeprueft + " ist ungültig"; } + if (!(ParamCheck("yesno", dokument.UnterschriftRechtsGeprueft))) { return "Parameter UnterschriftRechtsGeprueft" + dokument.UnterschriftRechtsGeprueft + " ist ungültig"; } if (dokument.TGNrUnterschriftLinks.ToString() == "") { dokument.TGNrUnterschriftLinks = "-1"; } if (dokument.TGNrUnterschriftRechts.ToString() == "") { dokument.TGNrUnterschriftRechts = "-1"; } if (dokument.FaksimileUnterschrift.ToUpper() == "YES") @@ -500,6 +517,14 @@ namespace API_NetFramework.Controllers } if (paket.Versandstrasse == "Yes") { + if (dokument.TGNrUnterschriftLinks!="" && dokument.UnterschriftLinksGeprueft != "Yes") + { + return "Versandstrasse mit ungeprüfter, linker Unterschrift ist nicht möglich"; + } + if (dokument.TGNrUnterschriftRechts != "" && dokument.UnterschriftRechtsGeprueft != "Yes") + { + return "Versandstrasse mit ungeprüfter, rechter Unterschrift ist nicht möglich"; + } if (ParamCheck("doktypversandstrasse", dokument.VorlagenTypID) == false) { return "Vorlagentyp " + dokument.VorlagenTypID + " ist nicht für die Versandstrasse konfiguriert"; } if (i == 1) { diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 74d2710e..9adaf725 100644 Binary files a/API_NetFramework/bin/Model.dll and b/API_NetFramework/bin/Model.dll differ diff --git a/API_NetFramework/bin/Model.pdb b/API_NetFramework/bin/Model.pdb index 1f761158..715538ef 100644 Binary files a/API_NetFramework/bin/Model.pdb and b/API_NetFramework/bin/Model.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index 294ff145..6a1c9db1 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.dll and b/API_NetFramework/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 7f84be44..440746c2 100644 Binary files a/API_NetFramework/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/log.txt b/API_NetFramework/log.txt index 06a4b125..0473770a 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -31521,3 +31521,349 @@ Die Anweisung wurde beendet. 2025-09-19 16:03:58.4972|DEBUG|OnDoc| 2025-09-20 07:13:15.1591|DEBUG|OnDoc| 2025-09-20 07:13:15.1973|DEBUG|OnDoc| +2025-09-22 13:18:41.0132|DEBUG|OnDoc| +2025-09-22 13:18:41.0834|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc|Start GenDoc +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5838|DEBUG|OnDoc| +2025-09-22 13:19:53.5988|DEBUG|OnDoc| +2025-09-22 13:19:53.5988|DEBUG|OnDoc| +2025-09-22 13:19:53.5988|DEBUG|OnDoc| +2025-09-22 13:19:53.5988|DEBUG|OnDoc| +2025-09-22 13:20:08.4402|DEBUG|OnDoc|Start GenDoc +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4497|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4580|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.4740|DEBUG|OnDoc| +2025-09-22 13:20:08.5136|DEBUG|OnDoc| +2025-09-22 13:20:08.5136|DEBUG|OnDoc| +2025-09-22 13:20:08.5342|DEBUG|OnDoc| +2025-09-22 13:20:08.5352|DEBUG|OnDoc| +2025-09-22 13:20:08.5352|DEBUG|OnDoc| +2025-09-22 13:20:08.5352|DEBUG|OnDoc| +2025-09-22 13:20:08.5510|DEBUG|OnDoc|Generate_Doc_EDOKA +2025-09-22 13:20:08.5510|DEBUG|OnDoc| +2025-09-22 13:20:08.5510|DEBUG|OnDoc| +2025-09-22 13:20:08.5510|DEBUG|OnDoc| +2025-09-22 13:20:08.5510|DEBUG|OnDoc| +2025-09-22 13:20:08.5668|DEBUG|OnDoc| +2025-09-22 13:20:08.5668|DEBUG|OnDoc| +2025-09-22 13:20:08.5668|DEBUG|OnDoc| +2025-09-22 13:20:08.5668|DEBUG|OnDoc| +2025-09-22 13:20:08.5668|DEBUG|OnDoc|Generate_Word +2025-09-22 13:20:09.1625|DEBUG|OnDoc|Word2013 +2025-09-22 13:20:09.1625|DEBUG|OnDoc|Word2013 +2025-09-22 13:20:20.7548|DEBUG|OnDoc| +2025-09-22 13:20:20.7898|DEBUG|OnDoc| +2025-09-22 13:20:20.8184|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 13:20:20.8184|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 13:20:20.8910|DEBUG|OnDoc| +2025-09-22 13:20:20.8950|DEBUG|OnDoc| +2025-09-22 13:20:20.9207|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-09-22 13:20:20.9207|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-09-22 13:20:21.4534|DEBUG|OnDoc|Generate_Word +2025-09-22 13:20:31.7768|DEBUG|OnDoc|Start GenDoc +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8120|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8164|DEBUG|OnDoc| +2025-09-22 13:20:31.8399|DEBUG|OnDoc| +2025-09-22 13:20:31.8399|DEBUG|OnDoc| +2025-09-22 13:20:31.8486|DEBUG|OnDoc| +2025-09-22 13:20:31.8486|DEBUG|OnDoc| +2025-09-22 13:20:31.8486|DEBUG|OnDoc| +2025-09-22 13:20:31.8486|DEBUG|OnDoc| +2025-09-22 13:20:31.8486|DEBUG|OnDoc|Generate_Doc_EDOKA +2025-09-22 13:20:31.8486|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc| +2025-09-22 13:20:31.8675|DEBUG|OnDoc|Generate_Word +2025-09-22 13:20:31.9008|DEBUG|OnDoc|Word2013 +2025-09-22 13:20:31.9008|DEBUG|OnDoc|Word2013 +2025-09-22 13:20:37.6949|DEBUG|OnDoc| +2025-09-22 13:20:37.7312|DEBUG|OnDoc| +2025-09-22 13:20:37.7584|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 13:20:37.7584|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 13:20:37.8034|DEBUG|OnDoc| +2025-09-22 13:20:37.8034|DEBUG|OnDoc| +2025-09-22 13:20:37.8332|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-09-22 13:20:37.8332|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-09-22 13:20:37.9979|DEBUG|OnDoc|Generate_Word +2025-09-22 14:10:11.0103|DEBUG|OnDoc| +2025-09-22 14:10:11.0657|DEBUG|OnDoc| +2025-09-22 14:10:11.2962|DEBUG|OnDoc|Start GenDoc +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3068|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3210|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3325|DEBUG|OnDoc| +2025-09-22 14:10:11.3673|DEBUG|OnDoc| +2025-09-22 14:10:11.3673|DEBUG|OnDoc| +2025-09-22 14:10:11.3886|DEBUG|OnDoc| +2025-09-22 14:10:11.3886|DEBUG|OnDoc| +2025-09-22 14:10:11.3886|DEBUG|OnDoc| +2025-09-22 14:10:11.3886|DEBUG|OnDoc| +2025-09-22 14:10:11.4044|DEBUG|OnDoc|Generate_Doc_EDOKA +2025-09-22 14:10:11.4044|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4146|DEBUG|OnDoc| +2025-09-22 14:10:11.4286|DEBUG|OnDoc| +2025-09-22 14:10:11.4286|DEBUG|OnDoc|Generate_Word +2025-09-22 14:10:11.8750|DEBUG|OnDoc|Word2013 +2025-09-22 14:10:11.8850|DEBUG|OnDoc|Word2013 +2025-09-22 14:10:12.1192|DEBUG|OnDoc| +2025-09-22 14:10:12.1192|DEBUG|OnDoc| +2025-09-22 14:10:12.1544|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 14:10:12.1544|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 14:10:12.2257|DEBUG|OnDoc| +2025-09-22 14:10:12.2257|DEBUG|OnDoc| +2025-09-22 14:10:12.2629|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-09-22 14:10:12.2629|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-09-22 14:10:12.7863|DEBUG|OnDoc|Generate_Word +2025-09-22 14:11:12.4303|DEBUG|OnDoc|Start GenDoc +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4654|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:11:12.4736|DEBUG|OnDoc| +2025-09-22 14:12:29.4300|DEBUG|OnDoc| +2025-09-22 14:12:29.4300|DEBUG|OnDoc| +2025-09-22 14:12:29.4498|DEBUG|OnDoc| +2025-09-22 14:12:29.4498|DEBUG|OnDoc| +2025-09-22 14:12:29.4498|DEBUG|OnDoc| +2025-09-22 14:12:29.4498|DEBUG|OnDoc| +2025-09-22 14:12:29.4689|DEBUG|OnDoc|Generate_Doc_EDOKA +2025-09-22 14:12:29.4689|DEBUG|OnDoc| +2025-09-22 14:12:29.4804|DEBUG|OnDoc| +2025-09-22 14:12:29.4804|DEBUG|OnDoc| +2025-09-22 14:12:29.4804|DEBUG|OnDoc| +2025-09-22 14:12:29.4804|DEBUG|OnDoc| +2025-09-22 14:12:29.4920|DEBUG|OnDoc| +2025-09-22 14:12:29.4920|DEBUG|OnDoc| +2025-09-22 14:12:29.4920|DEBUG|OnDoc| +2025-09-22 14:12:29.4920|DEBUG|OnDoc|Generate_Word +2025-09-22 14:12:29.5129|DEBUG|OnDoc|Word2013 +2025-09-22 14:12:29.5129|DEBUG|OnDoc|Word2013 +2025-09-22 14:12:29.6723|DEBUG|OnDoc| +2025-09-22 14:12:29.6818|DEBUG|OnDoc| +2025-09-22 14:12:29.7176|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 14:12:29.7176|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 14:12:29.7714|DEBUG|OnDoc| +2025-09-22 14:12:29.7714|DEBUG|OnDoc| +2025-09-22 14:12:29.8081|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-09-22 14:12:29.8081|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-09-22 14:12:30.0060|DEBUG|OnDoc|Generate_Word +2025-09-22 14:12:52.4947|DEBUG|OnDoc| +2025-09-22 14:12:52.5047|DEBUG|OnDoc| +2025-09-22 14:12:52.5380|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 14:12:52.5380|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 14:12:52.5959|DEBUG|OnDoc| +2025-09-22 14:12:52.5981|DEBUG|OnDoc| +2025-09-22 14:12:52.6289|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-09-22 14:54:51.6337|DEBUG|OnDoc|Start GenDoc +2025-09-22 14:54:51.6713|DEBUG|OnDoc| +2025-09-22 14:54:51.6713|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6759|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:54:51.6915|DEBUG|OnDoc| +2025-09-22 14:55:02.5676|DEBUG|OnDoc| +2025-09-22 14:55:02.5676|DEBUG|OnDoc| +2025-09-22 14:55:02.5676|DEBUG|OnDoc| +2025-09-22 14:55:02.5676|DEBUG|OnDoc| +2025-09-22 14:55:02.5676|DEBUG|OnDoc| +2025-09-22 14:55:02.5821|DEBUG|OnDoc| +2025-09-22 14:55:02.5992|DEBUG|OnDoc|Generate_Doc_EDOKA +2025-09-22 14:55:02.5992|DEBUG|OnDoc| +2025-09-22 14:55:02.5992|DEBUG|OnDoc| +2025-09-22 14:55:02.5992|DEBUG|OnDoc| +2025-09-22 14:55:02.5992|DEBUG|OnDoc| +2025-09-22 14:55:02.5992|DEBUG|OnDoc| +2025-09-22 14:55:02.6143|DEBUG|OnDoc| +2025-09-22 14:55:02.6143|DEBUG|OnDoc| +2025-09-22 14:55:02.6143|DEBUG|OnDoc| +2025-09-22 14:55:02.6143|DEBUG|OnDoc|Generate_Word +2025-09-22 14:55:02.6143|DEBUG|OnDoc|Word2013 +2025-09-22 14:55:02.6143|DEBUG|OnDoc|Word2013 +2025-09-22 14:55:02.8317|DEBUG|OnDoc| +2025-09-22 14:55:02.8517|DEBUG|OnDoc| +2025-09-22 14:55:02.8956|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-09-22 14:55:02.8956|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-09-22 14:55:02.9571|DEBUG|OnDoc| +2025-09-22 14:55:02.9571|DEBUG|OnDoc| +2025-09-22 14:55:03.0037|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG0494 +2025-09-22 14:55:03.0067|INFO|OnDoc|Unterschrift-Bezug: TG0494 +2025-09-22 14:55:03.2066|DEBUG|OnDoc|Generate_Word diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index 070ff4ee..ba8618c8 100644 Binary files a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache and b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll index 294ff145..6a1c9db1 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb index 7f84be44..440746c2 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/BarcodeLib/bin/Debug/Model.dll and b/BarcodeLib/bin/Debug/Model.dll differ diff --git a/BarcodeLib/bin/Debug/Model.pdb b/BarcodeLib/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/BarcodeLib/bin/Debug/Model.pdb and b/BarcodeLib/bin/Debug/Model.pdb differ diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 92955356..0ca7b5be 100644 Binary files a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache and b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache differ diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 13296179..ab76148b 100644 --- a/Client/Diverses/SplashScreen.Designer.cs +++ b/Client/Diverses/SplashScreen.Designer.cs @@ -64,7 +64,7 @@ this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(209, 26); this.label2.TabIndex = 2; - this.label2.Text = "21. September 2025"; + this.label2.Text = "25. September 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index ef61f7a0..30884352 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -1304,7 +1304,7 @@ this.lblAttachment.Name = "lblAttachment"; this.lblAttachment.Size = new System.Drawing.Size(446, 17); this.lblAttachment.TabIndex = 2; - this.lblAttachment.Text = "Hinweis: Externe Dateien werden nicht ins Onbase archiviert"; + this.lblAttachment.Text = "Hinweis: Externe Dateien werden nicht ins OnBase archiviert"; this.lblAttachment.Visible = false; // // richTextBox1 diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/Client/bin/Debug/Model.dll and b/Client/bin/Debug/Model.dll differ diff --git a/Client/bin/Debug/Model.pdb b/Client/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/Client/bin/Debug/Model.pdb and b/Client/bin/Debug/Model.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index f5bc70ef..c2f6fd0b 100644 Binary files a/Client/bin/Debug/OnDoc.exe and b/Client/bin/Debug/OnDoc.exe differ diff --git a/Client/bin/Debug/OnDoc.pdb b/Client/bin/Debug/OnDoc.pdb index 0f9b363b..fac54055 100644 Binary files a/Client/bin/Debug/OnDoc.pdb and b/Client/bin/Debug/OnDoc.pdb differ diff --git a/Client/bin/Debug/OnDocClient.zip b/Client/bin/Debug/OnDocClient.zip index 81ac9248..03a5bc69 100644 Binary files a/Client/bin/Debug/OnDocClient.zip and b/Client/bin/Debug/OnDocClient.zip differ diff --git a/Client/bin/Debug/de-DE/OnDoc.resources.dll b/Client/bin/Debug/de-DE/OnDoc.resources.dll index 42d4afac..53480b0a 100644 Binary files a/Client/bin/Debug/de-DE/OnDoc.resources.dll and b/Client/bin/Debug/de-DE/OnDoc.resources.dll differ diff --git a/Client/obj/Debug/Client.csproj.AssemblyReference.cache b/Client/obj/Debug/Client.csproj.AssemblyReference.cache index 477b1f72..00ae2bf7 100644 Binary files a/Client/obj/Debug/Client.csproj.AssemblyReference.cache and b/Client/obj/Debug/Client.csproj.AssemblyReference.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index f5bc70ef..c2f6fd0b 100644 Binary files a/Client/obj/Debug/OnDoc.exe and b/Client/obj/Debug/OnDoc.exe differ diff --git a/Client/obj/Debug/OnDoc.pdb b/Client/obj/Debug/OnDoc.pdb index 0f9b363b..fac54055 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 42d4afac..53480b0a 100644 Binary files a/Client/obj/Debug/de-DE/OnDoc.resources.dll and b/Client/obj/Debug/de-DE/OnDoc.resources.dll differ diff --git a/DOCGEN/bin/Debug/Model.dll b/DOCGEN/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/DOCGEN/bin/Debug/Model.dll and b/DOCGEN/bin/Debug/Model.dll differ diff --git a/DOCGEN/bin/Debug/Model.pdb b/DOCGEN/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/DOCGEN/bin/Debug/Model.pdb and b/DOCGEN/bin/Debug/Model.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index 21c0e622..609368db 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Database/bin/Debug/Model.dll b/Database/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/Database/bin/Debug/Model.dll and b/Database/bin/Debug/Model.dll differ diff --git a/Database/bin/Debug/Model.pdb b/Database/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/Database/bin/Debug/Model.pdb and b/Database/bin/Debug/Model.pdb differ diff --git a/Database/obj/Debug/Database.csproj.AssemblyReference.cache b/Database/obj/Debug/Database.csproj.AssemblyReference.cache index 3dd1e553..ab0bd70b 100644 Binary files a/Database/obj/Debug/Database.csproj.AssemblyReference.cache and b/Database/obj/Debug/Database.csproj.AssemblyReference.cache differ diff --git a/Model/OnDocApiDoc.cs b/Model/OnDocApiDoc.cs index fa99e736..12dd98e9 100644 --- a/Model/OnDocApiDoc.cs +++ b/Model/OnDocApiDoc.cs @@ -26,6 +26,7 @@ namespace Model public string TGNrVerantwortlich { get; set; } public string TGNrUnterschriftLinks { get; set; } public string TGNrUnterschriftRechts { get; set; } + public string OhneUnterschrift { get; set; } public string FaksimileUnterschrift { get; set; } public string PrintLogo { get; set; } @@ -70,6 +71,8 @@ namespace Model public string TGNrVerantwortlich { get; set; } public string TGNrUnterschriftLinks { get; set; } public string TGNrUnterschriftRechts { get; set; } + public string UnterschriftLinksGeprueft { get; set; } + public string UnterschriftRechtsGeprueft { get; set; } public string OhneUnterschrift { get; set; } public string FaksimileUnterschrift { get; set; } public string PrintLogo { get; set; } diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/Model/bin/Debug/Model.dll and b/Model/bin/Debug/Model.dll differ diff --git a/Model/bin/Debug/Model.pdb b/Model/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/Model/bin/Debug/Model.pdb and b/Model/bin/Debug/Model.pdb differ diff --git a/Model/obj/Debug/Model.dll b/Model/obj/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/Model/obj/Debug/Model.dll and b/Model/obj/Debug/Model.dll differ diff --git a/Model/obj/Debug/Model.pdb b/Model/obj/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/Model/obj/Debug/Model.pdb and b/Model/obj/Debug/Model.pdb differ diff --git a/OnDocOffice/bin/Debug/Model.dll b/OnDocOffice/bin/Debug/Model.dll index 74d2710e..9adaf725 100644 Binary files a/OnDocOffice/bin/Debug/Model.dll and b/OnDocOffice/bin/Debug/Model.dll differ diff --git a/OnDocOffice/bin/Debug/Model.pdb b/OnDocOffice/bin/Debug/Model.pdb index 1f761158..715538ef 100644 Binary files a/OnDocOffice/bin/Debug/Model.pdb and b/OnDocOffice/bin/Debug/Model.pdb differ diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index 009f716c..e7e0992d 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/Tools_StringCipher/bin/Debug/StringCipher.exe b/Tools_StringCipher/bin/Debug/StringCipher.exe index 4ca0e7f5..9071e31e 100644 Binary files a/Tools_StringCipher/bin/Debug/StringCipher.exe and b/Tools_StringCipher/bin/Debug/StringCipher.exe differ diff --git a/Tools_StringCipher/bin/Debug/StringCipher.pdb b/Tools_StringCipher/bin/Debug/StringCipher.pdb index aee01e58..0c10402b 100644 Binary files a/Tools_StringCipher/bin/Debug/StringCipher.pdb and b/Tools_StringCipher/bin/Debug/StringCipher.pdb differ diff --git a/Versandstrasse/Class1.cs b/Versandstrasse/Class1.cs index 9bb910c1..f6785fb3 100644 --- a/Versandstrasse/Class1.cs +++ b/Versandstrasse/Class1.cs @@ -361,7 +361,6 @@ namespace Versandstrasse } } - MemoryStream outputStream = new MemoryStream(); newdoc.Save(outputStream); byte[] bytes;