From 13472ebe91f210cc59e848d322bb4f2909a6348f Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 13 Feb 2023 22:33:55 +0100 Subject: [PATCH] 7.9.0.0 erste Testversion --- ENI2/Controls/MaerskListControl.xaml.cs | 9 ++++++--- ENI2/ENI2.csproj | 2 +- bsmd.database/MaerskData.cs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs index 2bf7cd91..23e82bc4 100644 --- a/ENI2/Controls/MaerskListControl.xaml.cs +++ b/ENI2/Controls/MaerskListControl.xaml.cs @@ -259,6 +259,9 @@ namespace ENI2.Controls if (!reader.IsDBNull(6)) md.ColG = ReadFieldAsString(reader, 6); if (!reader.IsDBNull(7)) md.ColH = ReadFieldAsString(reader, 7); if (!reader.IsDBNull(8)) md.ColI = ReadFieldAsString(reader, 8); + if ((md.ColI.Contains("bremerhaven", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEWVN")) || + (md.ColI.Contains("eurogate", StringComparison.OrdinalIgnoreCase) && this.PortLocode.Equals("DEBRV"))) + throw new InvalidOperationException($"{md.ColI} found in import to {PortLocode}, this is probably an error. Aborting import"); if (!reader.IsDBNull(9)) md.ColJ = ReadFieldAsString(reader, 9); if (!reader.IsDBNull(10)) { md.ETA = reader.GetDateTime(10); md.ColK = md.ETA.ToString(); } if (!reader.IsDBNull(11)) md.ColL = ReadFieldAsString(reader, 11); @@ -377,7 +380,7 @@ namespace ENI2.Controls // Todo: foreach (MaerskData md in requestList) { - // 1) create MessageCore and message classes + // create MessageCore and message classes md.MessageCore = new MessageCore(); md.MessageCore.InitialHIS = Message.NSWProvider.DBH; md.MessageCore.IMO = md.ColF; @@ -398,9 +401,9 @@ namespace ENI2.Controls // watchdog registrieren this._dbWatchDog.Register(md.MessageCore); - // 2) request dbh Id + - // 3) register watchdog for request completion + } } diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index e9efc3aa..d0b0be56 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,7 +36,7 @@ 5.4.0.0 true publish.html - 0 + 1 7.9.0.%2a false true diff --git a/bsmd.database/MaerskData.cs b/bsmd.database/MaerskData.cs index 2e88fc5d..e7ab71db 100644 --- a/bsmd.database/MaerskData.cs +++ b/bsmd.database/MaerskData.cs @@ -228,7 +228,7 @@ namespace bsmd.database else { scmd.Parameters.AddWithValue("@ID", this.Id); - scmd.CommandText = string.Format("UPDATE {0} SET Field1 = @COLA, Field2 = @COLB, Field3 = @COLC, Field4 = @COLD, Field5 = @COLE, Field6 = @COLF, @Field7 = @COLG, @Field8 = @COLH, " + + scmd.CommandText = string.Format("UPDATE {0} SET Field1 = @COLA, Field2 = @COLB, Field3 = @COLC, Field4 = @COLD, Field5 = @COLE, Field6 = @COLF, Field7 = @COLG, Field8 = @COLH, " + "Field9 = @COLI, Field10 = @COLJ, Field11 = @COLK, Field12 = @COLL, Field13 = @COLM, Field14 = @Remark WHERE Id = @ID", this.Tablename); } }