Remove default values from Waste import for amount and locode
This commit is contained in:
parent
8bc2ae99a8
commit
4d131f718f
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user