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

1

Browse Source
optimize
wet 2 years ago
parent 9aa89f2986
commit e0985ba5db
1 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -4533,11 +4533,11 @@ namespace Myshipping.Application
ICell cell3 = row.GetCell(3);
if (cell3 != null)
{
row.Cells[3].SetCellValue(order.GOODSNAME);
row.Cells[3].SetCellValue(order.DESCRIPTION);
}
else
{
row.CreateCell(3).SetCellValue(order.GOODSNAME);
row.CreateCell(3).SetCellValue(order.DESCRIPTION);
}
if (order.KGS != null)
{
@ -4621,16 +4621,43 @@ namespace Myshipping.Application
}
if (i == 44)
{
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
var bl = string.Empty;
if (!string.IsNullOrEmpty(BLFRTCode))
{
row.Cells[1].SetCellValue(order.PREPARDATID);
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
}
else
if (bl == "预付")
{
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
{
row.Cells[1].SetCellValue(order.PREPARDATID);
}
else
{
row.CreateCell(1).SetCellValue(order.PREPARDATID);
}
}
else if((bl == "到付"))
{
row.CreateCell(1).SetCellValue(order.PREPARDATID);
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
{
row.Cells[1].SetCellValue(order.PAYABLEATID);
}
else
{
row.CreateCell(1).SetCellValue(order.PAYABLEATID);
}
}
}
if (i == 45)
{
@ -5982,11 +6009,11 @@ namespace Myshipping.Application
ICell cell3 = row.GetCell(3);
if (cell3 != null)
{
row.Cells[3].SetCellValue(order.GOODSNAME);
row.Cells[3].SetCellValue(order.DESCRIPTION);
}
else
{
row.CreateCell(3).SetCellValue(order.GOODSNAME);
row.CreateCell(3).SetCellValue(order.DESCRIPTION);
}
if (order.KGS != null)
{
@ -6005,7 +6032,7 @@ namespace Myshipping.Application
{
//尺码
ICell cell5 = row.GetCell(5);
if (cell5!= null)
if (cell5 != null)
{
row.Cells[5].SetCellValue(order.CBM.ToString());
}
@ -6041,7 +6068,8 @@ namespace Myshipping.Application
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
var bl = string.Empty;
if (!string.IsNullOrEmpty(BLFRTCode)) {
if (!string.IsNullOrEmpty(BLFRTCode))
{
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
}
ICell cell = row.GetCell(0);
@ -6069,16 +6097,43 @@ namespace Myshipping.Application
}
if (i == 44)
{
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
var bl = string.Empty;
if (!string.IsNullOrEmpty(BLFRTCode))
{
row.Cells[1].SetCellValue(order.PREPARDATID);
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
}
else
if (bl == "预付")
{
row.CreateCell(1).SetCellValue(order.PREPARDATID);
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
{
row.Cells[1].SetCellValue(order.PREPARDATID);
}
else
{
row.CreateCell(1).SetCellValue(order.PREPARDATID);
}
}
else if ((bl == "到付"))
{
//预付地点
ICell cell = row.GetCell(1);
if (cell != null)
{
row.Cells[1].SetCellValue(order.PAYABLEATID);
}
else
{
row.CreateCell(1).SetCellValue(order.PAYABLEATID);
}
}
}
if (i == 45)
{
@ -6142,7 +6197,7 @@ namespace Myshipping.Application
else
{
row.CreateCell(1).SetCellValue(order.DUNNO);
}
}
}
if (i == 50)
{

Write Preview
Loading…
Cancel
Save