whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Browse Source
optimize
jianghaiqing 2 years ago
parent 0c502e7039 b91dca6522
commit 774f49b805
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

23
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -4557,11 +4557,11 @@ namespace Myshipping.Application
ICell cell4 = row.GetCell(4);
if (cell3 != null)
{
row.Cells[4].SetCellValue(order.KGS.ToSqlValue());
row.Cells[4].SetCellValue(order.KGS.ToString());
}
else
{
row.CreateCell(4).SetCellValue(order.KGS.ToSqlValue());
row.CreateCell(4).SetCellValue(order.KGS.ToString());
}
}
if (order.CBM != null)
@ -4570,11 +4570,11 @@ namespace Myshipping.Application
ICell cell5 = row.GetCell(5);
if (cell5 != null)
{
row.Cells[5].SetCellValue(order.CBM.ToSqlValue());
row.Cells[5].SetCellValue(order.CBM.ToString());
}
else
{
row.CreateCell(5).SetCellValue(order.CBM.ToSqlValue());
row.CreateCell(5).SetCellValue(order.CBM.ToString());
}
}
}
@ -6011,11 +6011,11 @@ namespace Myshipping.Application
ICell cell4 = row.GetCell(4);
if (cell3 != null)
{
row.Cells[4].SetCellValue(order.KGS.ToSqlValue());
row.Cells[4].SetCellValue(order.KGS.ToString());
}
else
{
row.CreateCell(4).SetCellValue(order.KGS.ToSqlValue());
row.CreateCell(4).SetCellValue(order.KGS.ToString());
}
}
if (order.CBM != null)
@ -6024,11 +6024,11 @@ namespace Myshipping.Application
ICell cell5 = row.GetCell(5);
if (cell5!= null)
{
row.Cells[5].SetCellValue(order.CBM.ToSqlValue());
row.Cells[5].SetCellValue(order.CBM.ToString());
}
else
{
row.CreateCell(5).SetCellValue(order.CBM.ToSqlValue());
row.CreateCell(5).SetCellValue(order.CBM.ToString());
}
}
}
@ -6188,9 +6188,12 @@ namespace Myshipping.Application
_logger.LogInformation("导出excel:" + Path.Combine(fileFullPath, fileName));
var filestream = new FileStream(Path.Combine(fileFullPath, fileName), FileMode.OpenOrCreate, FileAccess.ReadWrite);
excelwork.Write(filestream);
filestream.Close();
filestream.Dispose();
#endregion
return new FileStreamResult( filestream, "application/octet-stream") { FileDownloadName = fileName };
//return new FileStreamResult( filestream, "application/octet-stream") { FileDownloadName = fileName };
return new FileStreamResult(new FileStream(Path.Combine(fileFullPath, fileName), FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
;
}

Write Preview
Loading…
Cancel
Save