diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 193d5c64..fbbe01ba 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1660,6 +1660,16 @@
已交数量
+
+
+ 收货数量
+
+
+
+
+ 可入库数量
+
+
明细备注
diff --git a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
index e01e6d9a..867dc871 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs
@@ -125,6 +125,16 @@ namespace WMS.Web.Core.Dto.InStockTask
///
public decimal DeliveredQty { get; set; }
+ ///
+ /// 收货数量
+ ///
+ public decimal ReceiveQty { get; set; }
+
+ ///
+ /// 可入库数量
+ ///
+ public decimal AvailableQty { get; set; }
+
///
/// 明细备注
///
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 14c848cb..408226fb 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -271,6 +271,12 @@ namespace WMS.Web.Domain.Services
///
private async Task ShelfNoPurchaseSave(NoPurchaseShelfRequest dto, LoginInDto loginInfo, bool isTransaction = true)
{
+ //1.1过滤的明细:0数量入库的明细要过滤掉
+ dto.Boxs.ForEach(x =>
+ {
+ x.Details.RemoveAll(t => t.Qty == 0);
+ });
+
//1.获取来源单
var task = await _inStockTaskRepositories.Get(dto.TaskId);
if (task == null)
@@ -446,7 +452,7 @@ namespace WMS.Web.Domain.Services
taskBox.Details.ForEach(x => { x.ErpDetailId = item.ErpDetailId; });
taskBoxAdd.Add(taskBox);
}
- var isSuccess= await _inStockTaskBoxRepositories.AddRange(taskBoxAdd);
+ var isSuccess= await _inStockTaskBoxRepositories.AddRange(taskBoxAdd,isTransaction);
if(!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 4dfacd10..0d332443 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -332,6 +332,7 @@ namespace WMS.Web.Repositories
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Qty = s.AccruedQty,
DeliveredQty = s.DeliveredQty,
+ AvailableQty = s.AccruedQty - s.ReceiveQty - s.DeliveredQty,
Remark = s.Remark,
ErpDetailId=s.ErpDetailId
}).ToListAsync();