金蝶组织使用
This commit is contained in:
@@ -55,12 +55,18 @@ namespace WMS.Web.Repositories
|
||||
/// <returns></returns>
|
||||
public async Task<ResultPagedList<InStockQueryResponse>> GetPagedList(InStockQueryRequest dto)
|
||||
{
|
||||
//1.获取物料集合
|
||||
//1.获取物料集合和组织集合
|
||||
var materials_result = await _erpService.BillQueryForMaterial();
|
||||
if (!materials_result.IsSuccess)
|
||||
return ResultPagedList<InStockQueryResponse>.ReFailure(materials_result);
|
||||
var materials = materials_result.Data.ToList();
|
||||
|
||||
//组织集合
|
||||
var orgs_result = await _erpService.BillQueryForOrg();
|
||||
if (!orgs_result.IsSuccess)
|
||||
return ResultPagedList<InStockQueryResponse>.ReFailure(orgs_result);
|
||||
var orgs = orgs_result.Data.ToList();
|
||||
|
||||
//物料集合;模糊查询后的物料集合
|
||||
if (!string.IsNullOrEmpty(dto.MaterialNumber))
|
||||
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
|
||||
@@ -109,8 +115,8 @@ namespace WMS.Web.Repositories
|
||||
Type=s.order.Type.GetRemark(),
|
||||
SourceBillNo=s.detail.SourceBillNo,
|
||||
Supplier="",
|
||||
Org="",
|
||||
MaterialName= _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
|
||||
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId),
|
||||
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockId),
|
||||
|
||||
Reference in New Issue
Block a user