18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

供应商信息应用上

Browse Source
This commit is contained in:
tongfei
2023-11-08 14:18:59 +08:00
parent 333f0a0c10
commit a6fbdaae02
5 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/WMS.Web.Repositories/InStockRepositories.cs
View File

@@ -55,7 +55,7 @@ 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);
@@ -67,6 +67,12 @@ namespace WMS.Web.Repositories
return ResultPagedList<InStockQueryResponse>.ReFailure(orgs_result);
var orgs = orgs_result.Data.ToList();
//供应商集合
var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess)
return ResultPagedList<InStockQueryResponse>.ReFailure(suppliers_result);
var suppliers = suppliers_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w => EF.Functions.Like(w.MaterialNumber, "%" + dto.MaterialNumber + "%")).ToList();
@@ -114,8 +120,8 @@ namespace WMS.Web.Repositories
BillNo=s.order.BillNo,
Type=s.order.Type.GetRemark(),
SourceBillNo=s.detail.SourceBillNo,
Supplier="",
Org= _erpBasicDataExtendService.GetOrgName(orgs, s.detail.OrgId),
Supplier= _erpBasicDataExtendService.GetSupplierName(suppliers, s.detail.SupplierId),
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),