From 51e2c41babfb91e38cefbb00bbe55e253b229696 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Fri, 7 Jul 2023 08:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=91=E6=96=99=20=E5=8F=98=E6=9B=B4=E4=B8=BA=20=E9=9D=9E?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B0=83=E6=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Enums/Inventory/EnumTransSubType.cs                     | 4 ++--
 .../Plans/CountPlans/CountPlanManager.cs                    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
index 1434da8ce..57d1e43cd 100644
--- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
+++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransSubType.cs
@@ -134,9 +134,9 @@ public enum EnumTransSubType
     Issue_SafetyStock = 1504,
 
     /// <summary>
-    /// 直接发料
+    /// 非生产调拨
     /// </summary>
-    [Display(Name = "直接发料")]
+    [Display(Name = "非生产调拨")]
     Issue_Direct = 1505,
 
     /// <summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
index bcdb35698..846c509cc 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
@@ -139,12 +139,12 @@ public class CountPlanManager : SfsStoreRequestManagerBase<CountPlan, CountPlanD
                 p.RequestStatus != EnumRequestStatus.Refused&&
                 p.RequestStatus !=EnumRequestStatus.None&&
                 p.RequestStatus !=EnumRequestStatus.Completed&&
-                p.RequestStatus !=EnumRequestStatus.Cancelled
+                p.RequestStatus !=EnumRequestStatus.Cancelled,true
             ).ConfigureAwait(false);
             foreach (var countPlan in countPlans)
             {
-                var countPlanDetails = countPlan.Details.Where(p => selectLocationCodes.Contains(p.LocationCode));
-                if (countPlanDetails != null || countPlanDetails.Count() > 0)
+                var countPlanDetails = countPlan.Details.Where(p => selectLocationCodes.Contains(p.LocationCode)).ToList();
+                if (countPlanDetails != null && countPlanDetails.Count() > 0)
                 {
                     throw new UserFriendlyException($"库位只能存在于一个盘点计划中，盘点计划号【{countPlan.Number}】中已包含【{countPlanDetails.First().LocationCode}】库位。");
                 }