调整结构
This commit is contained in:
@@ -113,7 +113,8 @@ namespace WMS.Web.Repositories
|
||||
/// <returns></returns>
|
||||
public async Task<(object obj, int total)> GetListField(InStockQueryRequest dto, int companyId)
|
||||
{
|
||||
return await GetPagedList(dto, companyId);
|
||||
var res= await GetPagedList(dto, companyId);
|
||||
return (res.list, res.total);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -270,7 +271,7 @@ namespace WMS.Web.Repositories
|
||||
/// </summary>
|
||||
/// <param name="dto"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<(List<InStockQueryResponse> list, int total)> GetPagedList(InStockQueryRequest dto, int companyId)
|
||||
public async Task<(List<InStockQueryResponse> list, int total, decimal totalQty)> GetPagedList(InStockQueryRequest dto, int companyId)
|
||||
{
|
||||
//1.获取物料集合和组织集合和供应商的集合
|
||||
var materials = new List<ErpMaterialDto>();
|
||||
@@ -381,7 +382,6 @@ namespace WMS.Web.Repositories
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
|
||||
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode),
|
||||
Qty = s.detail.Qty,
|
||||
TotalQty= totalQty,
|
||||
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId),
|
||||
CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
SuccessSync = (s.order.Type != InstockType.Purchase ? "--" : (s.order.SuccessSync == SyncStatus.Success ? "成功" : (s.order.SuccessSync == SyncStatus.SyncIng ? "同步中" : "失败"))),
|
||||
@@ -402,7 +402,7 @@ namespace WMS.Web.Repositories
|
||||
});
|
||||
}
|
||||
|
||||
return (list, total);
|
||||
return (list, total, totalQty);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user