From 264b367516167a9fd588b2327f87b8cd32d1f86d Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 26 May 2022 07:37:56 +0200
Subject: [PATCH] IMO/ENI Abgleich bei Excel Import

---
 ENI2/Excel/DakosyUtil.cs  | 16 +++++++++++++++-
 ENI2/Excel/ExcelReader.cs |  2 +-
 ENI2/Excel/ExcelUtil.cs   | 16 +++++++++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index b895ad54..ad574ee0 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -36,7 +36,21 @@ namespace ENI2.Excel
                     readMessage = "Id not matching in import sheet";
                     return false;
                 }
-            }            
+            }
+
+            string imo = reader.ReadCellAsText("ship", "C10");
+            if(!imo.IsNullOrEmpty() && !imo.Equals(messageCore.IMO))
+            {
+                readMessage = "IMO not matching in import sheet";
+                return false;
+            }
+
+            string eni = reader.ReadCellAsText("ship", "C11");
+            if (!eni.IsNullOrEmpty() && !eni.Equals(messageCore.IMO))
+            {
+                readMessage = "ENI not matching in import sheet";
+                return false;
+            }
 
             // load messages if already present
             List<Message> messages = DBManager.Instance.GetMessagesForCore(messageCore, DBManager.MessageLoad.ALL);
diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index ef59ed1e..c1f49d0c 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -121,7 +121,7 @@ namespace ENI2.Excel
             {
                 _log.ErrorFormat("Cargo LA code parse error for {0}", lookup);
                 return null;
-            }            
+            }
         }
 
         internal byte? ReadGender(string lookup)
diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 8079f17d..1402ecb4 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -33,7 +33,21 @@ namespace ENI2.Excel
                 readMessage = "Id not matching in import sheet";
                 return false;
             }
-            
+
+            string imoeni = reader.ReadText("Visit.IMONumber")?.Trim();
+
+            if (!aMessageCore.IMO.IsNullOrEmpty() && !aMessageCore.IMO.Equals(imoeni))
+            {
+                readMessage = "IMO not matching in import sheet";
+                return false;
+            }
+
+            if (!aMessageCore.ENI.IsNullOrEmpty() && !aMessageCore.ENI.Equals(imoeni))
+            {
+                readMessage = "ENI not matching in import sheet";
+                return false;
+            }
+
             // load messages if already present
             List<Message> messages = DBManager.Instance.GetMessagesForCore(messageCore, DBManager.MessageLoad.ALL);