From 4d131f718ff28265e32a6056daf4c45eb02c48b3 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 23 Jul 2025 09:47:57 +0200 Subject: [PATCH] Remove default values from Waste import for amount and locode --- ENI2/Excel/ExcelUtil.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index c31e6e6b..27fc2348 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -1279,18 +1279,18 @@ namespace ENI2.Excel if (waste.WasteType == 2309) waste.WasteType = 507; if (waste.WasteType == 3000) waste.WasteType = 401; - waste.WasteDisposalAmount_MTQ = reader.ReadNumberDefaultZero(wasteAmount); - waste.WasteCapacity_MTQ = reader.ReadNumberDefaultZero(wasteCapacity); - waste.WasteAmountRetained_MTQ = reader.ReadNumberDefaultZero(wasteRetained); + waste.WasteDisposalAmount_MTQ = reader.ReadNumber(wasteAmount); + waste.WasteCapacity_MTQ = reader.ReadNumber(wasteCapacity); + waste.WasteAmountRetained_MTQ = reader.ReadNumber(wasteRetained); waste.WasteDisposalPort = reader.ReadSSNLocode(wastePort); // aka RemainingWasteDisposalPort - if (waste.WasteDisposalPort.IsNullOrEmpty()) - { - waste.WasteDisposalPort = "ZZUKN"; - } + //if (waste.WasteDisposalPort.IsNullOrEmpty()) + //{ + // waste.WasteDisposalPort = "ZZUKN"; + //} - waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen); + waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumber(amountGen); if (!waste.WasteType.HasValue || (waste.WasteType > 999)) { @@ -1368,7 +1368,7 @@ namespace ENI2.Excel wr.WasteCode.Equals("204") || wr.WasteCode.Equals("510") || wr.WasteCode.Equals("511")) wr.WasteDescription = "-"; } - wr.AmountWasteReceived_MTQ = reader.ReadNumber(wAmount) ?? (double?)0; // Default ist 0, nicht nix ;-) + wr.AmountWasteReceived_MTQ = reader.ReadNumber(wAmount); // ?? (double?)0; // Default ist 0, nicht nix ;-) // Update: wir wollen doch einen Fehler } // only add message when an identification number was given