|
|
|
@ -376,7 +376,9 @@ namespace Myshipping.Application
|
|
|
|
|
if (opEmailList.Count > 0)
|
|
|
|
|
opEmail = string.Join(";", opEmailList.Distinct().ToArray());
|
|
|
|
|
|
|
|
|
|
string emailTitle = $"{model.MBL_NO}-{model.VESSEL}/{model.VOYNO}/ 未提箱订舱取消确认";
|
|
|
|
|
var fstOrder = bookingOrderList.FirstOrDefault();
|
|
|
|
|
|
|
|
|
|
string emailTitle = $"{model.MBL_NO}-{fstOrder.VESSEL}/{fstOrder.VOYNO}/ 未提箱订舱取消确认";
|
|
|
|
|
|
|
|
|
|
//提取当前公共邮箱的配置
|
|
|
|
|
DjyUserMailAccount publicMailAccount = _djyUserMailAccount.AsQueryable().Filter(null, true).First(x => x.TenantId == UserManager.TENANT_ID && x.ShowName == "PublicSend"
|
|
|
|
@ -530,9 +532,11 @@ namespace Myshipping.Application
|
|
|
|
|
baseHtml = baseHtml.Replace("#BillNo#", "");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(model.VESSEL))
|
|
|
|
|
var fstOrderInfo = bookingOrderList.FirstOrDefault();
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(fstOrderInfo.VESSEL))
|
|
|
|
|
{
|
|
|
|
|
string s = $"{model.VESSEL}/{model.VOYNO}";
|
|
|
|
|
string s = $"{fstOrderInfo.VESSEL}/{fstOrderInfo.VOYNO}";
|
|
|
|
|
baseHtml = baseHtml.Replace("#VesselVoyno#", s);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|