bug修复4

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -1660,6 +1660,16 @@
             已交数量
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.ReceiveQty">
+            <summary>
+            收货数量
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.AvailableQty">
+            <summary>
+            可入库数量
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.Remark">
             <summary>
             明细备注

src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs

@@ -125,6 +125,16 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// </summary>
         public decimal DeliveredQty { get; set; }
 
+        /// <summary>
+        /// 收货数量
+        /// </summary>
+        public decimal ReceiveQty { get; set; }
+
+        /// <summary>
+        /// 可入库数量
+        /// </summary>
+        public decimal AvailableQty { get; set; }
+
         /// <summary>
         /// 明细备注
         /// </summary>

src/WMS.Web.Domain/Services/InStockService.cs

@@ -271,6 +271,12 @@ namespace WMS.Web.Domain.Services
         /// <returns></returns>
         private async Task<Result> 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<InStockTask>.ReFailure(ResultCodes.DateWriteError);
 

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();