dschick/git_bsmd
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enum lookup fix für den Export, Locode Lookup

Browse Source
This commit is contained in:
Daniel Schick 2022-02-07 08:08:01 +01:00
parent 7acdf273f3
commit efba8793e9
6 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ENI2/App.config
View File

@ -26,10 +26,12 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<value>http://192.168.2.24/LockingService/LockingService.svc</value> <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value> <!--value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
<value>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</value>
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

4
ENI2/Excel/ExcelUtil.cs
View File

@ -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) 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)) if (!nextPort.IsNullOrEmpty() && (nextPort.Length > 5))
nextPort = nextPort.Substring(0, 5); //trunc nextPort = nextPort.Substring(0, 5); //trunc

12
ENI2/Excel/ExcelWriter.cs
View File

@ -936,7 +936,17 @@ namespace ENI2.Excel
if (wasMessage.Elements.Count == 0) return; if (wasMessage.Elements.Count == 0) return;
WAS was = wasMessage.Elements[0] as WAS; 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.LastWasteDisposalPort", was.LastWasteDisposalPort);
WriteText("WAS.WasteDisposalServiceProviderName", was.WasteDisposalServiceProviderText); WriteText("WAS.WasteDisposalServiceProviderName", was.WasteDisposalServiceProviderText);

3
bsmd.ExcelReadService/LocodeDB.cs
View File

@ -157,8 +157,9 @@ namespace ENI2.Locode
string result = null; string result = null;
try 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}'", 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); SQLiteCommand cmd = new SQLiteCommand(query, _con);
IDataReader reader = cmd.ExecuteReader(); IDataReader reader = cmd.ExecuteReader();
while (reader.Read()) while (reader.Read())

2
bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("6.9.16")] [assembly: AssemblyInformationalVersion("6.9.17")]
[assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("6.9.16.*")] [assembly: AssemblyVersion("6.9.17.*")]