|
|
|
@ -11021,7 +11021,10 @@ namespace Myshipping.Application
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<ServiceProjectStatusDto> statusList = new List<ServiceProjectStatusDto>();
|
|
|
|
|
//是否已截单
|
|
|
|
|
bool hasJDStatus = false;
|
|
|
|
|
|
|
|
|
|
List <ServiceProjectStatusDto> statusList = new List<ServiceProjectStatusDto>();
|
|
|
|
|
|
|
|
|
|
if (App.Configuration["ServiceStatusOpenAuto"] == "1")
|
|
|
|
|
{
|
|
|
|
@ -11046,6 +11049,11 @@ namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
|
dto.CtnDayNum = statusList.FirstOrDefault(x => x.StatusSKUCode == "SQXS" && x.IsYield)?.ActVal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (statusList != null && statusList.Any(x => x.StatusSKUCode == "JD" && x.IsYield))
|
|
|
|
|
{
|
|
|
|
|
hasJDStatus = statusList.FirstOrDefault(x => x.StatusSKUCode == "JD" && x.IsYield).IsYield;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -11079,7 +11087,7 @@ namespace Myshipping.Application
|
|
|
|
|
{
|
|
|
|
|
List<BookingOrder> allOrderList = new List<BookingOrder>();
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(oddCode) && oddCode.Equals("SIReceipt", StringComparison.OrdinalIgnoreCase))
|
|
|
|
|
if ((!string.IsNullOrWhiteSpace(oddCode) && oddCode.Equals("SIReceipt", StringComparison.OrdinalIgnoreCase)) || hasJDStatus)
|
|
|
|
|
{
|
|
|
|
|
allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.Id
|
|
|
|
|
&& x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();
|
|
|
|
|