|
|
|
@ -7982,6 +7982,7 @@ namespace Myshipping.Application
|
|
|
|
|
SendTo = dto.SendTo,
|
|
|
|
|
Title = dto.Title,
|
|
|
|
|
Body = dto.Body,
|
|
|
|
|
CCTo= dto.CCTo,
|
|
|
|
|
SmtpConfig = "",
|
|
|
|
|
Account=userMail.MailAccount,
|
|
|
|
|
Password=userMail.Password,
|
|
|
|
@ -10405,7 +10406,7 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//提箱返场
|
|
|
|
|
var statusloglist = _repStatuslog.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id && x.IsDeleted == false).ToList();
|
|
|
|
|
var statusloglist = _repStatuslog.AsQueryable().Filter(null, true).Where(x => x.BookingId == item.Id && x.IsDeleted == false && x.Category == "yunzong").ToList();
|
|
|
|
|
var statuslogId = statusloglist.Select(x => x.Id).ToList();
|
|
|
|
|
//运踪状态详情
|
|
|
|
|
var statuslogdetaillist = _statuslogdetail.AsQueryable().Where(x => statuslogId.Contains(x.PId)).ToList();
|
|
|
|
@ -11684,7 +11685,7 @@ namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
|
var currFrtInfo = ediFrtList.FirstOrDefault(t => t.Code.Equals(baseFrtInfo.Code, StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
|
|
|
|
if(currFrtInfo != null)
|
|
|
|
|
if (currFrtInfo != null)
|
|
|
|
|
{
|
|
|
|
|
voltaModel.BLFRT = currFrtInfo.MapCode?.Trim();
|
|
|
|
|
}
|
|
|
|
@ -11798,7 +11799,7 @@ namespace Myshipping.Application
|
|
|
|
|
x.EdiPkgs = ediPkgs.MapCode?.Trim();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(!string.IsNullOrWhiteSpace(x.CtnType))
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(x.CtnType))
|
|
|
|
|
{
|
|
|
|
|
var ediCtn = seaLeadediCTNList.FirstOrDefault(t => t.Code.Equals(x.CtnType, StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
|
|
|
|