From 2a4796daf43189a9d509dbbea77eae1e5c3762d8 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 16 May 2022 08:29:17 +0200 Subject: [PATCH] =?UTF-8?q?Nuget=20update=20f=C3=BCr=20log4net,=20beim=20T?= =?UTF-8?q?ext-Einlesen=20aus=20Dakosy=20verhindern,=20dass=20man=20Whites?= =?UTF-8?q?pace=20liest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI2/Excel/ExcelReader.cs | 4 +++- SendNSWMessageService/SendNSWMessageService.csproj | 4 ++-- SendNSWMessageService/packages.config | 2 +- bsmd.dakosy/bsmd.dakosy.csproj | 4 ++-- bsmd.dakosy/packages.config | 2 +- bsmd.database/RuleEngine.cs | 2 +- bsmd.dbh/bsmd.dbh.csproj | 4 ++-- bsmd.dbh/packages.config | 2 +- bsmd.hisnord/Request.cs | 3 ++- bsmd.hisnord/bsmd.hisnord.csproj | 4 ++-- bsmd.hisnord/packages.config | 2 +- bsmd.status/bsmd.status.csproj | 4 ++-- bsmd.status/packages.config | 2 +- 13 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs index 0e91a001..ef59ed1e 100644 --- a/ENI2/Excel/ExcelReader.cs +++ b/ENI2/Excel/ExcelReader.cs @@ -566,7 +566,9 @@ namespace ENI2.Excel try { Worksheet workSheet = (Worksheet) _workBook.Worksheets[sheetName]; - string result = workSheet.Range[range].Text.ToString(); + string result = workSheet.Range[range].Text.ToString(); + if (!result.IsNullOrEmpty()) + result = result.Trim(); return result; } catch(Exception e) diff --git a/SendNSWMessageService/SendNSWMessageService.csproj b/SendNSWMessageService/SendNSWMessageService.csproj index ef211db2..00464ad5 100644 --- a/SendNSWMessageService/SendNSWMessageService.csproj +++ b/SendNSWMessageService/SendNSWMessageService.csproj @@ -40,8 +40,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/SendNSWMessageService/packages.config b/SendNSWMessageService/packages.config index 518cdea0..e788d34b 100644 --- a/SendNSWMessageService/packages.config +++ b/SendNSWMessageService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/bsmd.dakosy/bsmd.dakosy.csproj b/bsmd.dakosy/bsmd.dakosy.csproj index 20f1f281..d6c86e61 100644 --- a/bsmd.dakosy/bsmd.dakosy.csproj +++ b/bsmd.dakosy/bsmd.dakosy.csproj @@ -38,8 +38,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/bsmd.dakosy/packages.config b/bsmd.dakosy/packages.config index 518cdea0..e788d34b 100644 --- a/bsmd.dakosy/packages.config +++ b/bsmd.dakosy/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/bsmd.database/RuleEngine.cs b/bsmd.database/RuleEngine.cs index 67d8efd0..43918205 100644 --- a/bsmd.database/RuleEngine.cs +++ b/bsmd.database/RuleEngine.cs @@ -204,7 +204,7 @@ namespace bsmd.database if (Attribute.IsDefined(property, typeof(MaxLengthAttribute))) { MaxLengthAttribute mla = Attribute.GetCustomAttribute(property, typeof(MaxLengthAttribute)) as MaxLengthAttribute; - bool isStandardML = ((mla.MaxLength == 99) || (mla.MaxLength == 100)); + bool isStandardML = (mla.MaxLength == 99) || (mla.MaxLength == 100); if((value.Length >= 90) && ((mla.MaxLength == value.Length) || isStandardML)) { // put out a warning this might be truncated diff --git a/bsmd.dbh/bsmd.dbh.csproj b/bsmd.dbh/bsmd.dbh.csproj index 93046fe2..513cc2c5 100644 --- a/bsmd.dbh/bsmd.dbh.csproj +++ b/bsmd.dbh/bsmd.dbh.csproj @@ -38,8 +38,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/bsmd.dbh/packages.config b/bsmd.dbh/packages.config index 518cdea0..e788d34b 100644 --- a/bsmd.dbh/packages.config +++ b/bsmd.dbh/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/bsmd.hisnord/Request.cs b/bsmd.hisnord/Request.cs index 843eaa00..9bf1c726 100644 --- a/bsmd.hisnord/Request.cs +++ b/bsmd.hisnord/Request.cs @@ -705,7 +705,8 @@ namespace bsmd.hisnord if (ladg.CargoLACode.HasValue) lu.CargoLACode = ladg.CargoLACode.Value.ToString(); lu.CargoCodeNST = ladg.CargoCodeNST; - lu.CargoCodeNST_3 = ladg.CargoCodeNST_3; + if(!ladg.CargoCodeNST_3.IsNullOrEmpty()) + lu.CargoCodeNST_3 = ladg.CargoCodeNST_3; if ((ladg.CargoNumberOfItems ?? 0) > 0) lu.CargoNumberOfItems = ladg.CargoNumberOfItems.Value.ToString(); if (ladg.CargoGrossQuantity_TNE.HasValue) diff --git a/bsmd.hisnord/bsmd.hisnord.csproj b/bsmd.hisnord/bsmd.hisnord.csproj index a5779a16..a61b8cb5 100644 --- a/bsmd.hisnord/bsmd.hisnord.csproj +++ b/bsmd.hisnord/bsmd.hisnord.csproj @@ -38,8 +38,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/bsmd.hisnord/packages.config b/bsmd.hisnord/packages.config index 518cdea0..e788d34b 100644 --- a/bsmd.hisnord/packages.config +++ b/bsmd.hisnord/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/bsmd.status/bsmd.status.csproj b/bsmd.status/bsmd.status.csproj index f6e275af..d999c9aa 100644 --- a/bsmd.status/bsmd.status.csproj +++ b/bsmd.status/bsmd.status.csproj @@ -38,8 +38,8 @@ ..\bsmdKey.snk - - ..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/bsmd.status/packages.config b/bsmd.status/packages.config index 518cdea0..e788d34b 100644 --- a/bsmd.status/packages.config +++ b/bsmd.status/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file