From 18a01836d38c7859260d66336f59d1009f9eb21c Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Sat, 27 Jul 2024 11:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 +++++
src/WMS.Web.Core/Dto/InStock/InStockQueryResponse.cs | 6 +++++-
src/WMS.Web.Repositories/InStockRepositories.cs | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
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 ? "同步中" : "失败"))),