修改 直接发料 变更为 非生产调拨

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>

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));
+                var countPlanDetails = countPlan.Details.Where(p => selectLocationCodes.Contains(p.LocationCode)).ToList();
-                if (countPlanDetails != null || countPlanDetails.Count() > 0)
+                if (countPlanDetails != null && countPlanDetails.Count() > 0)
                 {
                     throw new UserFriendlyException($"库位只能存在于一个盘点计划中，盘点计划号【{countPlan.Number}】中已包含【{countPlanDetails.First().LocationCode}】库位。");
                 }