From 60348a09eacef4fa73bfca2a04adc6641cc8aa9a Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 21 Nov 2023 16:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml                   | 7 ++++++-
 .../Dto/InStockTask/InStockTaskDetailsInfoDto.cs           | 5 +++++
 src/WMS.Web.Domain/Services/InStockService.cs              | 5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index a09bb72c..5f4fc192 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -815,7 +815,7 @@
              物料Id
             </summary> 
         </member>
-        <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockId">
+        <member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.StockCode">
              <summary>
              仓库ID
             </summary> 
@@ -1325,6 +1325,11 @@
             收货数量
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.BoxMaterialQty">
+            <summary>
+            箱对应物料的数量
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskInfoDto">
             <summary>
             入库任务单-详情信息
diff --git a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
index a73ffe66..c5ecccd4 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs
@@ -50,5 +50,10 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// 收货数量
         /// </summary>
         public decimal ReceiveQty { get; set; }
+
+        /// <summary>
+        /// 箱对应物料的数量
+        /// </summary>
+        public decimal BoxMaterialQty { get; set; }
     }
 }
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index af3796fb..8b7991ce 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -166,11 +166,12 @@ namespace WMS.Web.Domain.Services
             foreach (var item in tast.Details)
             {
                 //3.1判断当前物料是否相同
-                var isHave = box.Details.Where(x => x.MaterialId == item.MaterialId).Any();
-                if (!isHave)
+                var current_box_det = box.Details.Where(x => x.MaterialId == item.MaterialId).FirstOrDefault();
+                if (current_box_det==null)
                     continue;
                 //3.2映射返回明细对象
                 var task_detail = _mapper.Map<InStockTaskDetailsInfoDto>(item);
+                task_detail.BoxMaterialQty = current_box_det.Qty;
                 task_detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, task_detail.MaterialId);
                 task_detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, task_detail.MaterialId);
                 task_detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, task_detail.MaterialId);