diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index 2950edce..5cb46f15 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -26049,7 +26049,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL #region 13 tempstr = "13";//1 //RECORD-ID//M//9(2)//1 //2 //13 tempstr += GetSpaceStr("", 3);//2 //Filler//M//X(3)//3 //5 //Spaces - tempstr += GetSpaceStr(GetPortEDICode(bill.PORTLOADID, "PIL"), 5);//3 //Port of Origin//M//X(5)//6 //10 //refer Port Code (Place of receipt) + tempstr += GetSpaceStr(GetPortEDICode(bill.PLACERECEIPTID, "PIL"), 5);//3 //Port of Origin//M//X(5)//6 //10 //refer Port Code (Place of receipt) tempstr += GetSpaceStr(GetPortEDICode(bill.PORTDISCHARGEID, "PIL"), 5);//4 //Port of Discharge//M//X(5)//11 //15 //refer Port code (Port of Discharge - final) tempstr += GetSpaceStr("", 5);//5 //Port of Trans//C//X(5)//16 //20 //refer Port code (1st T/S port), only if Transshipment involved tempstr += GetSpaceStr(GetPortEDICode(bill.PLACEDELIVERYID, "PIL"), 5);//6 //Final Destination//M//X(5)//21 //25 //refer Port Code (Place of delivery) diff --git a/DSWeb/Areas/MvcShipping/Helper/ExcelHelper.cs b/DSWeb/Areas/MvcShipping/Helper/ExcelHelper.cs index 23363489..5a551f8b 100644 --- a/DSWeb/Areas/MvcShipping/Helper/ExcelHelper.cs +++ b/DSWeb/Areas/MvcShipping/Helper/ExcelHelper.cs @@ -329,13 +329,13 @@ namespace DSWeb.MvcShipping.Helper { try { - dataRow[j] = cellData.DateCellValue; + dataRow[i] = cellData.DateCellValue; } catch { try { - dataRow[j] = GetDateTime((int)cellData.NumericCellValue); + dataRow[i] = GetDateTime((int)cellData.NumericCellValue); } catch {