diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index 0bdb15ef..9b0f9278 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -21,6 +21,9 @@ using System.Security.Cryptography; using System.Net.Http.Headers; using SecuringWebApiUsingApiKey.Middleware; using DOCGEN.Klassen; +using CSVNET; +using System.Data; +using Helper; namespace API_NetFramework.Controllers @@ -151,9 +154,51 @@ namespace API_NetFramework.Controllers DocGet dg = new DocGet(connectionstring); clsdok dok = new clsdok("", "", ""); - - + string[] officeformat = System.Configuration.ConfigurationManager.AppSettings["ArchivierungOfficeFormat"].ToString().Split(','); + string[] excelconvert = System.Configuration.ConfigurationManager.AppSettings["ExcelDokType"].ToString().Split(','); + string excelvaluefile = System.Configuration.ConfigurationManager.AppSettings["ExcelValueFile"].ToString(); + if (excelconvert.Contains(doktypnr)) + { + var settings = new CSVSettings() + { + FieldDelimiter = ';', + TextQualifier = '\'', + ForceQualifiers = true + }; + DataTable dt = CSVDataTable.FromFile(excelvaluefile, settings); + DataTable dt1 = dt.Copy(); + dt1.Rows.Clear(); + foreach (System.Data.DataRow dr in dt.Rows) + { + if (dr[0].ToString() == doktypnr.ToString()) { dt1.ImportRow(dr); } + } + dt.Dispose(); + dt1.Columns.Add("value"); + + + Excel_Reader reader = new Excel_Reader(); + dok = dg.GetDoc(DokumentID); + + DB db1 = new DB(connectionstring); + reader.get_valus_from_excel(ref dt1, dok.dokument); + foreach (System.Data.DataRow dr in dt1.Rows) + { + try + { + db1.clear_parameter(); + db1.add_parameter("@dokumentid", DokumentID); + db1.add_parameter("@vorlagenfeldnr", dr["valuenr"].ToString()); + db1.add_parameter("@value", dr["bezeichnung"].ToString() + ";" + dr["value"].ToString()); + db1.Get_Tabledata("dbo.SP_Dokument_Information_Wert", true, false); + } + catch { } + } + db1 = null; + dt = null; + reader = null; + + } if (officeformat.Contains(doktypnr) || extension.ToUpper()=="PDF") { dg.GetDoc(DokumentID); diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 21f2e967..7394ba92 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2025-01-07T14:08:24.2722613Z||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; + True|2025-01-12T13:24:46.2550852Z||;True|2025-01-12T14:00:23.9205001+01:00||;True|2025-01-07T15:08:24.2722613+01:00||;True|2025-01-06T09:25:16.5522864+01:00||;True|2024-12-22T16:49:54.0855447+01:00||;True|2024-12-08T09:59:39.7127943+01:00||;True|2024-12-08T09:26:52.1924006+01:00||;True|2024-12-02T09:50:13.5426444+01:00||;True|2024-12-01T18:53:55.8128003+01:00||;True|2024-11-26T19:32:44.7379810+01:00||;True|2024-11-25T16:02:25.7013060+01:00||;True|2024-11-24T18:56:32.4321643+01:00||;True|2024-11-24T18:48:11.3494435+01:00||;True|2024-11-24T17:50:10.7679996+01:00||;True|2024-11-22T08:35:58.1296657+01:00||;True|2024-11-13T17:47:13.0183160+01:00||;True|2024-11-13T17:46:36.5183689+01:00||;True|2024-11-11T13:42:23.6578245+01:00||;True|2024-11-09T12:11:00.0777236+01:00||;True|2024-11-09T11:54:51.8503924+01:00||; @@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/09/2024 19:25:14 - 01/06/2025 15:26:30 + 01/12/2025 11:24:11 - 01/06/2025 15:26:30 + 01/12/2025 11:24:11 12/26/2024 14:12:09 @@ -94,10 +94,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/26/2024 14:12:09 - 01/06/2025 13:43:11 + 01/12/2025 11:23:42 - 01/06/2025 13:43:11 + 01/12/2025 11:23:42 10/20/2023 22:35:02 @@ -130,13 +130,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 01/06/2025 15:26:30 + 01/12/2025 14:00:10 12/23/2024 22:17:43 - 01/06/2025 15:26:30 + 01/12/2025 14:00:10 11/27/2023 09:49:58 @@ -214,10 +214,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 04/11/2022 19:09:46 - 01/02/2025 17:56:13 + 01/09/2025 11:12:24 - 01/02/2025 17:56:13 + 01/09/2025 11:12:24 08/19/2014 21:33:57 @@ -244,16 +244,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 12/28/2024 10:07:41 - 01/06/2025 15:26:30 + 01/12/2025 11:24:11 - 01/06/2025 15:26:30 + 01/12/2025 11:24:11 - 01/07/2025 15:08:21 + 01/12/2025 14:24:23 - 01/07/2025 15:08:21 + 01/12/2025 14:24:23 11/13/2012 13:19:34 @@ -358,10 +358,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/08/2017 03:30:56 - 12/18/2024 07:03:18 + 09/12/2024 21:02:32 - 12/18/2024 05:41:46 + 09/12/2024 21:21:22 09/12/2024 21:25:18 @@ -373,16 +373,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 09/12/2024 21:33:50 - 12/18/2024 07:03:54 + 09/12/2024 21:03:58 - 12/18/2024 05:43:46 + 09/12/2024 21:23:26 09/12/2024 21:32:30 - 12/18/2024 05:47:02 + 09/12/2024 21:26:42 02/19/2020 11:05:18 @@ -442,10 +442,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:33:58 - 01/03/2025 12:55:32 + 01/10/2025 12:26:43 - 01/03/2025 12:55:32 + 01/10/2025 12:26:43 12/28/2024 10:07:41 @@ -646,7 +646,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 06/03/2024 08:11:55 - 01/07/2025 15:08:22 + 01/12/2025 14:00:22 \ No newline at end of file diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config index ee789107..e2100769 100644 --- a/API_NetFramework/Web.config +++ b/API_NetFramework/Web.config @@ -30,7 +30,6 @@ - diff --git a/API_NetFramework/bin/DOCGEN.dll b/API_NetFramework/bin/DOCGEN.dll index f62a892e..0d9c0c91 100644 Binary files a/API_NetFramework/bin/DOCGEN.dll and b/API_NetFramework/bin/DOCGEN.dll differ diff --git a/API_NetFramework/bin/DOCGEN.pdb b/API_NetFramework/bin/DOCGEN.pdb index 5d43d16f..f8d3bcb0 100644 Binary files a/API_NetFramework/bin/DOCGEN.pdb and b/API_NetFramework/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/bin/OnDoc_NetFramework.dll b/API_NetFramework/bin/OnDoc_NetFramework.dll index d5381b1c..65ce110e 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.dll.config b/API_NetFramework/bin/OnDoc_NetFramework.dll.config index ee789107..e2100769 100644 --- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config +++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config @@ -30,7 +30,6 @@ - diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index 51031929..ea61b297 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 28e7761c..f2088f57 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -2526,3 +2526,121 @@ Parametername: encoder 2025-01-10 14:26:35.4068|DEBUG|OnDoc| 2025-01-10 14:26:35.4338|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: TG9665 2025-01-10 14:26:35.4338|INFO|OnDoc|Unterschrift-Bezug: TG9665 +2025-01-12 10:36:08.2012|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:36:47.0363|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:37:20.8471|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:37:44.5045|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:39:50.6681|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:40:25.0659|INFO|OnDoc|Image-Bezug: 2 +2025-01-12 10:40:45.1582|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:45:15.5121|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:46:57.4951|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:47:28.8974|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:48:45.8005|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 10:51:50.8164|INFO|OnDoc|Image-Bezug: 1 +2025-01-12 11:12:44.1728|INFO|OnDoc|Image-Bezug: 2 +2025-01-12 12:27:27.7626|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:27:28.7133|DEBUG|OnDoc| +2025-01-12 12:27:28.7236|DEBUG|OnDoc| +2025-01-12 12:27:31.0195|DEBUG|OnDoc| +2025-01-12 12:27:31.2052|DEBUG|OnDoc| +2025-01-12 12:29:12.7966|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:29:13.2143|DEBUG|OnDoc| +2025-01-12 12:29:13.2246|DEBUG|OnDoc| +2025-01-12 12:29:14.6517|DEBUG|OnDoc| +2025-01-12 12:29:14.6684|DEBUG|OnDoc| +2025-01-12 12:29:40.7550|ERROR|OnDoc|Spalte 'dokumenttpynr' gehört nicht zu Tabelle . +2025-01-12 12:30:03.1624|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:30:03.5694|DEBUG|OnDoc| +2025-01-12 12:30:03.5789|DEBUG|OnDoc| +2025-01-12 12:30:05.2359|DEBUG|OnDoc| +2025-01-12 12:30:05.2491|DEBUG|OnDoc| +2025-01-12 12:31:04.8292|ERROR|OnDoc|Spalte 'Dokumenttpynr' gehört nicht zu Tabelle . +2025-01-12 12:31:14.5860|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:31:20.0483|DEBUG|OnDoc| +2025-01-12 12:31:20.0846|DEBUG|OnDoc| +2025-01-12 12:31:20.0846|DEBUG|OnDoc| +2025-01-12 12:31:20.0920|DEBUG|OnDoc| +2025-01-12 12:33:26.0868|ERROR|OnDoc|Spalte 'sheets' gehört nicht zu Tabelle . +2025-01-12 12:33:49.6168|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:33:49.6251|DEBUG|OnDoc| +2025-01-12 12:33:49.6251|DEBUG|OnDoc| +2025-01-12 12:33:49.6251|DEBUG|OnDoc| +2025-01-12 12:33:49.6251|DEBUG|OnDoc| +2025-01-12 12:34:09.2245|ERROR|OnDoc|Der Objektverweis wurde nicht auf eine Objektinstanz festgelegt. +2025-01-12 12:34:16.9230|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:34:16.9230|DEBUG|OnDoc| +2025-01-12 12:34:16.9230|DEBUG|OnDoc| +2025-01-12 12:34:16.9230|DEBUG|OnDoc| +2025-01-12 12:34:16.9367|DEBUG|OnDoc| +2025-01-12 12:34:27.4277|DEBUG|OnDoc| +2025-01-12 12:34:27.4663|DEBUG|OnDoc| +2025-01-12 12:40:45.8283|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:40:45.8854|DEBUG|OnDoc| +2025-01-12 12:40:45.8893|DEBUG|OnDoc| +2025-01-12 12:40:45.8893|DEBUG|OnDoc| +2025-01-12 12:40:45.8893|DEBUG|OnDoc| +2025-01-12 12:40:58.8278|DEBUG|OnDoc| +2025-01-12 12:40:58.8278|DEBUG|OnDoc| +2025-01-12 12:42:01.0623|ERROR|OnDoc|Der Objektverweis wurde nicht auf eine Objektinstanz festgelegt. +2025-01-12 12:42:13.7720|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:42:13.7815|DEBUG|OnDoc| +2025-01-12 12:42:13.7815|DEBUG|OnDoc| +2025-01-12 12:42:13.7815|DEBUG|OnDoc| +2025-01-12 12:42:13.7815|DEBUG|OnDoc| +2025-01-12 12:42:29.4438|DEBUG|OnDoc| +2025-01-12 12:42:29.5122|DEBUG|OnDoc| +2025-01-12 12:42:46.9733|ERROR|OnDoc|Der Objektverweis wurde nicht auf eine Objektinstanz festgelegt. +2025-01-12 12:42:58.3207|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:42:58.3307|DEBUG|OnDoc| +2025-01-12 12:42:58.3307|DEBUG|OnDoc| +2025-01-12 12:42:58.3307|DEBUG|OnDoc| +2025-01-12 12:42:58.3307|DEBUG|OnDoc| +2025-01-12 12:42:59.9946|DEBUG|OnDoc| +2025-01-12 12:43:00.0059|DEBUG|OnDoc| +2025-01-12 12:43:01.2116|DEBUG|OnDoc|Start Transfer to OnBase +2025-01-12 12:43:01.3681|DEBUG|OnDoc|Ende Transfer to OnBase +2025-01-12 12:43:01.3859|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:43:01.3888|DEBUG|OnDoc|Start Updaet IL_Log: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:43:01.3888|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002483553 +2025-01-12 12:43:01.3888|DEBUG|OnDoc| +2025-01-12 12:43:01.4050|DEBUG|OnDoc| +2025-01-12 12:43:01.4050|DEBUG|OnDoc| +2025-01-12 12:43:01.4517|DEBUG|OnDoc| +2025-01-12 12:43:01.4517|DEBUG|OnDoc| +2025-01-12 12:43:01.4517|DEBUG|OnDoc| +2025-01-12 13:03:10.8539|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483569 +2025-01-12 13:03:11.5240|DEBUG|OnDoc| +2025-01-12 13:03:11.5378|DEBUG|OnDoc| +2025-01-12 13:03:13.5086|DEBUG|OnDoc| +2025-01-12 13:03:13.5238|DEBUG|OnDoc| +2025-01-12 13:03:24.0125|DEBUG|OnDoc| +2025-01-12 13:03:24.0278|DEBUG|OnDoc| +2025-01-12 13:04:33.6724|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002483569 +2025-01-12 13:04:34.2621|DEBUG|OnDoc| +2025-01-12 13:04:34.2730|DEBUG|OnDoc| +2025-01-12 13:04:44.8206|DEBUG|OnDoc| +2025-01-12 13:04:44.8672|DEBUG|OnDoc| +2025-01-12 13:05:18.1757|DEBUG|OnDoc| +2025-01-12 13:05:18.1870|DEBUG|OnDoc| +2025-01-12 13:16:09.8086|DEBUG|OnDoc| +2025-01-12 13:16:09.8508|ERROR|OnDoc|Ungültiger Objektname "dbo.SP_Dokument_Information_Wert". +2025-01-12 13:16:45.3974|DEBUG|OnDoc| +2025-01-12 13:16:56.7122|ERROR|OnDoc|Ungültiger Objektname "dbo.SP_Dokument_Information_Wert". +2025-01-12 13:17:11.2709|DEBUG|OnDoc| +2025-01-12 13:17:11.2832|DEBUG|OnDoc| +2025-01-12 13:17:20.5028|DEBUG|OnDoc| +2025-01-12 13:17:40.1073|DEBUG|OnDoc| +2025-01-12 13:58:57.5976|DEBUG|OnDoc| +2025-01-12 13:58:57.5976|DEBUG|OnDoc| +2025-01-12 13:59:00.5881|DEBUG|OnDoc| +2025-01-12 13:59:00.5985|DEBUG|OnDoc| +2025-01-12 13:59:13.3545|DEBUG|OnDoc| +2025-01-12 13:59:13.3648|DEBUG|OnDoc| +2025-01-12 13:59:15.5149|DEBUG|OnDoc| +2025-01-12 13:59:15.5149|DEBUG|OnDoc| +2025-01-12 13:59:17.4717|DEBUG|OnDoc| +2025-01-12 13:59:17.4717|DEBUG|OnDoc| +2025-01-12 13:59:45.8318|DEBUG|OnDoc| +2025-01-12 13:59:45.8705|DEBUG|OnDoc| +2025-01-12 13:59:47.1193|ERROR|OnDoc|An der Position 0 befindet sich keine Zeile. diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index fd4ed500..5ff61a26 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 d5381b1c..65ce110e 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 51031929..ea61b297 100644 Binary files a/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config index c959d9ba..d79079bd 100644 --- a/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config +++ b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config @@ -30,7 +30,6 @@ - @@ -102,11 +101,11 @@ - + - + @@ -122,15 +121,15 @@ - + - + - + diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll index 13598d33..0d9c0c91 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb index 121aebce..f8d3bcb0 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/DOCGEN.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll index 2bc14d42..2dec0cce 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb index d7542cf7..20da657c 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDocOffice.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll index 81054e1a..65ce110e 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb index d077c789..ea61b297 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.pdb differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Compression.Base.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Compression.Base.dll new file mode 100644 index 00000000..21af3f76 Binary files /dev/null and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Compression.Base.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.DocIO.Base.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.DocIO.Base.dll new file mode 100644 index 00000000..5d39335b Binary files /dev/null and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.DocIO.Base.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.OfficeChart.Base.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.OfficeChart.Base.dll new file mode 100644 index 00000000..1af69fcd Binary files /dev/null and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.OfficeChart.Base.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Pdf.Base.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Pdf.Base.dll new file mode 100644 index 00000000..cc745d09 Binary files /dev/null and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.Pdf.Base.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.XlsIO.Base.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.XlsIO.Base.dll new file mode 100644 index 00000000..bd4f4edc Binary files /dev/null and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Syncfusion.XlsIO.Base.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.dll index f68e5af6..b5f44b4d 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.dll and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.dll differ diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.pdb b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.pdb index f2800be8..0f6a4e0c 100644 Binary files a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.pdb and b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/vbBarcodes.pdb differ diff --git a/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config index 69cf0a41..e2100769 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config @@ -30,7 +30,6 @@ - @@ -102,11 +101,11 @@ - + - + @@ -122,15 +121,15 @@ - + - + - + diff --git a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config index c959d9ba..d79079bd 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config @@ -30,7 +30,6 @@ - @@ -102,11 +101,11 @@ - + - + @@ -122,15 +121,15 @@ - + - + - + diff --git a/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache b/BarcodeLib/obj/Debug/BarcodeLib.csproj.AssemblyReference.cache index 55ec5f33..8571a936 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/DocMgmt/Serienbrief.Designer.cs b/Client/DocMgmt/Serienbrief.Designer.cs index e95d6b0c..2a452ee5 100644 --- a/Client/DocMgmt/Serienbrief.Designer.cs +++ b/Client/DocMgmt/Serienbrief.Designer.cs @@ -37,7 +37,7 @@ Syncfusion.Windows.Forms.Tools.TreeNodeAdv treeNodeAdv4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdv(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Serienbrief)); this.GrpDokumentInhalt = new System.Windows.Forms.GroupBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.grpFaktura = new System.Windows.Forms.GroupBox(); this.rbbpb = new System.Windows.Forms.RadioButton(); this.rbppa = new System.Windows.Forms.RadioButton(); this.rbppohne = new System.Windows.Forms.RadioButton(); @@ -122,11 +122,11 @@ this.panel1 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.panelLoad = new System.Windows.Forms.Panel(); this.label4 = new System.Windows.Forms.Label(); - this.docPreview1 = new OnDoc.UIControls.DocPreview(); this.GrpDokumentInhalt.SuspendLayout(); - this.groupBox1.SuspendLayout(); + this.grpFaktura.SuspendLayout(); this.grpDruckstapel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).BeginInit(); this.pnlprogress.SuspendLayout(); @@ -159,7 +159,7 @@ // // GrpDokumentInhalt // - this.GrpDokumentInhalt.Controls.Add(this.groupBox1); + this.GrpDokumentInhalt.Controls.Add(this.grpFaktura); this.GrpDokumentInhalt.Controls.Add(this.grpDruckstapel); this.GrpDokumentInhalt.Controls.Add(this.pnlprogress); this.GrpDokumentInhalt.Controls.Add(this.groupBox8); @@ -175,17 +175,17 @@ this.GrpDokumentInhalt.TabStop = false; this.GrpDokumentInhalt.Text = "Dokument-Inahalt"; // - // groupBox1 + // grpFaktura // - this.groupBox1.Controls.Add(this.rbbpb); - this.groupBox1.Controls.Add(this.rbppa); - this.groupBox1.Controls.Add(this.rbppohne); - this.groupBox1.Location = new System.Drawing.Point(546, 192); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(534, 55); - this.groupBox1.TabIndex = 16; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Frankatur"; + this.grpFaktura.Controls.Add(this.rbbpb); + this.grpFaktura.Controls.Add(this.rbppa); + this.grpFaktura.Controls.Add(this.rbppohne); + this.grpFaktura.Location = new System.Drawing.Point(546, 192); + this.grpFaktura.Name = "grpFaktura"; + this.grpFaktura.Size = new System.Drawing.Size(534, 55); + this.grpFaktura.TabIndex = 16; + this.grpFaktura.TabStop = false; + this.grpFaktura.Text = "Frankatur"; // // rbbpb // @@ -1004,6 +1004,7 @@ // ribbonbuttonsavetemplate // this.ribbonbuttonsavetemplate.DropDownResizable = true; + this.ribbonbuttonsavetemplate.Enabled = false; this.ribbonbuttonsavetemplate.Image = global::OnDoc.Properties.Resources.save_32x32_32; this.ribbonbuttonsavetemplate.LargeImage = global::OnDoc.Properties.Resources.save_32x32_32; this.ribbonbuttonsavetemplate.Name = "ribbonbuttonsavetemplate"; @@ -1175,6 +1176,15 @@ this.splitContainer1.SplitterDistance = 900; this.splitContainer1.TabIndex = 5; // + // docPreview1 + // + this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; + this.docPreview1.Location = new System.Drawing.Point(0, 0); + this.docPreview1.Name = "docPreview1"; + this.docPreview1.Size = new System.Drawing.Size(725, 598); + this.docPreview1.TabIndex = 4; + this.docPreview1.ZoomPercentage = 0; + // // panelLoad // this.panelLoad.BackColor = System.Drawing.Color.Silver; @@ -1195,15 +1205,6 @@ this.label4.TabIndex = 0; this.label4.Text = "Serienbrief wird initialisiert - bitte einen Moment warten...."; // - // docPreview1 - // - this.docPreview1.Dock = System.Windows.Forms.DockStyle.Fill; - this.docPreview1.Location = new System.Drawing.Point(0, 0); - this.docPreview1.Name = "docPreview1"; - this.docPreview1.Size = new System.Drawing.Size(725, 598); - this.docPreview1.TabIndex = 4; - this.docPreview1.ZoomPercentage = 0; - // // Serienbrief // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1222,8 +1223,8 @@ this.Text = "Serienbrief"; this.Load += new System.EventHandler(this.Serienbrief_Load); this.GrpDokumentInhalt.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); + this.grpFaktura.ResumeLayout(false); + this.grpFaktura.PerformLayout(); this.grpDruckstapel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.treeviewDruckstapel)).EndInit(); this.pnlprogress.ResumeLayout(false); @@ -1339,7 +1340,7 @@ private System.Windows.Forms.RibbonButton RibbonButtonArchivierenUndAbschlessen; private System.Windows.Forms.ToolStripMenuItem erneutGenerierenToolStripMenuItem; private System.Windows.Forms.RibbonButton ribbonButtonDelete; - private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox grpFaktura; private System.Windows.Forms.RadioButton rbbpb; private System.Windows.Forms.RadioButton rbppa; private System.Windows.Forms.RadioButton rbppohne; diff --git a/Client/DocMgmt/Serienbrief.cs b/Client/DocMgmt/Serienbrief.cs index fcfe00cb..24225a34 100644 --- a/Client/DocMgmt/Serienbrief.cs +++ b/Client/DocMgmt/Serienbrief.cs @@ -140,7 +140,7 @@ namespace OnDoc.UIControls ribbonButtonPartnerPruefen.Enabled = false; ribbonButtonVorlageBearbeiten.Enabled = false; ribbonbuttonloadtemplate.Enabled = false; - ribbonbuttonsave.Enabled = false; + ribbonbuttonsavetemplate.Enabled = false; ribbonbuttonaddpartner.Enabled = false; ribbonButtonPartnerPruefen.Enabled = false; RibbonButtonGenerateSB.Enabled = false; @@ -159,9 +159,10 @@ namespace OnDoc.UIControls groupBox6.Enabled = enabled; groupBox7.Enabled = enabled; groupBox8.Enabled = enabled; + grpFaktura.Enabled = enabled; ribbonButtonVorlageBearbeiten.Enabled = enabled; ribbonbuttonloadtemplate.Enabled = enabled; - ribbonbuttonsave.Enabled = enabled; + ribbonbuttonsavetemplate.Enabled = enabled; } if (type == 4) @@ -511,6 +512,7 @@ namespace OnDoc.UIControls else { this.GrpDokumentInhalt.Enabled = false; + this.grpFaktura.Enabled = false; return; } } @@ -878,6 +880,7 @@ namespace OnDoc.UIControls } update_zahlen(); GrpDokumentInhalt.Enabled = true; + grpFaktura.Enabled = true; } @@ -1206,127 +1209,132 @@ namespace OnDoc.UIControls sp1 = vorlagendaten.Columns[i1].ColumnName; feldnr = sp1; } - switch (sp1) + try { - // Mapping Zustelladresse - case "F_09_1": - case "F_09_10": - { - if (vorlagendaten.Rows[i]["Zustelladresse"] != "") + switch (sp1) + { + // Mapping Zustelladresse + case "F_09_1": + case "F_09_10": { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"]; - } + if (vorlagendaten.Rows[i]["Zustelladresse"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Zustelladresse"]; + } - break; - } - case "F_09_89": - { - if (vorlagendaten.Rows[i]["Name"] != "") - { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"]; + break; } - - break; - } - case "F_09_111": - { - if (vorlagendaten.Rows[i]["Vorname"] != "") + case "F_09_89": { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"]; + if (vorlagendaten.Rows[i]["Name"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Name"]; + } + + break; } + case "F_09_111": + { + if (vorlagendaten.Rows[i]["Vorname"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Vorname"]; + } - break; - } - case "F_09_122": - case "F_09_123": - case "F_09_20": - { - string s = ""; - string s1; - if (vorlagendaten.Rows[i]["Briefanrede1"] != "") + break; + } + case "F_09_122": + case "F_09_123": + case "F_09_20": { - s = vorlagendaten.Rows[i]["Briefanrede1"].ToString(); - if (s.Substring(0, 4) == "Herr") + string s = ""; + string s1; + if (vorlagendaten.Rows[i]["Briefanrede1"] != "") { - s = "r " + s; + s = vorlagendaten.Rows[i]["Briefanrede1"].ToString(); + if (s.Substring(0, 4) == "Herr") + { + s = "r " + s; + } + else + { + s = " " + s; + } } - else + if (vorlagendaten.Rows[i]["Briefanrede2"] != "") { - s = " " + s; + if (!string.IsNullOrEmpty(s)) + s = s + Environment.NewLine; + s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString(); + if (s.Substring(0, 4) == "Herr") + { + s = s + "Sehr geehrter " + s1; + } + else + { + s = s + "Sehr geehrte " + s1; + } } - } - if (vorlagendaten.Rows[i]["Briefanrede2"] != "") - { if (!string.IsNullOrEmpty(s)) - s = s + Environment.NewLine; - s1 = vorlagendaten.Rows[i]["Briefanrede2"].ToString(); - if (s.Substring(0, 4) == "Herr") { - s = s + "Sehr geehrter " + s1; + vorlagendaten.Rows[i][i1] = s; } - else + + break; + } + case "F_09_98": + { + if (vorlagendaten.Rows[i]["Strasse"] != "") { - s = s + "Sehr geehrte " + s1; + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"]; } + + break; } - if (!string.IsNullOrEmpty(s)) + case "F_09_93": { - vorlagendaten.Rows[i][i1] = s; - } + if (vorlagendaten.Rows[i]["Ort"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"]; + } - break; - } - case "F_09_98": - { - if (vorlagendaten.Rows[i]["Strasse"] != "") - { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Strasse"]; + break; } - - break; - } - case "F_09_93": - { - if (vorlagendaten.Rows[i]["Ort"] != "") + case var @case when @case == "F_09_93": { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"]; - } + if (vorlagendaten.Rows[i]["Ort"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"]; + } - break; - } - case var @case when @case == "F_09_93": - { - if (vorlagendaten.Rows[i]["Ort"] != "") - { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["Ort"]; + break; } + case "F_09_96": + { + if (vorlagendaten.Rows[i]["PLZ"] != "") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"]; + } - break; - } - case "F_09_96": - { - if (vorlagendaten.Rows[i]["PLZ"] != "") + break; + } + case "F_09_132": { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"]; + if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0") + { + vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"]; + } + + break; } - break; - } - case "F_09_132": - { - if (vorlagendaten.Rows[i]["PLZ"].ToString() != "" | vorlagendaten.Rows[i]["Ort"].ToString() != "0") + default: { - vorlagendaten.Rows[i][i1] = vorlagendaten.Rows[i]["PLZ"] + " " + vorlagendaten.Rows[i]["Ort"]; + break; } - - break; - } - - default: - { - break; - } + } } + catch { } + // Verknüpfte Felder try @@ -1995,12 +2003,12 @@ namespace OnDoc.UIControls bez = id.result; } id.Dispose(); - if (bez !="") { - //InputBoxItem[] items = new InputBoxItem[] { new InputBoxItem("Bezeichnung") }; - //InputBox input = InputBox.Show("Name für die Vorlage",items,InputBoxButtons.OKCancel); - //if (input.Result == InputBoxResult.OK) { - // string bez = input.Items["Bezeichnung"].ToString(); - + if (bez !="") { + //InputBoxItem[] items = new InputBoxItem[] { new InputBoxItem("Bezeichnung") }; + //InputBox input = InputBox.Show("Name für die Vorlage",items,InputBoxButtons.OKCancel); + //if (input.Result == InputBoxResult.OK) { + // string bez = input.Items["Bezeichnung"].ToString(); + update_serienbriefdaten(false); DB db = new DB(AppParams.connectionstring); db.Get_Tabledata("Select dbo.binarytobase64(vorlage),DocType from edex_sb_vorlage where serienbriefnr=" + sb.serienbriefnr.ToString(), false, true); string file = db.dsdaten.Tables[0].Rows[0][0].ToString(); diff --git a/Client/UIControls/UCAllgemeineDokumentParam.cs b/Client/UIControls/UCAllgemeineDokumentParam.cs index 9d6436aa..d1645f48 100644 --- a/Client/UIControls/UCAllgemeineDokumentParam.cs +++ b/Client/UIControls/UCAllgemeineDokumentParam.cs @@ -208,10 +208,14 @@ namespace OnDoc.UIControls this.barcode_horizontal = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bchorizontal"]); this.barcode_type = db.dsdaten.Tables[0].Rows[0]["BarcodeType"].ToString(); this.barcode_content = db.dsdaten.Tables[0].Rows[0]["DatamatrixContent"].ToString(); - + + string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString(); + Logging.Logging.Debug("Barcode-Size Ursprung:" + logdata1,"OnDoc",""); + if (this.ErstellungInOffice == false) { + Logging.Logging.Debug("Erstellung not Office", "OnDoc", ""); string sql = ""; sql = "select bcpt, bcpl, bcw, bch, bchorizontal from OnDocBarcodeMpping "; sql = sql + "where orig_bcpt = " + barcode_top.ToString() + " and orig_bcpl=" + barcode_left.ToString() + " "; @@ -219,7 +223,7 @@ namespace OnDoc.UIControls db.Get_Tabledata(sql, false, true); if (db.dsdaten.Tables[0].Rows.Count > 0) { - string logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString(); + logdata1 = barcode_left.ToString() + "/" + barcode_top.ToString() + "/" + barcode_width.ToString() + "/" + barcode_height.ToString(); this.barcode_left = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpl"]); this.barcode_top = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcpt"]); this.barcode_width = Convert.ToInt32(db.dsdaten.Tables[0].Rows[0]["bcw"]); diff --git a/Client/bin/Debug/DOCGEN.dll b/Client/bin/Debug/DOCGEN.dll index f62a892e..0d9c0c91 100644 Binary files a/Client/bin/Debug/DOCGEN.dll and b/Client/bin/Debug/DOCGEN.dll differ diff --git a/Client/bin/Debug/DOCGEN.pdb b/Client/bin/Debug/DOCGEN.pdb index 5d43d16f..f8d3bcb0 100644 Binary files a/Client/bin/Debug/DOCGEN.pdb and b/Client/bin/Debug/DOCGEN.pdb differ diff --git a/Client/bin/Debug/OnDoc.exe b/Client/bin/Debug/OnDoc.exe index 77b5faa4..5a4ce173 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 4e97fe8f..41087af5 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 4e07d905..0efddea6 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 c056e17e..df300692 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 1ad79d19..27ea4086 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/Client.csproj.GenerateResource.cache b/Client/obj/Debug/Client.csproj.GenerateResource.cache index 292d8621..781050d3 100644 Binary files a/Client/obj/Debug/Client.csproj.GenerateResource.cache and b/Client/obj/Debug/Client.csproj.GenerateResource.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 9e5991a7..34534e6f 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 88544d47..3053f279 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 77b5faa4..5a4ce173 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 4e97fe8f..41087af5 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 c056e17e..df300692 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/Klassen/Excel_Reader.cs b/DOCGEN/Klassen/Excel_Reader.cs index f65070a9..b1deec82 100644 --- a/DOCGEN/Klassen/Excel_Reader.cs +++ b/DOCGEN/Klassen/Excel_Reader.cs @@ -12,12 +12,7 @@ namespace DOCGEN.Klassen { SyncFExcel se = new SyncFExcel(); se.get_values(ref dt, excel); - foreach (System.Data.DataRow dr in dt.Rows) - { - DOCGEN.Klassen.Excel_Reader er = new DOCGEN.Klassen.Excel_Reader(); - - } - + } } diff --git a/DOCGEN/Klassen/SyncFExcel.cs b/DOCGEN/Klassen/SyncFExcel.cs index 47926bc5..eaf9c1c9 100644 --- a/DOCGEN/Klassen/SyncFExcel.cs +++ b/DOCGEN/Klassen/SyncFExcel.cs @@ -116,7 +116,7 @@ namespace DOCGEN.Klassen row = Convert.ToInt32(dr["rowindex"]); col = Convert.ToInt32(dr["columnindex"]); - string value = workBook.Worksheets[Convert.ToInt32(dr["sheets"])].Range[row, col].Value.ToString(); + string value = workBook.Worksheets[Convert.ToInt32(dr["sheet"])-1].Range[row, col].DisplayText.ToString(); dr["value"] = value; } workBook.Close(); diff --git a/DOCGEN/Klassen/SyncFWord.cs b/DOCGEN/Klassen/SyncFWord.cs index c96e5eaf..0ccc279d 100644 --- a/DOCGEN/Klassen/SyncFWord.cs +++ b/DOCGEN/Klassen/SyncFWord.cs @@ -273,10 +273,10 @@ namespace DOCGEN.Klassen } } } - if (img_faktura != "") - { - insert_ppfaktura(document, img_faktura); - } + //if (img_faktura != "") + //{ + // insert_ppfaktura(document, img_faktura); + //} if (docdata.Form_ohne_Unterschrift=="True" || docdata.As_Faksimile == "True") { DB db = new DB(); @@ -379,9 +379,32 @@ namespace DOCGEN.Klassen } else { - bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); - bookmarkNavigator.InsertText(dv.Value.ToString()); - bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); + if (dv.TMBeginn.ToString() == "TGEDKAdresseZustellungB99") + { + if (img_faktura != "") + + { + insert_ppfaktura(document, img_faktura); + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); + bookmarkNavigator.InsertText(dv.Value.ToString()); + + //bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); + } + else + { + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); + bookmarkNavigator.InsertText(dv.Value.ToString()); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); + } + + } + else + { + bookmarkNavigator.MoveToBookmark(dv.TMBeginn.ToString()); + bookmarkNavigator.InsertText(dv.Value.ToString()); + bookmarkNavigator.ReplaceBookmarkContent(dv.Value.ToString(), true); + } + } } @@ -700,6 +723,7 @@ namespace DOCGEN.Klassen IWParagraph paragraph = new WParagraph(document); paragraph.AppendPicture(image); bookmarkNavigator.InsertParagraph(paragraph); + } @@ -789,9 +813,10 @@ namespace DOCGEN.Klassen //int rotation = 0; //if (docData.barcode_horizontal == 0) { rotation = 270; } barcodeimage = Barcode.Get_LinerBarcode(Barcoded.Symbology.I2of5, docData.Dokumentid.Substring(6, 16), docData.Dokumentid.Substring(6, 16)+docData.barcode_zusatz, docData.barcode_textposition, docData.Zusatz_Font, Convert.ToInt32(docData.Zusatz_FontSize),0); + //barcodeimage = AutoSizeImage(barcodeimage, docData.barcode_width, docData.barcode_height,false); //barcodeimage = ScaleImage(barcodeimage, docData.barcode_width, docData.barcode_height); //barcodeimage = resizeImage(barcodeimage, new Size(docData.barcode_width,docData.barcode_height)); - + break; case "1": //BarcodeLibVBDatamatrix.MW6Datamatrix dm = new BarcodeLibVBDatamatrix.MW6Datamatrix(); @@ -853,6 +878,12 @@ namespace DOCGEN.Klassen // picture.Height = barcodeimage.Height; + } + if (docData.barcode_type == "0") + { + picture.Width = docData.barcode_width; + picture.Height = docData.barcode_height; + } WPicture picture2 = new WPicture(document); picture2 = picture; diff --git a/DOCGEN/bin/Debug/DOCGEN.dll b/DOCGEN/bin/Debug/DOCGEN.dll index f62a892e..0d9c0c91 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.dll and b/DOCGEN/bin/Debug/DOCGEN.dll differ diff --git a/DOCGEN/bin/Debug/DOCGEN.pdb b/DOCGEN/bin/Debug/DOCGEN.pdb index 5d43d16f..f8d3bcb0 100644 Binary files a/DOCGEN/bin/Debug/DOCGEN.pdb and b/DOCGEN/bin/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DOCGEN.dll b/DOCGEN/obj/Debug/DOCGEN.dll index f62a892e..0d9c0c91 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.dll and b/DOCGEN/obj/Debug/DOCGEN.dll differ diff --git a/DOCGEN/obj/Debug/DOCGEN.pdb b/DOCGEN/obj/Debug/DOCGEN.pdb index 5d43d16f..f8d3bcb0 100644 Binary files a/DOCGEN/obj/Debug/DOCGEN.pdb and b/DOCGEN/obj/Debug/DOCGEN.pdb differ diff --git a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache index e0b505fc..eea036de 100644 Binary files a/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache and b/DOCGEN/obj/Debug/DocGen.csproj.AssemblyReference.cache differ diff --git a/Excel_Test/Excel_Test.csproj b/Excel_Test/Excel_Test.csproj index 14266c2a..24ac97db 100644 --- a/Excel_Test/Excel_Test.csproj +++ b/Excel_Test/Excel_Test.csproj @@ -33,6 +33,9 @@ 4 + + ..\CSVNET\bin\Debug\CSVNET.dll + ..\DOCGEN\bin\Debug\DOCGEN.dll diff --git a/Excel_Test/Form1.cs b/Excel_Test/Form1.cs index f9e6d07b..79c9ec28 100644 --- a/Excel_Test/Form1.cs +++ b/Excel_Test/Form1.cs @@ -1,12 +1,16 @@ using System; +using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using CSVNET; +using FastExcel; namespace Excel_Test { @@ -19,14 +23,58 @@ namespace Excel_Test private void button1_Click(object sender, EventArgs e) { - //if (openFileDialog1.ShowDialog() == DialogResult.OK) - //{ - // ExcelNet.ExcelReader reader = new ExcelNet.ExcelReader(); - // var sheets = new List(); - // sheets = reader.Get_ExcelSheets(openFileDialog1.FileName); - // sheets. - - //} + var settings = new CSVSettings() + { + FieldDelimiter = ';', + TextQualifier = '\'', + ForceQualifiers = true + }; + DataTable dt = CSVDataTable.FromFile(@"x:\exceldata.csv",settings); + //MessageBox.Show("A"); + + + var inputFile = new FileInfo(@"X:\EXCELTESTDATA.xlsx"); + FastExcel.FastExcel fast = new FastExcel.FastExcel(inputFile, true); + Worksheet worksheet0 = fast.Read(1); + enuToDatatable(worksheet0); + FastExcel.Worksheet ws = new FastExcel.Worksheet(); + CellRange cs = new CellRange("8", "53",53,8); + FastExcel.Cell c; + //c= (Cell)Worksheet0.GetCellsInRange(cs); + + + + } + public static void enuToDatatable(Worksheet worksheet) + { + IEnumerator enumerator = worksheet.Rows.GetEnumerator(); + + int count = 0; + + while (enumerator.MoveNext()) + { + if (count > 0) + { + Row row = (Row)enumerator.Current; + + IEnumerator enumerator1 = row.Cells.GetEnumerator(); + + + + int i = 0; + + while (enumerator1.MoveNext()) + { + Cell cell = (Cell)enumerator1.Current; + dt[i] = int.Parse(cell.Value.ToString()); + i = i + 1; + } + + + } + + count += 1; + } } } } diff --git a/Excel_Test/bin/Debug/CSVNET.dll b/Excel_Test/bin/Debug/CSVNET.dll new file mode 100644 index 00000000..994d811b Binary files /dev/null and b/Excel_Test/bin/Debug/CSVNET.dll differ diff --git a/Excel_Test/bin/Debug/CSVNET.pdb b/Excel_Test/bin/Debug/CSVNET.pdb new file mode 100644 index 00000000..045247fb Binary files /dev/null and b/Excel_Test/bin/Debug/CSVNET.pdb differ diff --git a/Excel_Test/bin/Debug/DOCGEN.dll b/Excel_Test/bin/Debug/DOCGEN.dll index 9a34b792..f62a892e 100644 Binary files a/Excel_Test/bin/Debug/DOCGEN.dll and b/Excel_Test/bin/Debug/DOCGEN.dll differ diff --git a/Excel_Test/bin/Debug/DOCGEN.pdb b/Excel_Test/bin/Debug/DOCGEN.pdb index dccd7739..5d43d16f 100644 Binary files a/Excel_Test/bin/Debug/DOCGEN.pdb and b/Excel_Test/bin/Debug/DOCGEN.pdb differ diff --git a/Excel_Test/bin/Debug/Database.dll b/Excel_Test/bin/Debug/Database.dll index 08862c21..4bb6fc56 100644 Binary files a/Excel_Test/bin/Debug/Database.dll and b/Excel_Test/bin/Debug/Database.dll differ diff --git a/Excel_Test/bin/Debug/Database.pdb b/Excel_Test/bin/Debug/Database.pdb index 6fe6bc4c..9150410f 100644 Binary files a/Excel_Test/bin/Debug/Database.pdb and b/Excel_Test/bin/Debug/Database.pdb differ diff --git a/Excel_Test/bin/Debug/Excel_Test.exe b/Excel_Test/bin/Debug/Excel_Test.exe index 90b8aa90..c3d768ea 100644 Binary files a/Excel_Test/bin/Debug/Excel_Test.exe and b/Excel_Test/bin/Debug/Excel_Test.exe differ diff --git a/Excel_Test/bin/Debug/Excel_Test.pdb b/Excel_Test/bin/Debug/Excel_Test.pdb index 7b0aeb6d..3e68985d 100644 Binary files a/Excel_Test/bin/Debug/Excel_Test.pdb and b/Excel_Test/bin/Debug/Excel_Test.pdb differ diff --git a/Excel_Test/bin/Debug/Model.dll b/Excel_Test/bin/Debug/Model.dll index 5177cf3e..dc7a1e44 100644 Binary files a/Excel_Test/bin/Debug/Model.dll and b/Excel_Test/bin/Debug/Model.dll differ diff --git a/Excel_Test/bin/Debug/Model.pdb b/Excel_Test/bin/Debug/Model.pdb index 532596f2..be84dcbc 100644 Binary files a/Excel_Test/bin/Debug/Model.pdb and b/Excel_Test/bin/Debug/Model.pdb differ diff --git a/Excel_Test/bin/Debug/OnDocOffice.dll b/Excel_Test/bin/Debug/OnDocOffice.dll index 917d16ef..2dec0cce 100644 Binary files a/Excel_Test/bin/Debug/OnDocOffice.dll and b/Excel_Test/bin/Debug/OnDocOffice.dll differ diff --git a/Excel_Test/bin/Debug/OnDocOffice.pdb b/Excel_Test/bin/Debug/OnDocOffice.pdb index 8548865e..20da657c 100644 Binary files a/Excel_Test/bin/Debug/OnDocOffice.pdb and b/Excel_Test/bin/Debug/OnDocOffice.pdb differ diff --git a/Excel_Test/bin/Debug/vbBarcodes.dll b/Excel_Test/bin/Debug/vbBarcodes.dll index f191c02e..b5f44b4d 100644 Binary files a/Excel_Test/bin/Debug/vbBarcodes.dll and b/Excel_Test/bin/Debug/vbBarcodes.dll differ diff --git a/Excel_Test/bin/Debug/vbBarcodes.pdb b/Excel_Test/bin/Debug/vbBarcodes.pdb index ef284ce5..0f6a4e0c 100644 Binary files a/Excel_Test/bin/Debug/vbBarcodes.pdb and b/Excel_Test/bin/Debug/vbBarcodes.pdb differ diff --git a/Excel_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Excel_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9ea7a749..840c2c17 100644 Binary files a/Excel_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Excel_Test/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache index b48cd34a..49ee5214 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache and b/Excel_Test/obj/Debug/Excel_Test.csproj.AssemblyReference.cache differ diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.CoreCompileInputs.cache b/Excel_Test/obj/Debug/Excel_Test.csproj.CoreCompileInputs.cache index 7fe6b694..6241ffca 100644 --- a/Excel_Test/obj/Debug/Excel_Test.csproj.CoreCompileInputs.cache +++ b/Excel_Test/obj/Debug/Excel_Test.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -74c57a91c6ba4723efc7ad435960ebf6080513dec979c73eaf543239b835ac9a +36dfd6b03b10923072099de0e6e6f0ae356f333cf5b34594e6b74a4c890326bf diff --git a/Excel_Test/obj/Debug/Excel_Test.csproj.FileListAbsolute.txt b/Excel_Test/obj/Debug/Excel_Test.csproj.FileListAbsolute.txt index 3e28da3f..fb923a8a 100644 --- a/Excel_Test/obj/Debug/Excel_Test.csproj.FileListAbsolute.txt +++ b/Excel_Test/obj/Debug/Excel_Test.csproj.FileListAbsolute.txt @@ -66,3 +66,5 @@ E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\vbBarcodes.dll E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\vbBarcodes.pdb E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\vbBarcodes.xml E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\MW6.SDK.dll +E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\CSVNET.dll +E:\Software-Projekte\OnDoc\OnDoc\Excel_Test\bin\Debug\CSVNET.pdb diff --git a/Excel_Test/obj/Debug/Excel_Test.exe b/Excel_Test/obj/Debug/Excel_Test.exe index 90b8aa90..c3d768ea 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.exe and b/Excel_Test/obj/Debug/Excel_Test.exe differ diff --git a/Excel_Test/obj/Debug/Excel_Test.pdb b/Excel_Test/obj/Debug/Excel_Test.pdb index 7b0aeb6d..3e68985d 100644 Binary files a/Excel_Test/obj/Debug/Excel_Test.pdb and b/Excel_Test/obj/Debug/Excel_Test.pdb differ diff --git a/Excel_Test/obj/Debug/build.force b/Excel_Test/obj/Debug/build.force deleted file mode 100644 index e69de29b..00000000 diff --git a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache index bfb10122..d8b0dcb3 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ