diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index ec1216c7..141962fc 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index f530bf7d..e381da6d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -37,6 +37,13 @@
+
+
+ 修改备注
+
+
+
+
条码系统重置箱信息
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index bbf2a668..e9e4da04 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -145,6 +145,11 @@
序列号集
+
+
+ 备注
+
+
保存出入库回退上下架：请求对象
@@ -155,6 +160,26 @@
明细
+
+
+ 修改备注
+
+
+
+
+ ID
+
+
+
+
+ 明细ID
+
+
+
+
+ 备注
+
+
出入库回退-查询请求对象
@@ -270,6 +295,11 @@
仓库
+
+
+ 备注
+
+
根据箱号获取物料信息
@@ -2243,6 +2273,11 @@
可入库数量
+
+
+ 待上架数量
+
+
明细备注
@@ -3739,6 +3774,11 @@
单位
+
+
+ 总库存量
+
+
即时库存明细汇总
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index ceb34417..a0167415 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -70,6 +70,14 @@
生成单据号
+
+
+ 修改备注
+
+
+
+
+
wms出入库回退记录表
@@ -77,7 +85,7 @@
- ID
+ 编号
@@ -105,6 +113,11 @@
序列号集
+
+
+ 备注
+
+
老ops箱信息头
@@ -3413,6 +3426,14 @@
+
+
+ 修改备注
+
+
+
+
+
即时库存-服务接口
@@ -4875,6 +4896,15 @@
+
+
+ 修改备注
+
+
+
+
+
+
即时库存-服务
diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
index 5108a9c6..0faaa089 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
@@ -134,7 +134,10 @@ namespace WMS.Web.Core.Dto.InStockTask
/// 可入库数量
///
public decimal AvailableQty { get; set; }
-
+ ///
+ /// 待上架数量
+ ///
+ public decimal WaitShelfQty { get; set; }
///
/// 明细备注
///
diff --git a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
index 66d9b983..efe42da5 100644
--- a/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/Inventory/InventoryDetailsQueryResponse.cs
@@ -63,5 +63,10 @@ namespace WMS.Web.Core.Dto.Inventory
///
[Column("单位")]
public string Unit { get; set; }
+ ///
+ /// 总库存量
+ ///
+ [Column("总库存量")]
+ public decimal TotalQty { get; set; }
}
}
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 14edac67..431f641d 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -401,6 +401,8 @@ namespace WMS.Web.Repositories
DeliveredQty = s.DeliveredQty,
//非采购：可入库数量=应入库数量-收货数量；
AvailableQty = s.AccruedQty - s.ReceiveQty,
+ //v1.0.7 待上架数量显示来源单的应入库数量-实入库数量的值
+ WaitShelfQty = s.AccruedQty-s.RealityQty,
Remark = s.Remark,
ErpDetailId = s.ErpDetailId
}).Where(x => x.AvailableQty > 0).ToListAsync();
diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
index b3ac7f05..77c00baa 100644
--- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
+++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs
@@ -105,7 +105,7 @@ namespace WMS.Web.Repositories
query = query.Where(w => w.Qty == dto.Qty);
int total = await query.CountAsync();
-
+ decimal totalQty = await query.SumAsync(s => s.Qty);
var list = await query.Select(s => new InventoryDetailsQueryResponse()
{
Id = s.Id,
@@ -115,6 +115,7 @@ namespace WMS.Web.Repositories
Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode + s.OrgCode),
Qty = s.Qty,
+ TotalQty= totalQty,
SubStock = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, s.SubStockCode + s.StockCode + s.OrgCode),
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialNumber),
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();