调整下列表显示

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

View File

@@ -8,6 +8,9 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.Supplier;
using WMS.Web.Core.Dto.InStock;
using WMS.Web.Core.Help;
using WMS.Web.Core.Internal.Results;
@@ -217,22 +220,24 @@ namespace WMS.Web.Repositories
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto)
{
//1.获取物料集合和组织集合和供应商的集合
var materials = new List<ErpMaterialDto>();
var materials_result = await _erpService.BillQueryForMaterial();
if (!materials_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0);
var materials = materials_result.Data.ToList();
if (materials_result.IsSuccess)
materials = materials_result.Data.ToList();
//组织集合
var orgs = new List<ErpOrgDto>();
var orgs_result = await _erpService.BillQueryForOrg();
if (!orgs_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0);
var orgs = orgs_result.Data.ToList();
if (orgs_result.IsSuccess)
orgs = orgs_result.Data.ToList();
//供应商集合
var suppliers = new List<ErpSupplierDto>();
var suppliers_result = await _erpService.BillQueryForSupplier();
if (!suppliers_result.IsSuccess)
return (new List<InStockQueryResponse>(), 0);
var suppliers = suppliers_result.Data.ToList();
if (suppliers_result.IsSuccess)
suppliers = suppliers_result.Data.ToList();
//物料集合;模糊查询后的物料集合
if (!string.IsNullOrEmpty(dto.MaterialNumber))