From c5ccc52aef7b1b675b77e886fd3f960a27261651 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Sat, 13 Apr 2024 10:59:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
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 +++++
 .../Dto/InStockTask/ContrastMaterialsRequest.cs |  5 +++++
 src/WMS.Web.Domain/Services/InStockService.cs   | 17 ++++++++++-------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 7860e0da..1d25ce6c 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1797,6 +1797,11 @@
             所选物料
             </summary>
         </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsRequest.IsPurchase">
+            <summary>
+            是否是采购上架
+            </summary>
+        </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsRequest.BoxBillNos">
             <summary>
             箱号集合
diff --git a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs
index 9f739d44..0cc72286 100644
--- a/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs
+++ b/src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsRequest.cs
@@ -28,6 +28,11 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// </summary>
         public string MaterialNumber { get; set; }
 
+        /// <summary>
+        /// 是否是采购上架
+        /// </summary>
+        public bool IsPurchase { get; set; } = true;
+
         /// <summary>
         /// 箱号集合
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index 756f510f..7151da3f 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -659,14 +659,17 @@ namespace WMS.Web.Domain.Services
             if (boxs == null || boxs.Count == 0)
                 return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.BoxNoData);
 
-            //判断箱不存在所选的物料
-            foreach (var item in boxs)
+            //只有采购入库-是选择了物料明细
+            if (dto.IsPurchase)
             {
-               var isAnyHave= item.Details.Any(x => x.MaterialNumber == dto.MaterialNumber);
-                if(!isAnyHave)
-                    return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.Contrast_Purchase_Count_Error);
-                //return Result<ContrastMaterialsResponse>.ReFailure(item.BoxBillNo + ResultCodes.BoxNoMaterialError.Item2, ResultCodes.BoxNoMaterialError.Item1);
-
+                //判断箱不存在所选的物料
+                foreach (var item in boxs)
+                {
+                    var isAnyHave = item.Details.Any(x => x.MaterialNumber == dto.MaterialNumber);
+                    if (!isAnyHave)
+                        return Result<ContrastMaterialsResponse>.ReFailure(ResultCodes.Contrast_Purchase_Count_Error);
+                    //return Result<ContrastMaterialsResponse>.ReFailure(item.BoxBillNo + ResultCodes.BoxNoMaterialError.Item2, ResultCodes.BoxNoMaterialError.Item1);
+                }
             }