diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index e9e4da04..0b7689f7 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3023,6 +3023,11 @@ 数量 + + + 总入库量 + + 创建人 diff --git a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs index ad9fe18f..fff53cf1 100644 --- a/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs +++ b/src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs @@ -82,7 +82,11 @@ namespace WMS.Web.Core.Dto /// [Column("入库数量")] public decimal Qty { get; set; } - + /// + /// 总入库量 + /// + [Column("总入库量")] + public decimal TotalQty { get; set; } /// /// 创建人 /// diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 87368d92..966108d6 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -365,6 +365,7 @@ namespace WMS.Web.Repositories } int total = await query.CountAsync(); + decimal totalQty = await query.SumAsync(s => s.detail.Qty); var list = await query.Select(s => new InStockQueryResponse() { Id = s.order.Id, @@ -380,6 +381,7 @@ 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 ? "同步中" : "失败"))),