optimize
wanghaomei 2 years ago
parent fccded4b72
commit b629451ec7

@ -766,10 +766,11 @@ namespace Myshipping.Application
{ {
arr.Add(Id); arr.Add(Id);
} }
else { else
{
arr.Add((long)main.ParentId); arr.Add((long)main.ParentId);
} }
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault(); var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
if (!string.IsNullOrEmpty(itemcode)) if (!string.IsNullOrEmpty(itemcode))
{ {
@ -5662,7 +5663,7 @@ namespace Myshipping.Application
var Forwarder = _cache.GetAllCodeForwarder().Result.Take(10).ToList(); var Forwarder = _cache.GetAllCodeForwarder().Result.Take(10).ToList();
var GoodsName = _paraGoodsInfoRepository.AsQueryable().OrderBy("GOODS_CODE asc").Take(50).ToList().Select(t => t.Adapt<ParaGoodsShowDto>()).ToList(); var GoodsName = _paraGoodsInfoRepository.AsQueryable().OrderBy("GOODS_CODE asc").Take(50).ToList().Select(t => t.Adapt<ParaGoodsShowDto>()).ToList();
var YFXY = _paraContractNoInfoRepository.AsQueryable().OrderBy("CONTRACT_NO asc").Take(10).ToList().Select(t => t.Adapt<ParaContractNoShowDto>()).ToList(); ; var YFXY = _paraContractNoInfoRepository.AsQueryable().OrderBy("CONTRACT_NO asc").Take(10).ToList().Select(t => t.Adapt<ParaContractNoShowDto>()).ToList(); ;
var User = _repUser.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.Status == CommonStatus.ENABLE&&x.IsDeleted==false).OrderByDescending(x=>x.Name).ToListAsync(); var User = await _repUser.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID && x.Status == CommonStatus.ENABLE && x.IsDeleted == false).OrderByDescending(x => x.Name).ToListAsync();
var Service = _cache.GetAllCodeService().Result.Take(10).ToList(); var Service = _cache.GetAllCodeService().Result.Take(10).ToList();
dynamic obj = new dynamic obj = new
{ {
@ -5678,7 +5679,7 @@ namespace Myshipping.Application
WTDW = WTDW, WTDW = WTDW,
DCDL = DCDL, DCDL = DCDL,
GoodsName = GoodsName, GoodsName = GoodsName,
User = User, User = User.OrderByDescending(x => x.Name).ToList(),
Forwarder = Forwarder, Forwarder = Forwarder,
Service = Service, Service = Service,
contractno = YFXY, contractno = YFXY,

Loading…
Cancel
Save