|
|
|
@ -4906,7 +4906,7 @@ namespace Myshipping.Application
|
|
|
|
|
if (!string.IsNullOrEmpty(yardid))
|
|
|
|
|
{
|
|
|
|
|
ICell cell = row.GetCell(5);
|
|
|
|
|
var yard = _cache.GetAllMappingYard().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == yardid).Select(x => x.MapCode).First();
|
|
|
|
|
var yard = _cache.GetAllMappingYard().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == yardid).Select(x => x.MapCode).FirstOrDefault();
|
|
|
|
|
if (cell != null)
|
|
|
|
|
{
|
|
|
|
|
row.Cells[5].SetCellValue(yard);
|
|
|
|
@ -5028,11 +5028,11 @@ namespace Myshipping.Application
|
|
|
|
|
ICell cell5 = row.GetCell(5);
|
|
|
|
|
if (cell5 != null)
|
|
|
|
|
{
|
|
|
|
|
row.Cells[5].SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).First());
|
|
|
|
|
row.Cells[5].SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).FirstOrDefault());
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
row.CreateCell(5).SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).First());
|
|
|
|
|
row.CreateCell(5).SetCellValue(_cache.GetAllMappingService().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == service).Select(x => x.MapCode).FirstOrDefault());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -5221,11 +5221,11 @@ namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
|
//运费支付方式
|
|
|
|
|
|
|
|
|
|
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
|
|
|
|
|
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).FirstOrDefault();
|
|
|
|
|
var bl = string.Empty;
|
|
|
|
|
if (!string.IsNullOrEmpty(BLFRTCode))
|
|
|
|
|
{
|
|
|
|
|
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
|
|
|
|
|
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).FirstOrDefault();
|
|
|
|
|
}
|
|
|
|
|
ICell cell = row.GetCell(0);
|
|
|
|
|
if (cell != null)
|
|
|
|
@ -5252,11 +5252,11 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
if (i == 44)
|
|
|
|
|
{
|
|
|
|
|
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).First();
|
|
|
|
|
var BLFRTCode = _cache.GetAllCodeFrt().Result.Where(x => x.EnName == order.BLFRT).Select(x => x.Code).FirstOrDefault();
|
|
|
|
|
var bl = string.Empty;
|
|
|
|
|
if (!string.IsNullOrEmpty(BLFRTCode))
|
|
|
|
|
{
|
|
|
|
|
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).First();
|
|
|
|
|
bl = _cache.GetAllMappingFrt().Result.Where(x => x.Module == "XiangManCangEDI" && x.Code == BLFRTCode).Select(x => x.MapCode).FirstOrDefault();
|
|
|
|
|
}
|
|
|
|
|
if (bl == "预付")
|
|
|
|
|
{
|
|
|
|
|