diff --git a/API_NetFramework/Controllers/ArchivController.cs b/API_NetFramework/Controllers/ArchivController.cs index 1f1e13c9..6fd8a478 100644 --- a/API_NetFramework/Controllers/ArchivController.cs +++ b/API_NetFramework/Controllers/ArchivController.cs @@ -730,6 +730,7 @@ namespace API_NetFramework.Controllers oba.DocumentHandle = ""; oba.DistributionOption = versandpaket.Versandoption.ToString(); oba.GASCouvert = versandpaket.GAS; + oba.GASSize = versandpaket.GASSize; oba.Returnaddress = versandpaket.GASAdresse; oba.O2ODochandle = ""; oba.Status = ""; @@ -746,6 +747,7 @@ namespace API_NetFramework.Controllers oba.DocumentHandle = ""; oba.DistributionOption = versandpaket.Versandoption.ToString(); oba.GASCouvert = versandpaket.GAS; + oba.GASSize = versandpaket.GASSize; oba.Returnaddress = versandpaket.GASAdresse; oba.O2ODochandle = ""; oba.Status = ""; @@ -833,7 +835,10 @@ namespace API_NetFramework.Controllers onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O DistributionOption",oba.DistributionOption.ToString())); onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O GasCouvert", oba.GASCouvert.ToString())); onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O Returnaddress", oba.Returnaddress.ToString())); - + if (System.Configuration.ConfigurationManager.AppSettings["GASSize"].ToString() == "True") + { + onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O GasSize", oba.GASSize.ToString())); + } onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O Dochandle", oba.DocumentHandle.ToString())); onbasedoc.attributes.Add(new OnBaseDocUpload.attribute("O2O Status", oba.Status.ToString())); diff --git a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user index 2a5b27c1..94d908d3 100644 --- a/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/API_NetFramework/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,12 +5,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\Software-Projekte\OnDoc\PubServices\OnDoc - True|2025-07-27T10:13:11.7201345Z||;True|2025-07-23T12:31:01.1003759+02:00||;True|2025-07-23T11:05:44.2579070+02:00||;True|2025-07-23T10:23:34.5089684+02:00||;True|2025-07-23T09:24:38.1420693+02:00||;True|2025-07-23T07:42:17.0908668+02:00||;True|2025-07-21T15:11:25.9501591+02:00||;True|2025-07-21T13:01:29.5444866+02:00||;True|2025-07-21T10:19:00.3579413+02:00||;True|2025-07-21T08:53:15.8022664+02:00||;True|2025-07-21T08:52:13.5024447+02:00||;True|2025-07-20T22:02:07.7503979+02:00||;True|2025-06-18T21:46:07.0469838+02:00||;True|2025-06-18T12:17:09.8417440+02:00||;True|2025-06-18T11:06:43.5839212+02:00||;True|2025-05-06T12:58:55.8720511+02:00||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;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||; + True|2025-07-28T11:40:59.0692059Z||;True|2025-07-28T13:31:38.8352333+02:00||;True|2025-07-28T10:53:02.7503896+02:00||;True|2025-07-28T10:31:56.3061779+02:00||;True|2025-07-28T10:07:32.1199283+02:00||;True|2025-07-27T12:13:11.7201345+02:00||;True|2025-07-23T12:31:01.1003759+02:00||;True|2025-07-23T11:05:44.2579070+02:00||;True|2025-07-23T10:23:34.5089684+02:00||;True|2025-07-23T09:24:38.1420693+02:00||;True|2025-07-23T07:42:17.0908668+02:00||;True|2025-07-21T15:11:25.9501591+02:00||;True|2025-07-21T13:01:29.5444866+02:00||;True|2025-07-21T10:19:00.3579413+02:00||;True|2025-07-21T08:53:15.8022664+02:00||;True|2025-07-21T08:52:13.5024447+02:00||;True|2025-07-20T22:02:07.7503979+02:00||;True|2025-06-18T21:46:07.0469838+02:00||;True|2025-06-18T12:17:09.8417440+02:00||;True|2025-06-18T11:06:43.5839212+02:00||;True|2025-05-06T12:58:55.8720511+02:00||;True|2025-05-05T10:30:22.0524225+02:00||;True|2025-05-05T09:37:27.1162038+02:00||;True|2025-05-04T13:37:01.8401491+02:00||;True|2025-04-14T15:32:13.3923265+02:00||;True|2025-03-27T09:55:34.9678501+01:00||;True|2025-03-27T07:47:45.1288274+01:00||;True|2025-03-26T19:03:04.7550972+01:00||;True|2025-02-27T19:20:43.3755758+01:00||;True|2025-02-27T18:15:21.2843332+01:00||;True|2025-02-25T19:05:51.2823294+01:00||;True|2025-02-25T19:04:29.0810473+01:00||;True|2025-02-21T10:28:09.2279895+01:00||;True|2025-02-21T09:59:33.3258979+01:00||;True|2025-02-12T12:49:01.5618262+01:00||;True|2025-02-09T14:47:25.8660147+01:00||;True|2025-02-09T12:40:23.8730229+01:00||;True|2025-02-05T14:41:27.6196364+01:00||;True|2025-02-04T22:19:44.0470841+01:00||;True|2025-02-04T21:33:03.4165210+01:00||;True|2025-02-02T20:06:51.6815543+01:00||;True|2025-01-20T10:17:24.5425008+01:00||;True|2025-01-19T16:20:16.1036874+01:00||;True|2025-01-19T16:19:11.5720999+01:00||;True|2025-01-12T14:24:46.2550852+01:00||;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||; - 06/03/2024 09:20:46 + 03/06/2024 09:20:46 07/19/2024 12:24:15 @@ -49,7 +49,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:24:15 - 06/03/2024 09:20:41 + 03/06/2024 09:20:41 07/19/2024 12:24:15 @@ -64,28 +64,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:24:15 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 06/03/2024 09:20:40 + 03/06/2024 09:20:40 - 09/10/2013 17:29:20 + 10/09/2013 17:29:20 - 09/10/2013 17:29:20 + 10/09/2013 17:29:20 - 04/09/2024 19:25:14 + 09/04/2024 19:25:14 - 07/27/2025 11:44:11 + 07/28/2025 09:13:28 - 07/27/2025 11:44:11 + 07/28/2025 09:13:28 02/28/2025 10:40:17 @@ -94,10 +94,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2025 10:40:17 - 07/27/2025 11:37:16 + 07/28/2025 09:13:12 - 07/27/2025 11:37:16 + 07/28/2025 09:13:12 10/20/2023 22:35:02 @@ -115,7 +115,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:02 - 02/11/2014 16:28:40 + 11/02/2014 16:28:40 10/20/2023 22:35:02 @@ -130,22 +130,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/20/2023 22:35:04 - 07/27/2025 12:13:10 + 07/28/2025 13:40:58 12/23/2024 22:17:43 - 07/27/2025 12:13:10 + 07/28/2025 13:40:58 11/27/2023 09:49:58 - 09/07/2023 11:54:46 + 07/09/2023 11:54:46 - 09/07/2023 12:19:34 + 07/09/2023 12:19:34 11/27/2023 09:50:34 @@ -154,37 +154,37 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 11/27/2023 09:50:04 - 03/07/2025 12:17:55 + 07/03/2025 12:17:55 - 03/07/2025 12:17:55 + 07/03/2025 12:17:55 - 04/09/2024 18:58:02 + 09/04/2024 18:58:02 - 03/07/2025 12:17:55 + 07/03/2025 12:17:55 - 03/07/2025 12:17:55 + 07/03/2025 12:17:55 - 11/12/2018 18:29:00 + 12/11/2018 18:29:00 01/25/2019 00:18:54 - 11/12/2018 18:28:58 + 12/11/2018 18:28:58 - 11/12/2018 18:29:00 + 12/11/2018 18:29:00 - 12/02/2025 00:12:14 + 02/12/2025 00:12:14 - 03/05/2023 23:41:40 + 05/03/2023 23:41:40 10/31/2023 16:04:06 @@ -208,16 +208,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/31/2023 16:00:32 - 11/12/2018 18:28:58 + 12/11/2018 18:28:58 - 04/11/2022 19:09:46 + 11/04/2022 19:09:46 - 07/27/2025 11:29:37 + 07/28/2025 09:13:07 - 07/27/2025 11:29:37 + 07/28/2025 09:13:07 08/19/2014 21:33:57 @@ -229,7 +229,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 11/28/2018 00:07:54 - 03/08/2023 06:09:56 + 08/03/2023 06:09:56 04/30/2024 21:58:56 @@ -250,16 +250,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2025 10:40:16 - 07/27/2025 12:13:10 + 07/28/2025 13:40:57 - 07/27/2025 12:13:10 + 07/28/2025 13:40:57 - 07/27/2025 12:13:10 + 07/28/2025 13:40:58 - 07/27/2025 12:13:10 + 07/28/2025 13:40:58 11/13/2012 13:19:34 @@ -307,10 +307,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/15/2022 06:21:10 - 10/05/2021 02:47:54 + 05/10/2021 02:47:54 - 10/05/2021 02:49:46 + 05/10/2021 02:49:46 02/15/2022 06:33:08 @@ -361,34 +361,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/15/2022 06:38:42 - 07/08/2017 03:30:56 + 08/07/2017 03:30:56 - 09/12/2024 21:02:32 + 12/09/2024 21:02:32 - 09/12/2024 21:21:22 + 12/09/2024 21:21:22 - 09/12/2024 21:25:18 + 12/09/2024 21:25:18 - 09/12/2024 21:34:20 + 12/09/2024 21:34:20 - 09/12/2024 21:33:50 + 12/09/2024 21:33:50 - 09/12/2024 21:03:58 + 12/09/2024 21:03:58 - 09/12/2024 21:23:26 + 12/09/2024 21:23:26 - 09/12/2024 21:32:30 + 12/09/2024 21:32:30 - 09/12/2024 21:26:42 + 12/09/2024 21:26:42 02/19/2020 11:05:18 @@ -397,10 +397,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/15/2018 15:29:36 - 12/02/2025 00:12:24 + 02/12/2025 00:12:24 - 05/08/2022 05:31:02 + 08/05/2022 05:31:02 10/20/2023 22:33:52 @@ -412,10 +412,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 10/23/2021 01:40:18 - 12/02/2025 00:18:34 + 02/12/2025 00:18:34 - 12/02/2025 00:18:50 + 02/12/2025 00:18:50 02/19/2020 11:05:18 @@ -424,7 +424,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/15/2018 15:29:52 - 10/01/2013 22:54:22 + 01/10/2013 22:54:22 10/20/2023 22:33:58 @@ -439,7 +439,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 01/01/0001 00:00:00 - 02/11/2014 15:26:04 + 11/02/2014 15:26:04 10/20/2023 22:33:48 @@ -478,187 +478,187 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/22/2025 10:15:24 - 10/05/2016 15:11:52 + 05/10/2016 15:11:52 01/23/2014 13:57:34 - 04/09/2024 19:24:38 + 09/04/2024 19:24:38 - 04/09/2024 19:24:38 + 09/04/2024 19:24:38 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:16 + 03/06/2024 09:16:16 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:15 + 03/06/2024 09:16:15 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 07/19/2024 12:25:43 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:14 + 03/06/2024 09:16:14 - 06/03/2024 09:16:13 + 03/06/2024 09:16:13 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 09:16:17 + 03/06/2024 09:16:17 - 06/03/2024 08:12:04 + 03/06/2024 08:12:04 - 10/01/2024 20:21:44 + 01/10/2024 20:21:44 04/14/2025 18:12:39 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 04/14/2025 18:11:03 @@ -667,10 +667,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 07/19/2024 12:25:43 - 06/03/2024 08:11:55 + 03/06/2024 08:11:55 - 07/23/2025 07:42:15 + 07/28/2025 10:07:31 \ No newline at end of file diff --git a/API_NetFramework/Web.config b/API_NetFramework/Web.config index dabd96f5..65a6dd90 100644 --- a/API_NetFramework/Web.config +++ b/API_NetFramework/Web.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/bin/Model.dll b/API_NetFramework/bin/Model.dll index 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 36cc0963..cef1cca3 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 dabd96f5..65a6dd90 100644 --- a/API_NetFramework/bin/OnDoc_NetFramework.dll.config +++ b/API_NetFramework/bin/OnDoc_NetFramework.dll.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/bin/OnDoc_NetFramework.pdb b/API_NetFramework/bin/OnDoc_NetFramework.pdb index cd4db32d..40f3bb10 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 b42f2076..b34e1578 100644 --- a/API_NetFramework/log.txt +++ b/API_NetFramework/log.txt @@ -21988,3 +21988,116 @@ done bei System.Net.Mail.SmtpConnection.GetConnection(ServicePoint servicePoint) bei System.Net.Mail.SmtpClient.GetConnection() bei System.Net.Mail.SmtpClient.Send(MailMessage message) +2025-07-28 08:21:47.6428|DEBUG|OnDoc| +2025-07-28 08:21:47.6725|DEBUG|OnDoc| +2025-07-28 08:23:01.7519|DEBUG|OnDoc| +2025-07-28 08:23:01.8109|DEBUG|OnDoc| +2025-07-28 09:22:13.0193|DEBUG|OnDoc| +2025-07-28 09:22:13.0786|DEBUG|OnDoc| +2025-07-28 09:24:22.9716|DEBUG|OnDoc| +2025-07-28 09:24:23.0044|DEBUG|OnDoc| +2025-07-28 09:28:24.8824|DEBUG|OnDoc| +2025-07-28 09:28:24.9151|DEBUG|OnDoc| +2025-07-28 09:29:51.4299|DEBUG|OnDoc| +2025-07-28 09:29:51.4299|DEBUG|OnDoc| +2025-07-28 09:29:51.4654|DEBUG|OnDoc|Start GetUnterschriftAsBase64 TGNummer: Stefan Hutter lokal +2025-07-28 09:29:51.4654|INFO|OnDoc|Unterschrift-Bezug: Stefan Hutter lokal +2025-07-28 09:29:51.5406|DEBUG|OnDoc| +2025-07-28 09:29:51.5406|DEBUG|OnDoc| +2025-07-28 09:29:51.5593|DEBUG|OnDoc|TGNummer für Mitarbeiter nicht vorhanden Mitarbeiternr: -1 +2025-07-28 09:34:10.2140|DEBUG|OnDoc| +2025-07-28 09:34:10.2492|DEBUG|OnDoc| +2025-07-28 09:39:23.5501|DEBUG|OnDoc| +2025-07-28 09:39:23.5772|DEBUG|OnDoc| +2025-07-28 10:43:10.4355|DEBUG|OnDoc| +2025-07-28 10:43:10.4681|DEBUG|OnDoc| +2025-07-28 10:45:44.0249|DEBUG|OnDoc| +2025-07-28 10:45:44.0883|DEBUG|OnDoc| +2025-07-28 10:48:29.5509|DEBUG|OnDoc| +2025-07-28 10:48:29.6077|DEBUG|OnDoc| +2025-07-28 12:55:14.5355|DEBUG|OnDoc| +2025-07-28 12:55:14.5676|DEBUG|OnDoc| +2025-07-28 12:55:21.8750|DEBUG|OnDoc| +2025-07-28 12:55:21.9239|DEBUG|OnDoc| +2025-07-28 12:55:21.9837|DEBUG|OnDoc| +2025-07-28 12:55:21.9837|DEBUG|OnDoc| +2025-07-28 12:55:22.0110|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 12:55:22.0110|DEBUG|OnDoc| +2025-07-28 12:55:22.0428|DEBUG|OnDoc| +2025-07-28 12:55:22.0428|DEBUG|OnDoc| +2025-07-28 12:55:22.0428|DEBUG|OnDoc| +2025-07-28 12:55:22.0428|DEBUG|OnDoc| +2025-07-28 12:55:22.0574|DEBUG|OnDoc| +2025-07-28 12:55:22.0574|DEBUG|OnDoc| +2025-07-28 12:55:22.0574|DEBUG|OnDoc| +2025-07-28 12:55:22.0574|DEBUG|OnDoc| +2025-07-28 12:55:22.0988|DEBUG|OnDoc| +2025-07-28 12:55:23.6310|DEBUG|OnDoc|Start Transfer to OnBase +2025-07-28 12:55:23.6404|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Fast +2025-07-28 12:55:23.7965|DEBUG|OnDoc|Ende Transfer to OnBase +2025-07-28 12:55:23.8182|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 12:55:23.8212|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 12:55:23.8212|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 12:55:23.8212|DEBUG|OnDoc| +2025-07-28 12:55:23.8212|DEBUG|OnDoc| +2025-07-28 12:55:23.8212|DEBUG|OnDoc| +2025-07-28 12:55:23.8388|DEBUG|OnDoc| +2025-07-28 12:55:23.8388|DEBUG|OnDoc| +2025-07-28 12:55:23.8583|ERROR|OnDoc|Ungültiger Objektname "edoka_journale.dbo.OnDoc_Wiederbearbietung". +2025-07-28 12:55:23.8583|DEBUG|OnDoc| +2025-07-28 12:55:23.8583|DEBUG|OnDoc| +2025-07-28 12:55:23.8752|ERROR|OnDoc|Falsche Syntax in der Nähe von "OFFEDK0082025002528113". +2025-07-28 14:47:38.0475|DEBUG|OnDoc| +2025-07-28 14:47:38.0803|DEBUG|OnDoc| +2025-07-28 14:47:38.3037|DEBUG|OnDoc| +2025-07-28 14:47:38.3323|DEBUG|OnDoc| +2025-07-28 14:47:38.4193|DEBUG|OnDoc| +2025-07-28 14:47:38.4293|DEBUG|OnDoc| +2025-07-28 14:47:38.4546|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:47:38.4546|DEBUG|OnDoc| +2025-07-28 14:47:38.4895|DEBUG|OnDoc| +2025-07-28 14:47:38.4917|DEBUG|OnDoc| +2025-07-28 14:47:38.4917|DEBUG|OnDoc| +2025-07-28 14:47:38.4917|DEBUG|OnDoc| +2025-07-28 14:47:38.4917|DEBUG|OnDoc| +2025-07-28 14:47:38.4917|DEBUG|OnDoc| +2025-07-28 14:47:38.5083|DEBUG|OnDoc| +2025-07-28 14:47:38.5083|DEBUG|OnDoc| +2025-07-28 14:47:38.5372|DEBUG|OnDoc| +2025-07-28 14:47:40.1092|DEBUG|OnDoc|Start Transfer to OnBase +2025-07-28 14:47:40.1198|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-07-28 14:47:40.3291|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:47:40.3291|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:47:40.3401|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:47:40.3401|DEBUG|OnDoc| +2025-07-28 14:47:40.3401|DEBUG|OnDoc| +2025-07-28 14:47:40.3607|ERROR|OnDoc|Falsche Syntax in der Nähe von "OFFEDK0082025002528113". +2025-07-28 14:49:06.5943|DEBUG|OnDoc| +2025-07-28 14:49:06.6279|DEBUG|OnDoc| +2025-07-28 14:49:06.7405|DEBUG|OnDoc| +2025-07-28 14:49:06.8126|DEBUG|OnDoc| +2025-07-28 14:49:06.9660|DEBUG|OnDoc| +2025-07-28 14:49:06.9660|DEBUG|OnDoc| +2025-07-28 14:49:07.0002|DEBUG|OnDoc|Start ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:49:07.0002|DEBUG|OnDoc| +2025-07-28 14:49:07.0379|DEBUG|OnDoc| +2025-07-28 14:49:07.0404|DEBUG|OnDoc| +2025-07-28 14:49:07.0404|DEBUG|OnDoc| +2025-07-28 14:49:07.0404|DEBUG|OnDoc| +2025-07-28 14:49:07.0404|DEBUG|OnDoc| +2025-07-28 14:49:07.0404|DEBUG|OnDoc| +2025-07-28 14:49:07.0589|DEBUG|OnDoc| +2025-07-28 14:49:07.0589|DEBUG|OnDoc| +2025-07-28 14:49:07.0905|DEBUG|OnDoc| +2025-07-28 14:49:08.6028|DEBUG|OnDoc|Start Transfer to OnBase +2025-07-28 14:49:08.6028|DEBUG|OnDoc|Upload URL:https://localhost:44303/API/Revision +2025-07-28 14:49:08.7517|DEBUG|OnDoc|Ende ArchiveDocFromDatabase: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:49:08.7612|DEBUG|OnDoc|Start Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:49:08.7612|DEBUG|OnDoc|Ende Update IL_Log: DokumentID:OFFEDK0082025002528113 +2025-07-28 14:49:08.7612|DEBUG|OnDoc| +2025-07-28 14:49:08.7612|DEBUG|OnDoc| +2025-07-28 14:49:08.7822|ERROR|OnDoc|Falsche Syntax in der Nähe von "OFFEDK0082025002528113". +2025-07-28 15:01:50.6909|DEBUG|OnDoc| +2025-07-28 15:01:50.7251|DEBUG|OnDoc| +2025-07-28 15:03:10.6622|DEBUG|OnDoc| +2025-07-28 15:03:10.6942|DEBUG|OnDoc| diff --git a/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache b/API_NetFramework/obj/Debug/API_NetFramework.csproj.AssemblyReference.cache index de21ab1c..12e49dc3 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 36cc0963..cef1cca3 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 cd4db32d..40f3bb10 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 3ea5d6d6..7eb6cd8b 100644 --- a/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config +++ b/API_NetFramework/obj/Debug/Package/PackageTmp/Web.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/Model.dll index 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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/OnDoc_NetFramework.dll b/API_NetFramework/obj/Debug/Package/PackageTmp/bin/OnDoc_NetFramework.dll index 4cc87537..75afba79 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 8486c08f..ff43182a 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/TransformWebConfig/original/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config index dabd96f5..65a6dd90 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/original/Web.config @@ -37,6 +37,7 @@ + diff --git a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config index 3ea5d6d6..7eb6cd8b 100644 --- a/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config +++ b/API_NetFramework/obj/Debug/TransformWebConfig/transformed/Web.config @@ -37,6 +37,7 @@ + diff --git a/BarcodeLib/bin/Debug/Model.dll b/BarcodeLib/bin/Debug/Model.dll index 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 41c610f9..ac501d1c 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/App.config b/Client/App.config index 2e2f35c9..4c308606 100644 --- a/Client/App.config +++ b/Client/App.config @@ -58,6 +58,9 @@ E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe + + False + diff --git a/Client/Diverses/SplashScreen.Designer.cs b/Client/Diverses/SplashScreen.Designer.cs index 9a6f3b36..b100d6fd 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(135, 26); this.label2.TabIndex = 2; - this.label2.Text = "27. Juli 2025"; + this.label2.Text = "28. Juli 2025"; this.label2.Click += new System.EventHandler(this.label2_Click); // // SplashScreen diff --git a/Client/Properties/Settings.Designer.cs b/Client/Properties/Settings.Designer.cs index 549d6750..5aa9b05c 100644 --- a/Client/Properties/Settings.Designer.cs +++ b/Client/Properties/Settings.Designer.cs @@ -216,5 +216,17 @@ namespace OnDoc.Properties { this["PrinterSettings"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public string GASSize { + get { + return ((string)(this["GASSize"])); + } + set { + this["GASSize"] = value; + } + } } } diff --git a/Client/Properties/Settings.settings b/Client/Properties/Settings.settings index cbed4d04..d4007fe3 100644 --- a/Client/Properties/Settings.settings +++ b/Client/Properties/Settings.settings @@ -50,5 +50,8 @@ E:\Software-Projekte\TKBDiverse\TKBOfficeLib\PluginStart\bin\Debug\pluginstart.exe + + False + \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.Designer.cs b/Client/Versandstrasse/Versandstrasse.Designer.cs index 86407381..fcf4e915 100644 --- a/Client/Versandstrasse/Versandstrasse.Designer.cs +++ b/Client/Versandstrasse/Versandstrasse.Designer.cs @@ -30,14 +30,14 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Versandstrasse)); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings3 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings3 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings3 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings11 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings11 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings11 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo4 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo1 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); - Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings4 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); - Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings4 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); - Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings4 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); + Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings messageBoxSettings12 = new Syncfusion.Windows.Forms.PdfViewer.MessageBoxSettings(); + Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings pdfViewerPrinterSettings12 = new Syncfusion.Windows.PdfViewer.PdfViewerPrinterSettings(); + Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings textSearchSettings12 = new Syncfusion.Windows.Forms.PdfViewer.TextSearchSettings(); Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo treeNodeAdvStyleInfo2 = new Syncfusion.Windows.Forms.Tools.TreeNodeAdvStyleInfo(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.löschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -49,6 +49,7 @@ this.GrpPaketDetails = new System.Windows.Forms.GroupBox(); this.btnPrepare = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.txtadresse = new System.Windows.Forms.TextBox(); this.treeViewAdvAdresse = new Syncfusion.Windows.Forms.Tools.TreeViewAdv(); @@ -130,7 +131,9 @@ this.progressBar1 = new System.Windows.Forms.ProgressBar(); this.ribbonButton3 = new System.Windows.Forms.RibbonButton(); this.lblserienbrief = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); + this.pnlcouvertgroesse = new System.Windows.Forms.Panel(); + this.rbc5mini = new System.Windows.Forms.RadioButton(); + this.rbc5normal = new System.Windows.Forms.RadioButton(); this.contextMenuStrip1.SuspendLayout(); this.panelPrepare.SuspendLayout(); this.GrpPaketDetails.SuspendLayout(); @@ -151,6 +154,7 @@ this.pnlpostkorb.SuspendLayout(); this.pnlprogress.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).BeginInit(); + this.pnlcouvertgroesse.SuspendLayout(); this.SuspendLayout(); // // contextMenuStrip1 @@ -159,14 +163,14 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.löschenToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(132, 28); + this.contextMenuStrip1.Size = new System.Drawing.Size(119, 26); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); this.contextMenuStrip1.Click += new System.EventHandler(this.contextMenuStrip1_Click); // // löschenToolStripMenuItem // this.löschenToolStripMenuItem.Name = "löschenToolStripMenuItem"; - this.löschenToolStripMenuItem.Size = new System.Drawing.Size(131, 24); + this.löschenToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.löschenToolStripMenuItem.Text = "Löschen"; this.löschenToolStripMenuItem.Click += new System.EventHandler(this.löschenToolStripMenuItem_Click); // @@ -207,7 +211,7 @@ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(198, 28); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(525, 25); + this.label4.Size = new System.Drawing.Size(437, 20); this.label4.TabIndex = 0; this.label4.Text = "Versand wird vorbereit - bitte einen Moment warten...."; this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -223,17 +227,17 @@ this.pdfViewerControl1.IsTextSearchEnabled = true; this.pdfViewerControl1.IsTextSelectionEnabled = true; this.pdfViewerControl1.Location = new System.Drawing.Point(908, 54); - messageBoxSettings3.EnableNotification = true; - this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings3; + messageBoxSettings11.EnableNotification = true; + this.pdfViewerControl1.MessageBoxSettings = messageBoxSettings11; this.pdfViewerControl1.MinimumZoomPercentage = 50; this.pdfViewerControl1.Name = "pdfViewerControl1"; this.pdfViewerControl1.PageBorderThickness = 1; - pdfViewerPrinterSettings3.Copies = 1; - pdfViewerPrinterSettings3.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings3.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings3.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings3.PrintLocation"))); - pdfViewerPrinterSettings3.ShowPrintStatusDialog = true; - this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings3; + pdfViewerPrinterSettings11.Copies = 1; + pdfViewerPrinterSettings11.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings11.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings11.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings11.PrintLocation"))); + pdfViewerPrinterSettings11.ShowPrintStatusDialog = true; + this.pdfViewerControl1.PrinterSettings = pdfViewerPrinterSettings11; this.pdfViewerControl1.ReferencePath = null; this.pdfViewerControl1.ScrollDisplacementValue = 0; this.pdfViewerControl1.ShowHorizontalScrollBar = true; @@ -243,10 +247,10 @@ this.pdfViewerControl1.SpaceBetweenPages = 8; this.pdfViewerControl1.TabIndex = 10; this.pdfViewerControl1.Text = "pdfViewerControl1"; - textSearchSettings3.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings3.HighlightAllInstance = true; - textSearchSettings3.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl1.TextSearchSettings = textSearchSettings3; + textSearchSettings11.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings11.HighlightAllInstance = true; + textSearchSettings11.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl1.TextSearchSettings = textSearchSettings11; this.pdfViewerControl1.ThemeName = "Default"; this.pdfViewerControl1.VerticalScrollOffset = 0; this.pdfViewerControl1.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -283,6 +287,7 @@ // // groupBox3 // + this.groupBox3.Controls.Add(this.pnlcouvertgroesse); this.groupBox3.Controls.Add(this.label5); this.groupBox3.Controls.Add(this.label6); this.groupBox3.Controls.Add(this.txtadresse); @@ -295,12 +300,21 @@ this.groupBox3.TabIndex = 2; this.groupBox3.TabStop = false; // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(3, 36); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(147, 13); + this.label5.TabIndex = 13; + this.label5.Text = "(Rückversand: max. 5 Blätter)"; + // // label6 // this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(267, 41); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(106, 15); + this.label6.Size = new System.Drawing.Size(93, 13); this.label6.TabIndex = 10; this.label6.Text = "Gewählte Adresse"; // @@ -361,9 +375,9 @@ // chkGAS // this.chkGAS.AutoSize = true; - this.chkGAS.Location = new System.Drawing.Point(6, 21); + this.chkGAS.Location = new System.Drawing.Point(6, 13); this.chkGAS.Name = "chkGAS"; - this.chkGAS.Size = new System.Drawing.Size(203, 19); + this.chkGAS.Size = new System.Drawing.Size(181, 17); this.chkGAS.TabIndex = 0; this.chkGAS.Text = "Frankiertes Rückantwortcouvert "; this.chkGAS.UseVisualStyleBackColor = true; @@ -397,7 +411,7 @@ this.txtAnzahlSeiten.Location = new System.Drawing.Point(151, 152); this.txtAnzahlSeiten.Name = "txtAnzahlSeiten"; this.txtAnzahlSeiten.ReadOnly = true; - this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 16); + this.txtAnzahlSeiten.Size = new System.Drawing.Size(265, 13); this.txtAnzahlSeiten.TabIndex = 17; // // txtAnzahlDokumente @@ -407,7 +421,7 @@ this.txtAnzahlDokumente.Location = new System.Drawing.Point(151, 133); this.txtAnzahlDokumente.Name = "txtAnzahlDokumente"; this.txtAnzahlDokumente.ReadOnly = true; - this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 16); + this.txtAnzahlDokumente.Size = new System.Drawing.Size(265, 13); this.txtAnzahlDokumente.TabIndex = 16; // // label15 @@ -416,7 +430,7 @@ this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label15.Location = new System.Drawing.Point(10, 152); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(113, 17); + this.label15.Size = new System.Drawing.Size(89, 13); this.label15.TabIndex = 15; this.label15.Text = "Anzahl Seiten:"; // @@ -426,7 +440,7 @@ this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label14.Location = new System.Drawing.Point(9, 133); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(148, 17); + this.label14.Size = new System.Drawing.Size(117, 13); this.label14.TabIndex = 14; this.label14.Text = "Anzahl Dokumente:"; // @@ -460,7 +474,7 @@ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Location = new System.Drawing.Point(5, 14); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(93, 17); + this.label7.Size = new System.Drawing.Size(72, 13); this.label7.TabIndex = 10; this.label7.Text = "Versandart:"; // @@ -480,7 +494,7 @@ this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(5, 40); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(167, 17); + this.label8.Size = new System.Drawing.Size(132, 13); this.label8.TabIndex = 11; this.label8.Text = "Rückantwort-Adresse:"; // @@ -491,7 +505,7 @@ this.txtVersandoption.Location = new System.Drawing.Point(151, 14); this.txtVersandoption.Name = "txtVersandoption"; this.txtVersandoption.ReadOnly = true; - this.txtVersandoption.Size = new System.Drawing.Size(265, 16); + this.txtVersandoption.Size = new System.Drawing.Size(265, 13); this.txtVersandoption.TabIndex = 12; // // lblprueftext @@ -499,7 +513,7 @@ this.lblprueftext.AutoSize = true; this.lblprueftext.Location = new System.Drawing.Point(10, 174); this.lblprueftext.Name = "lblprueftext"; - this.lblprueftext.Size = new System.Drawing.Size(48, 15); + this.lblprueftext.Size = new System.Drawing.Size(43, 13); this.lblprueftext.TabIndex = 6; this.lblprueftext.Text = "Prüftext"; // @@ -509,7 +523,7 @@ this.btnSendFinal.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSendFinal.Image = ((System.Drawing.Image)(resources.GetObject("btnSendFinal.Image"))); this.btnSendFinal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btnSendFinal.Location = new System.Drawing.Point(199, 234); + this.btnSendFinal.Location = new System.Drawing.Point(212, 240); this.btnSendFinal.Name = "btnSendFinal"; this.btnSendFinal.Size = new System.Drawing.Size(222, 35); this.btnSendFinal.TabIndex = 5; @@ -543,7 +557,7 @@ this.lblprueftextsb2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprueftextsb2.Location = new System.Drawing.Point(9, 184); this.lblprueftextsb2.Name = "lblprueftextsb2"; - this.lblprueftextsb2.Size = new System.Drawing.Size(64, 17); + this.lblprueftextsb2.Size = new System.Drawing.Size(51, 13); this.lblprueftextsb2.TabIndex = 20; this.lblprueftextsb2.Text = "Prüftext"; // @@ -554,7 +568,7 @@ this.txtAnzahlDokumetneSB.Location = new System.Drawing.Point(151, 126); this.txtAnzahlDokumetneSB.Name = "txtAnzahlDokumetneSB"; this.txtAnzahlDokumetneSB.ReadOnly = true; - this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 16); + this.txtAnzahlDokumetneSB.Size = new System.Drawing.Size(265, 13); this.txtAnzahlDokumetneSB.TabIndex = 19; // // txtRückantwortSB @@ -574,7 +588,7 @@ this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label16.Location = new System.Drawing.Point(9, 126); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(148, 17); + this.label16.Size = new System.Drawing.Size(117, 13); this.label16.TabIndex = 18; this.label16.Text = "Anzahl Dokumente:"; // @@ -584,7 +598,7 @@ this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label9.Location = new System.Drawing.Point(6, 7); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(93, 17); + this.label9.Size = new System.Drawing.Size(72, 13); this.label9.TabIndex = 14; this.label9.Text = "Versandart:"; // @@ -594,7 +608,7 @@ this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label10.Location = new System.Drawing.Point(6, 33); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(167, 17); + this.label10.Size = new System.Drawing.Size(132, 13); this.label10.TabIndex = 15; this.label10.Text = "Rückantwort-Adresse:"; // @@ -605,7 +619,7 @@ this.txtversandartsb.Location = new System.Drawing.Point(152, 7); this.txtversandartsb.Name = "txtversandartsb"; this.txtversandartsb.ReadOnly = true; - this.txtversandartsb.Size = new System.Drawing.Size(265, 16); + this.txtversandartsb.Size = new System.Drawing.Size(265, 13); this.txtversandartsb.TabIndex = 16; // // btnsendserienbrief @@ -638,7 +652,7 @@ this.lblprueftextSB.AutoSize = true; this.lblprueftextSB.Location = new System.Drawing.Point(9, 154); this.lblprueftextSB.Name = "lblprueftextSB"; - this.lblprueftextSB.Size = new System.Drawing.Size(48, 15); + this.lblprueftextSB.Size = new System.Drawing.Size(43, 13); this.lblprueftextSB.TabIndex = 6; this.lblprueftextSB.Text = "Prüftext"; // @@ -664,7 +678,7 @@ this.rbb1post.Checked = true; this.rbb1post.Location = new System.Drawing.Point(74, 21); this.rbb1post.Name = "rbb1post"; - this.rbb1post.Size = new System.Drawing.Size(71, 19); + this.rbb1post.Size = new System.Drawing.Size(62, 17); this.rbb1post.TabIndex = 5; this.rbb1post.TabStop = true; this.rbb1post.Text = "B1-Post"; @@ -676,7 +690,7 @@ this.rbb2post.AutoSize = true; this.rbb2post.Location = new System.Drawing.Point(6, 21); this.rbb2post.Name = "rbb2post"; - this.rbb2post.Size = new System.Drawing.Size(71, 19); + this.rbb2post.Size = new System.Drawing.Size(62, 17); this.rbb2post.TabIndex = 4; this.rbb2post.Text = "B2-Post"; this.rbb2post.UseVisualStyleBackColor = true; @@ -687,7 +701,7 @@ this.rbversandoption3.AutoSize = true; this.rbversandoption3.Location = new System.Drawing.Point(222, 21); this.rbversandoption3.Name = "rbversandoption3"; - this.rbversandoption3.Size = new System.Drawing.Size(238, 19); + this.rbversandoption3.Size = new System.Drawing.Size(207, 17); this.rbversandoption3.TabIndex = 2; this.rbversandoption3.Text = "Hauptadresse, Postversand erzwingen"; this.rbversandoption3.UseVisualStyleBackColor = true; @@ -698,7 +712,7 @@ this.rbapost.AutoSize = true; this.rbapost.Location = new System.Drawing.Point(142, 21); this.rbapost.Name = "rbapost"; - this.rbapost.Size = new System.Drawing.Size(63, 19); + this.rbapost.Size = new System.Drawing.Size(56, 17); this.rbapost.TabIndex = 3; this.rbapost.Text = "A-Post"; this.rbapost.UseVisualStyleBackColor = true; @@ -709,7 +723,7 @@ this.rbversandoption2.AutoSize = true; this.rbversandoption2.Location = new System.Drawing.Point(222, 21); this.rbversandoption2.Name = "rbversandoption2"; - this.rbversandoption2.Size = new System.Drawing.Size(228, 19); + this.rbversandoption2.Size = new System.Drawing.Size(197, 17); this.rbversandoption2.TabIndex = 1; this.rbversandoption2.Text = "Hauptadresse, E-Banking erzwingen"; this.rbversandoption2.UseVisualStyleBackColor = true; @@ -720,7 +734,7 @@ this.rbversandoption1.AutoSize = true; this.rbversandoption1.Location = new System.Drawing.Point(222, 21); this.rbversandoption1.Name = "rbversandoption1"; - this.rbversandoption1.Size = new System.Drawing.Size(191, 19); + this.rbversandoption1.Size = new System.Drawing.Size(166, 17); this.rbversandoption1.TabIndex = 0; this.rbversandoption1.Text = "Hauptadresse und Versandart"; this.rbversandoption1.UseVisualStyleBackColor = true; @@ -766,7 +780,7 @@ this.treeViewAdv1.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdv1.HelpTextControl.Name = "helpText"; - this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(55, 17); + this.treeViewAdv1.HelpTextControl.Size = new System.Drawing.Size(49, 15); this.treeViewAdv1.HelpTextControl.TabIndex = 0; this.treeViewAdv1.HelpTextControl.Text = "help text"; this.treeViewAdv1.HideSelection = false; @@ -803,7 +817,7 @@ this.treeViewAdv1.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdv1.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdv1.ToolTipControl.Name = "toolTip"; - this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(46, 17); + this.treeViewAdv1.ToolTipControl.Size = new System.Drawing.Size(41, 15); this.treeViewAdv1.ToolTipControl.TabIndex = 1; this.treeViewAdv1.ToolTipControl.Text = "toolTip"; this.treeViewAdv1.TransparentControls = true; @@ -825,17 +839,17 @@ this.pdfViewerControl2.IsTextSearchEnabled = true; this.pdfViewerControl2.IsTextSelectionEnabled = true; this.pdfViewerControl2.Location = new System.Drawing.Point(482, 0); - messageBoxSettings4.EnableNotification = true; - this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings4; + messageBoxSettings12.EnableNotification = true; + this.pdfViewerControl2.MessageBoxSettings = messageBoxSettings12; this.pdfViewerControl2.MinimumZoomPercentage = 50; this.pdfViewerControl2.Name = "pdfViewerControl2"; this.pdfViewerControl2.PageBorderThickness = 1; - pdfViewerPrinterSettings4.Copies = 1; - pdfViewerPrinterSettings4.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; - pdfViewerPrinterSettings4.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; - pdfViewerPrinterSettings4.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings4.PrintLocation"))); - pdfViewerPrinterSettings4.ShowPrintStatusDialog = true; - this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings4; + pdfViewerPrinterSettings12.Copies = 1; + pdfViewerPrinterSettings12.PageOrientation = Syncfusion.Windows.PdfViewer.PdfViewerPrintOrientation.Auto; + pdfViewerPrinterSettings12.PageSize = Syncfusion.Windows.PdfViewer.PdfViewerPrintSize.ActualSize; + pdfViewerPrinterSettings12.PrintLocation = ((System.Drawing.PointF)(resources.GetObject("pdfViewerPrinterSettings12.PrintLocation"))); + pdfViewerPrinterSettings12.ShowPrintStatusDialog = true; + this.pdfViewerControl2.PrinterSettings = pdfViewerPrinterSettings12; this.pdfViewerControl2.ReferencePath = null; this.pdfViewerControl2.ScrollDisplacementValue = 0; this.pdfViewerControl2.ShowHorizontalScrollBar = true; @@ -845,10 +859,10 @@ this.pdfViewerControl2.SpaceBetweenPages = 8; this.pdfViewerControl2.TabIndex = 11; this.pdfViewerControl2.Text = "pdfViewerControl2"; - textSearchSettings4.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); - textSearchSettings4.HighlightAllInstance = true; - textSearchSettings4.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); - this.pdfViewerControl2.TextSearchSettings = textSearchSettings4; + textSearchSettings12.CurrentInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(171)))), ((int)(((byte)(64))))); + textSearchSettings12.HighlightAllInstance = true; + textSearchSettings12.OtherInstanceColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(254)))), ((int)(((byte)(255)))), ((int)(((byte)(0))))); + this.pdfViewerControl2.TextSearchSettings = textSearchSettings12; this.pdfViewerControl2.ThemeName = "Default"; this.pdfViewerControl2.VerticalScrollOffset = 0; this.pdfViewerControl2.VisualStyle = Syncfusion.Windows.Forms.PdfViewer.VisualStyle.Default; @@ -892,7 +906,7 @@ this.textBox4.Location = new System.Drawing.Point(156, 165); this.textBox4.Name = "textBox4"; this.textBox4.ReadOnly = true; - this.textBox4.Size = new System.Drawing.Size(265, 16); + this.textBox4.Size = new System.Drawing.Size(265, 13); this.textBox4.TabIndex = 25; // // label17 @@ -901,7 +915,7 @@ this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label17.Location = new System.Drawing.Point(12, 165); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(113, 17); + this.label17.Size = new System.Drawing.Size(89, 13); this.label17.TabIndex = 24; this.label17.Text = "Anzahl Seiten:"; // @@ -912,7 +926,7 @@ this.textBox3.Location = new System.Drawing.Point(156, 141); this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; - this.textBox3.Size = new System.Drawing.Size(265, 16); + this.textBox3.Size = new System.Drawing.Size(265, 13); this.textBox3.TabIndex = 23; // // label13 @@ -921,7 +935,7 @@ this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.Location = new System.Drawing.Point(12, 141); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(148, 17); + this.label13.Size = new System.Drawing.Size(117, 13); this.label13.TabIndex = 22; this.label13.Text = "Anzahl Dokumente:"; // @@ -942,7 +956,7 @@ this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label11.Location = new System.Drawing.Point(10, 19); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(93, 17); + this.label11.Size = new System.Drawing.Size(72, 13); this.label11.TabIndex = 18; this.label11.Text = "Versandart:"; // @@ -952,7 +966,7 @@ this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label12.Location = new System.Drawing.Point(10, 45); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(167, 17); + this.label12.Size = new System.Drawing.Size(132, 13); this.label12.TabIndex = 19; this.label12.Text = "Rückantwort-Adresse:"; // @@ -963,7 +977,7 @@ this.textBox2.Location = new System.Drawing.Point(156, 19); this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(265, 16); + this.textBox2.Size = new System.Drawing.Size(265, 13); this.textBox2.TabIndex = 20; // // treeViewAdvCouverts @@ -996,7 +1010,7 @@ this.treeViewAdvCouverts.HelpTextControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.HelpTextControl.Location = new System.Drawing.Point(732, 0); this.treeViewAdvCouverts.HelpTextControl.Name = "helpText"; - this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(55, 17); + this.treeViewAdvCouverts.HelpTextControl.Size = new System.Drawing.Size(49, 15); this.treeViewAdvCouverts.HelpTextControl.TabIndex = 0; this.treeViewAdvCouverts.HelpTextControl.Text = "help text"; this.treeViewAdvCouverts.HideSelection = false; @@ -1033,7 +1047,7 @@ this.treeViewAdvCouverts.ToolTipControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.treeViewAdvCouverts.ToolTipControl.Location = new System.Drawing.Point(642, 0); this.treeViewAdvCouverts.ToolTipControl.Name = "toolTip"; - this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(46, 17); + this.treeViewAdvCouverts.ToolTipControl.Size = new System.Drawing.Size(41, 15); this.treeViewAdvCouverts.ToolTipControl.TabIndex = 1; this.treeViewAdvCouverts.ToolTipControl.Text = "toolTip"; this.treeViewAdvCouverts.TransparentControls = true; @@ -1046,19 +1060,19 @@ this.versandCouvertLöschenToolStripMenuItem, this.versandCouvertÖffnenbearbeitenToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; - this.contextMenuStrip2.Size = new System.Drawing.Size(313, 52); + this.contextMenuStrip2.Size = new System.Drawing.Size(262, 48); // // versandCouvertLöschenToolStripMenuItem // this.versandCouvertLöschenToolStripMenuItem.Name = "versandCouvertLöschenToolStripMenuItem"; - this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); + this.versandCouvertLöschenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); this.versandCouvertLöschenToolStripMenuItem.Text = "Versand-Couvert löschen"; this.versandCouvertLöschenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertLöschenToolStripMenuItem_Click); // // versandCouvertÖffnenbearbeitenToolStripMenuItem // this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Name = "versandCouvertÖffnenbearbeitenToolStripMenuItem"; - this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(312, 24); + this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Size = new System.Drawing.Size(261, 22); this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Text = "Versand-Couvert öffnen/bearbeiten"; this.versandCouvertÖffnenbearbeitenToolStripMenuItem.Click += new System.EventHandler(this.versandCouvertÖffnenbearbeitenToolStripMenuItem_Click); // @@ -1195,7 +1209,7 @@ this.lblprieveiwbezeichnung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblprieveiwbezeichnung.Location = new System.Drawing.Point(7, 16); this.lblprieveiwbezeichnung.Name = "lblprieveiwbezeichnung"; - this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 25); + this.lblprieveiwbezeichnung.Size = new System.Drawing.Size(0, 20); this.lblprieveiwbezeichnung.TabIndex = 0; // // panel2 @@ -1253,7 +1267,7 @@ this.lblpostausgang.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblpostausgang.Location = new System.Drawing.Point(1238, 49); this.lblpostausgang.Name = "lblpostausgang"; - this.lblpostausgang.Size = new System.Drawing.Size(166, 25); + this.lblpostausgang.Size = new System.Drawing.Size(135, 20); this.lblpostausgang.TabIndex = 24; this.lblpostausgang.Text = "labelpostausgang"; this.lblpostausgang.Visible = false; @@ -1278,7 +1292,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(9, 22); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(163, 15); + this.label1.Size = new System.Drawing.Size(143, 13); this.label1.TabIndex = 21; this.label1.Text = "Fortschritt Dokumentversand"; // @@ -1312,7 +1326,7 @@ this.lblProgressTitel.AutoSize = true; this.lblProgressTitel.Location = new System.Drawing.Point(12, 9); this.lblProgressTitel.Name = "lblProgressTitel"; - this.lblProgressTitel.Size = new System.Drawing.Size(0, 15); + this.lblProgressTitel.Size = new System.Drawing.Size(0, 13); this.lblProgressTitel.TabIndex = 19; // // label3 @@ -1320,7 +1334,7 @@ this.label3.AutoSize = true; this.label3.Location = new System.Drawing.Point(435, 78); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(28, 15); + this.label3.Size = new System.Drawing.Size(25, 13); this.label3.TabIndex = 18; this.label3.Text = "100"; // @@ -1329,7 +1343,7 @@ this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(12, 78); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(14, 15); + this.label2.Size = new System.Drawing.Size(13, 13); this.label2.TabIndex = 17; this.label2.Text = "0"; // @@ -1354,19 +1368,42 @@ this.lblserienbrief.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblserienbrief.Location = new System.Drawing.Point(1236, 48); this.lblserienbrief.Name = "lblserienbrief"; - this.lblserienbrief.Size = new System.Drawing.Size(125, 25); + this.lblserienbrief.Size = new System.Drawing.Size(101, 20); this.lblserienbrief.TabIndex = 26; this.lblserienbrief.Text = "lblSerienbrief"; this.lblserienbrief.Visible = false; // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(24, 41); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(167, 15); - this.label5.TabIndex = 13; - this.label5.Text = "(Rückversand: max. 5 Blätter)"; + // pnlcouvertgroesse + // + this.pnlcouvertgroesse.Controls.Add(this.rbc5normal); + this.pnlcouvertgroesse.Controls.Add(this.rbc5mini); + this.pnlcouvertgroesse.Location = new System.Drawing.Point(2, 33); + this.pnlcouvertgroesse.Name = "pnlcouvertgroesse"; + this.pnlcouvertgroesse.Size = new System.Drawing.Size(260, 21); + this.pnlcouvertgroesse.TabIndex = 14; + this.pnlcouvertgroesse.Visible = false; + // + // rbc5mini + // + this.rbc5mini.AutoSize = true; + this.rbc5mini.Location = new System.Drawing.Point(5, 2); + this.rbc5mini.Name = "rbc5mini"; + this.rbc5mini.Size = new System.Drawing.Size(115, 17); + this.rbc5mini.TabIndex = 0; + this.rbc5mini.TabStop = true; + this.rbc5mini.Text = "C5 Mini (bis 5 Blatt)"; + this.rbc5mini.UseVisualStyleBackColor = true; + // + // rbc5normal + // + this.rbc5normal.AutoSize = true; + this.rbc5normal.Location = new System.Drawing.Point(123, 2); + this.rbc5normal.Name = "rbc5normal"; + this.rbc5normal.Size = new System.Drawing.Size(135, 17); + this.rbc5normal.TabIndex = 1; + this.rbc5normal.TabStop = true; + this.rbc5normal.Text = "C5 Normal (bis 15 Blatt)"; + this.rbc5normal.UseVisualStyleBackColor = true; // // Versandstrasse // @@ -1418,6 +1455,8 @@ this.pnlprogress.ResumeLayout(false); this.pnlprogress.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.progressBarAdv1)).EndInit(); + this.pnlcouvertgroesse.ResumeLayout(false); + this.pnlcouvertgroesse.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -1517,5 +1556,8 @@ private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.Label lblserienbrief; private System.Windows.Forms.Label label5; + private System.Windows.Forms.Panel pnlcouvertgroesse; + private System.Windows.Forms.RadioButton rbc5normal; + private System.Windows.Forms.RadioButton rbc5mini; } } \ No newline at end of file diff --git a/Client/Versandstrasse/Versandstrasse.cs b/Client/Versandstrasse/Versandstrasse.cs index a7f1aaed..ae28d256 100644 --- a/Client/Versandstrasse/Versandstrasse.cs +++ b/Client/Versandstrasse/Versandstrasse.cs @@ -117,7 +117,20 @@ namespace OnDoc.Versandstrasse private void Versandstrasse_Load(object sender, EventArgs e) { - + + if (Properties.Settings.Default.GASSize == "True") + { + this.label5.Visible = false; + this.pnlcouvertgroesse.Visible = true; + this.pnlcouvertgroesse.Enabled= false; + this.rbc5mini.Checked = true; + this.rbc5normal.Checked = false; + } + else + { + this.label5.Visible = true; + this.pnlcouvertgroesse.Visible = false; + } Reload_Tree(); load_adressen(); @@ -677,6 +690,7 @@ namespace OnDoc.Versandstrasse newpaket.Versandoption = "B2_POST"; newpaket.GAS = ""; newpaket.GASAdresse = ""; + newpaket.GASSize = ""; newpaket.Mitteilung = ""; newpaket.Dokument = new List(); @@ -857,6 +871,7 @@ namespace OnDoc.Versandstrasse Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; vp.GAS = "1"; treeViewAdv1.SelectedNode.TagObject = vp; + this.pnlcouvertgroesse.Enabled = true; } else { @@ -865,6 +880,7 @@ namespace OnDoc.Versandstrasse Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; vp.GAS = ""; treeViewAdv1.SelectedNode.TagObject = vp; + this.pnlcouvertgroesse.Enabled = false; } } @@ -883,9 +899,18 @@ namespace OnDoc.Versandstrasse if (serienbrief) { Versandpaket svp = treeViewAdv1.Nodes[0].TagObject as Versandpaket; + if (Properties.Settings.Default.GASSize == "True") + { + if (rbc5mini.Checked) { svp.GASSize = "C5mini"; } + if (rbc5normal.Checked) { svp.GASSize = "C5normal"; } + } + else + { + svp.GASSize = ""; + } foreach (TreeNodeAdv node in treeViewAdv1.Nodes[0].Nodes) { - + svp.finaldoc = node.TagObject.ToString(); svp.send_onbase_doc = true; string dokumentid = node.Text.Substring(node.Text.Length-23, 22); @@ -932,6 +957,15 @@ namespace OnDoc.Versandstrasse panelVerify.Visible = false; Versandpaket vp = treeViewAdv1.SelectedNode.TagObject as Versandpaket; List vdl = new List(); + if (Properties.Settings.Default.GASSize == "True") + { + if (rbc5mini.Checked) { vp.GASSize = "C5mini"; } + if (rbc5normal.Checked) { vp.GASSize = "C5normal"; } + } + else + { + vp.GASSize = ""; + } foreach (TreeNodeAdv node in treeViewAdv1.SelectedNode.Nodes) { foreach(Versanddokument vdok in vp.Dokument) @@ -1442,6 +1476,7 @@ namespace OnDoc.Versandstrasse newpaket.Versandoption = "B2_POST"; newpaket.GAS = ""; newpaket.GASAdresse = ""; + newpaket.GASSize = ""; newpaket.Mitteilung = ""; newpaket.Dokument = new List(); @@ -1563,6 +1598,7 @@ namespace OnDoc.Versandstrasse vp.Mitteilung = ""; vp.GAS = ""; vp.GASAdresse = ""; + vp.GASSize = ""; vp.PaketNr = Guid.NewGuid().ToString(); vp.Dokument.Add(vs); diff --git a/Client/Versandstrasse/Versandstrasse.resx b/Client/Versandstrasse/Versandstrasse.resx index 51d845f8..b8f9d1ef 100644 --- a/Client/Versandstrasse/Versandstrasse.resx +++ b/Client/Versandstrasse/Versandstrasse.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 - DAAAAk1TRnQBSQFMAgEBBgEAARgBAQEYAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBgEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -194,7 +194,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - DAAAAk1TRnQBSQFMAgEBBQEAASABAQEgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DAAAAk1TRnQBSQFMAgEBBQEAASgBAQEoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -248,7 +248,7 @@ AYABAQIAAeABBwHAAQMBwAEDAgAB8AEPAfABDwHwAQ8BgAEBCw== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -337,7 +337,7 @@ /wM19F1wo1uqCAAAAABJRU5ErkJggg== - + AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABVTeXN0ZW0uRHJh @@ -355,7 +355,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq - CQAAAk1TRnQBSQFMAgEBAwEAAeABAAHgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAegBAAHoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Client/bin/Debug/Model.dll b/Client/bin/Debug/Model.dll index 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 93d8442d..e733345a 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 dc1662ec..a5446a05 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 b797709a..bc69e496 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 0878eea8..b83c42cb 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 4480416c..e0d70c08 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/DesignTimeResolveAssemblyReferences.cache b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 5a13ae12..a7dfa560 100644 Binary files a/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources index b805fa5c..52db0f08 100644 Binary files a/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources and b/Client/obj/Debug/OnDoc.Versandstrasse.Versandstrasse.resources differ diff --git a/Client/obj/Debug/OnDoc.exe b/Client/obj/Debug/OnDoc.exe index 93d8442d..e733345a 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 dc1662ec..a5446a05 100644 Binary files a/Client/obj/Debug/OnDoc.pdb and b/Client/obj/Debug/OnDoc.pdb differ diff --git a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 510dca0a..36bdeb85 100644 Binary files a/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Client/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/Client/obj/Debug/de-DE/OnDoc.resources.dll b/Client/obj/Debug/de-DE/OnDoc.resources.dll index 0878eea8..b83c42cb 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 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 a4b9b0ea..2e6782d6 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 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 3da36240..8e03a997 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/VersandstrassePaket.cs b/Model/VersandstrassePaket.cs index 117df0c7..03ff8f27 100644 --- a/Model/VersandstrassePaket.cs +++ b/Model/VersandstrassePaket.cs @@ -14,6 +14,7 @@ namespace Model public string Mitteilung { get; set; } public string GAS { get; set; } public string GASAdresse { get; set; } + public string GASSize { get; set; } public bool verified { get; set; } = false; public int partnernr { get; set; } = 0; public bool send_onbase_doc { get; set; } @@ -61,6 +62,7 @@ namespace Model public string DocumentHandle { get; set; } = ""; public string DistributionOption { get; set; } = ""; public string GASCouvert { get; set; } = ""; + public string GASSize { get; set; } = ""; public string Returnaddress { get; set; } = ""; public string O2ODochandle { get; set; } = ""; public string Status { get; set; } = ""; diff --git a/Model/bin/Debug/Model.dll b/Model/bin/Debug/Model.dll index 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 63891e80..a7ddfef2 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 72f834e9..8fd925c2 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 3fef8ecf..b9517670 100644 Binary files a/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache and b/OnDocOffice/obj/Debug/OnDocOffice.csproj.AssemblyReference.cache differ diff --git a/OnDoc_Paketversand/Program.cs b/OnDoc_Paketversand/Program.cs index 8191e984..9042d3ee 100644 --- a/OnDoc_Paketversand/Program.cs +++ b/OnDoc_Paketversand/Program.cs @@ -12,6 +12,7 @@ using System.Security.Cryptography; using Newtonsoft.Json; using System.Net.Mail; using System.Net.Http; +using System.Diagnostics; @@ -63,6 +64,7 @@ namespace OnDoc_Paketversand Model.Versandpaket vp = JsonConvert.DeserializeObject(dr[1].ToString()); Logging.VersandstrasseLog.Info("Paket-Verarbeitung", "OnDoc-Paketversand", paketid, vp.partnernr.ToString(), "Start Versand"); string jsonstring = dr[1].ToString(); + Console.WriteLine(jsonstring); string URL = URLBase + dr[0].ToString(); WebRequest request; var data = Encoding.UTF8.GetBytes(jsonstring); diff --git a/OnDoc_Paketversand/VersandstrassePaket.cs b/OnDoc_Paketversand/VersandstrassePaket.cs index 117df0c7..97f283ff 100644 --- a/OnDoc_Paketversand/VersandstrassePaket.cs +++ b/OnDoc_Paketversand/VersandstrassePaket.cs @@ -11,9 +11,10 @@ namespace Model public string bezeichnung { get; set; } public string PaketNr { get; set; } public string Versandoption { get; set; } - public string Mitteilung { get; set; } + public string Mitteilung { get; set; } = ""; public string GAS { get; set; } public string GASAdresse { get; set; } + public string GASSize { get; set; } public bool verified { get; set; } = false; public int partnernr { get; set; } = 0; public bool send_onbase_doc { get; set; } diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe index 107438cb..e4119348 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb index 5980b086..3fa88ff2 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.pdb differ diff --git a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip index ad24599a..04621877 100644 Binary files a/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip and b/OnDoc_Paketversand/bin/Debug/OnDoc_Paketversand.zip differ diff --git a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache index b07f4dab..43039db2 100644 Binary files a/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/OnDoc_Paketversand/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache index 4f3b02c2..2cc02110 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.csproj.AssemblyReference.cache differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe index 107438cb..e4119348 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.exe differ diff --git a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb index 5980b086..3fa88ff2 100644 Binary files a/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb and b/OnDoc_Paketversand/obj/Debug/OnDoc_Paketversand.pdb differ