|
|
|
@ -637,7 +637,7 @@ namespace Myshipping.Application
|
|
|
|
|
var currStus = currStatusList.FirstOrDefault(a =>
|
|
|
|
|
a.StatusSKUCode.Equals("YFVGM", StringComparison.OrdinalIgnoreCase) && a.IsYield);
|
|
|
|
|
|
|
|
|
|
if(currStus != null)
|
|
|
|
|
if (currStus != null)
|
|
|
|
|
item.IsVGM = currStus?.ActDate.Value;
|
|
|
|
|
}
|
|
|
|
|
if (currStatusList.Any(a => a.StatusSKUCode.Equals("YFCD", StringComparison.OrdinalIgnoreCase) && a.IsYield))
|
|
|
|
@ -2462,7 +2462,7 @@ namespace Myshipping.Application
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
public async Task<dynamic> SendLetterYard(long bookingId)
|
|
|
|
|
{
|
|
|
|
|
var entity = _repLetterYard.AsQueryable().Filter(null, true).First(x => x.BookingId == bookingId);
|
|
|
|
|
var entity = _repLetterYard.AsQueryable().Filter(null, true).First(x => x.BookingId == bookingId && x.IsDeleted == false);
|
|
|
|
|
if (entity != null)
|
|
|
|
|
{
|
|
|
|
|
var json = entity.ToJsonString();
|
|
|
|
@ -7474,14 +7474,14 @@ namespace Myshipping.Application
|
|
|
|
|
//如果合同协议号不为空需要判断是否字符前、后有空格,不允许字符前后有空格,需要提示修改
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(order.CONTRACTNO))
|
|
|
|
|
{
|
|
|
|
|
if(order.CONTRACTNO.StartsWith(" "))
|
|
|
|
|
if (order.CONTRACTNO.StartsWith(" "))
|
|
|
|
|
throw Oops.Bah("运费协议号前含有空格,请修改");
|
|
|
|
|
|
|
|
|
|
if (order.CONTRACTNO.EndsWith(" "))
|
|
|
|
|
throw Oops.Bah("运费协议号后含有空格,请修改");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//增加件、重、尺比对
|
|
|
|
|
//增加件、重、尺比对
|
|
|
|
|
if (ctnList != null && ctnList.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
if (ctnList.Sum(a => a.PKGS.HasValue ? a.PKGS.Value : 0) != (order.PKGS.HasValue ? order.PKGS.Value : 0))
|
|
|
|
@ -8559,7 +8559,7 @@ HLCUTA12307DPXJ3 以这票为例 6个柜
|
|
|
|
|
ExtData = t.ExtData
|
|
|
|
|
}).Distinct().ToListAsync();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();
|
|
|
|
|
dto.childrens = childrens.Adapt<List<Children>>();
|
|
|
|
|