实体
This commit is contained in:
@@ -86,7 +86,7 @@ namespace WMS.Web.Repositories
|
||||
.Where(adv => 1 == 1);
|
||||
|
||||
if (dto.SubStockId.HasValue)
|
||||
query = query.Where(w => w.detail.SubStockId == dto.SubStockId.Value);
|
||||
query = query.Where(w => w.order.SubStockId == dto.SubStockId.Value);
|
||||
|
||||
if(dto.Type.HasValue)
|
||||
query = query.Where(w => (int)w.order.Type == dto.Type.Value);
|
||||
@@ -113,9 +113,9 @@ namespace WMS.Web.Repositories
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
Qty = s.detail.Qty,
|
||||
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgCode),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode),
|
||||
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.detail.SubStockId),
|
||||
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode),
|
||||
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId),
|
||||
SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers),
|
||||
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user