diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs index 7c6be159..d1d3fbf4 100644 --- a/ENI2/Excel/ExcelUtil.cs +++ b/ENI2/Excel/ExcelUtil.cs @@ -427,8 +427,8 @@ namespace ENI2.Excel imdgPosition.GrossQuantity_KGM = reader.ReadNumber(imdg_grossQuantity); imdgPosition.VehicleLicenseNumber = reader.ReadText(imdg_number); imdgPosition.StowagePosition = reader.ReadText(imdg_stowagePosition); - imdgPosition.PortOfLoading = reader.ReadText(imdg_portOfLoading); - imdgPosition.PortOfDischarge = reader.ReadText(imdg_portOfDischarge); + imdgPosition.PortOfLoading = reader.ReadLoCode(imdg_portOfLoading); + imdgPosition.PortOfDischarge = reader.ReadLoCode(imdg_portOfDischarge); imdgPosition.ContainerNumber = reader.ReadText(imdg_containerNumber); imdgPosition.Remarks = reader.ReadText(imdg_remarks); } @@ -491,8 +491,8 @@ namespace ENI2.Excel ibcPosition.Quantity_KGM = (int ?) reader.ReadNumber(ibc_quantity); ibcPosition.StowagePosition = reader.ReadText(ibc_stowagePosition); - ibcPosition.PortOfLoading = reader.ReadText(ibc_portOfLoading); - ibcPosition.PortOfDischarge = reader.ReadText(ibc_portOfDischarge); + ibcPosition.PortOfLoading = reader.ReadLoCode(ibc_portOfLoading); + ibcPosition.PortOfDischarge = reader.ReadLoCode(ibc_portOfDischarge); ibcPosition.Hazards = reader.ReadHazards(ibc_hazards); ibcPosition.SpecRef15_19 = reader.ReadBoolean(ibc_specrefs); ibcPosition.Remarks = reader.ReadText(ibc_remarks); @@ -529,8 +529,8 @@ namespace ENI2.Excel igcPosition.ProductName = productName; igcPosition.Quantity_KGM = reader.ReadNumber(igc_quantity); igcPosition.StowagePosition = reader.ReadText(igc_stowagePosition); - igcPosition.PortOfLoading = reader.ReadText(igc_portOfLoading); - igcPosition.PortOfDischarge = reader.ReadText(igc_portOfDischarge); + igcPosition.PortOfLoading = reader.ReadLoCode(igc_portOfLoading); + igcPosition.PortOfDischarge = reader.ReadLoCode(igc_portOfDischarge); igcPosition.UNNumber = reader.ReadText(igc_unnumber); igcPosition.IMOClass = reader.ReadText(igc_imoclass); igcPosition.Remarks = reader.ReadText(igc_remarks); @@ -570,8 +570,8 @@ namespace ENI2.Excel imsbcPosition.MHB = reader.ReadBoolean(imsbc_mhb); imsbcPosition.Quantity_KGM = reader.ReadNumber(imsbc_quantity); imsbcPosition.StowagePosition = reader.ReadText(imsbc_stowagePosition); - imsbcPosition.PortOfLoading = reader.ReadText(imsbc_portOfLoading); - imsbcPosition.PortOfDischarge = reader.ReadText(imsbc_portOfDischarge); + imsbcPosition.PortOfLoading = reader.ReadLoCode(imsbc_portOfLoading); + imsbcPosition.PortOfDischarge = reader.ReadLoCode(imsbc_portOfDischarge); imsbcPosition.IMOHazardClass = reader.ReadHazardClass(imsbc_hazardclass); imsbcPosition.UNNumber = reader.ReadText(imsbc_unnumber); imsbcPosition.IMOClass = reader.ReadText(imsbc_imoclass); @@ -622,8 +622,8 @@ namespace ENI2.Excel marpolPosition.Quantity_KGM = reader.ReadNumber(marpol_quantity); marpolPosition.StowagePosition = reader.ReadText(marpol_stowagePosition); - marpolPosition.PortOfLoading = reader.ReadText(marpol_portOfLoading); - marpolPosition.PortOfDischarge = reader.ReadText(marpol_portOfDischarge); + marpolPosition.PortOfLoading = reader.ReadLoCode(marpol_portOfLoading); + marpolPosition.PortOfDischarge = reader.ReadLoCode(marpol_portOfDischarge); marpolPosition.Remarks = reader.ReadText(marpol_remarks); }