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-12-18 14:30:34 +08:00
parent dba406e0e0
commit fbcb24c8c5
6 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
View File

@@ -6,6 +6,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Inventory;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
@@ -54,22 +56,21 @@ namespace WMS.Web.Repositories
public async Task<(List<InventoryDetailsQueryResponse> list,int total)> GetPagedList(InventoryDetailsQueryRequest dto)
{
//1.获取物料集合和组织集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return (new List<InventoryDetailsQueryResponse>(), 0);
var materials = materials_result.Data.ToList();
if (materials_result.IsSuccess)
materials = materials_result.Data.ToList();
//物料集合；模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))
materials = materials.Where(w =>w.MaterialNumber.Contains(dto.MaterialNumber)).ToList();
//组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess)
return (new List<InventoryDetailsQueryResponse>(), 0);
var orgs = orgs_result.Data.ToList();
if (orgs_result.IsSuccess)
orgs = orgs_result.Data.ToList();
//
var query = _context.InventoryDetails
.Where(adv => 1 == 1);