From efba8793e947e18a6012252ae3198e482830dd40 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 7 Feb 2022 08:08:01 +0100 Subject: [PATCH] =?UTF-8?q?Enum=20lookup=20fix=20f=C3=BCr=20den=20Export,?= =?UTF-8?q?=20Locode=20Lookup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI2/App.config | 6 ++++-- ENI2/Excel/ExcelUtil.cs | 4 ++-- ENI2/Excel/ExcelWriter.cs | 12 +++++++++++- bsmd.ExcelReadService/LocodeDB.cs | 3 ++- bsmd.database/Properties/AssemblyProductInfo.cs | 2 +- bsmd.database/Properties/AssemblyProjectInfo.cs | 2 +- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ENI2/App.config b/ENI2/App.config index 6105b6f2..79935b33 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -26,10 +26,12 @@ 1000 - http://192.168.2.24/LockingService/LockingService.svc + http://heupferd/bsmd.LockingService/LockingService.svc + - Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + + Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index 4ad75360..affec105 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -981,7 +981,7 @@ namespace ENI2.Excel } } - string lastPort = reader.ReadText("NOA_NOD.LastPort")?.Trim().ToUpper(); + string lastPort = reader.ReadText("NOA_NOD.LastPort")?.Trim(); if (lastPort != null) { @@ -999,7 +999,7 @@ namespace ENI2.Excel } } - string nextPort = reader.ReadText("NOA_NOD.NextPort")?.Trim().ToUpper(); + string nextPort = reader.ReadText("NOA_NOD.NextPort")?.Trim(); if (!nextPort.IsNullOrEmpty() && (nextPort.Length > 5)) nextPort = nextPort.Substring(0, 5); //trunc diff --git a/ENI2/Excel/ExcelWriter.cs b/ENI2/Excel/ExcelWriter.cs index b2aec87b..f559a7d8 100644 --- a/ENI2/Excel/ExcelWriter.cs +++ b/ENI2/Excel/ExcelWriter.cs @@ -936,7 +936,17 @@ namespace ENI2.Excel if (wasMessage.Elements.Count == 0) return; WAS was = wasMessage.Elements[0] as WAS; - WriteText("WAS.WasteDisposalDelivery", was.WasteDisposalDelivery); + if (was.WasteDisposalDelivery.HasValue) + { + switch (was.WasteDisposalDelivery) + { + case 0: WriteText("WAS.WasteDisposalDelivery", "ALL"); break; + case 1: WriteText("WAS.WasteDisposalDelivery", "SOME"); break; + case 2: WriteText("WAS.WasteDisposalDelivery", "NONE"); break; + default: break; + } + } + WriteText("WAS.LastWasteDisposalPort", was.LastWasteDisposalPort); WriteText("WAS.WasteDisposalServiceProviderName", was.WasteDisposalServiceProviderText); diff --git a/bsmd.ExcelReadService/LocodeDB.cs b/bsmd.ExcelReadService/LocodeDB.cs index 43b23ed8..03c5d997 100644 --- a/bsmd.ExcelReadService/LocodeDB.cs +++ b/bsmd.ExcelReadService/LocodeDB.cs @@ -157,8 +157,9 @@ namespace ENI2.Locode string result = null; try { + string locodeUpper = locode.ToUpper(); string query = string.Format("SELECT locodes.name_wo_diacritics FROM locodes JOIN countries ON locodes.country_id = countries.ID WHERE locodes.port='t' AND locodes.city_code = '{0}' AND countries.code = '{1}'", - locode.Substring(2), locode.Substring(0, 2)); + locodeUpper.Substring(2), locodeUpper.Substring(0, 2)); SQLiteCommand cmd = new SQLiteCommand(query, _con); IDataReader reader = cmd.ExecuteReader(); while (reader.Read()) diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index fc7a30d6..d75bc72e 100644 --- a/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("6.9.16")] +[assembly: AssemblyInformationalVersion("6.9.17")] [assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs index 94bf1f33..d37b6f2e 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.9.16.*")] +[assembly: AssemblyVersion("6.9.17.*")]