盘点去掉盘点excle和pda盘点

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/CountJobs/Inputs/CountJobCreateRequestInput.cs

@@ -23,12 +23,6 @@ public class CountJobCreateRequestInput
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string Description { get; set; }
 
-    /// <summary>
-    /// 盘点执行形式
-    /// </summary>
-    [Display(Name = "盘点执行形式")]
-    public CountPlanRequestType RequestType { get; set; }
-
     /// <summary>
     ///     类型
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanDTO.cs

@@ -88,9 +88,5 @@ public class CountPlanDTO : SfsStoreRequestDTOBase<CountPlanDetailDTO>
     [Display(Name = "盘点的库存状态集合")]
     public string JsonInventoryStatus { get; set; }
 
-    /// <summary>
+
-    /// 盘点的库存状态集合
-    /// </summary>
-    [Display(Name = "盘点的库存状态集合")]
-    public CountPlanRequestType RequestType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/DTOs/CountPlanForNoteExportDTO.cs

@@ -87,11 +87,6 @@ public class CountPlanForNoteExportDTO
     [Display(Name = "盘点数量")]
     public decimal FirstCountQty { get; set; }
 
-    /// <summary>
-    /// 盘点方式
-    /// </summary>
-    [Display(Name = "盘点方式")]
-    public CountPlanRequestType RequestType { get; set; }
 
     /// <summary>
     /// 库存状态

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanCreateRequestInput.cs

@@ -48,13 +48,6 @@ public class CountPlanCreateRequestInput : SfsStoreRequestCreateOrUpdateInputBas
     [Display(Name = "计划时间")]
     public DateTime PlanTime { get; set; }
 
-    /// <summary>
-    /// 盘点方式
-    /// </summary>
-    [Display(Name = "盘点方式")]
-    public CountPlanRequestType RequestType { get; set; }
-
-
     /// <summary>
     /// 盘点次数
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Plans/CountPlans/Inputs/CountPlanEditInput.cs

@@ -76,11 +76,6 @@ public class CountPlanEditInput : SfsStoreRequestCreateOrUpdateInputBase, IHasNu
     [Display(Name = "类型")]
     public EnumCountType Type { get; set; }
 
-    /// <summary>
-    /// 盘点方式
-    /// </summary>
-    [Display(Name = "盘点方式")]
-    public CountPlanRequestType RequestType { get; set; }
 
     /// <summary>
     /// 盘点的零件集合

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CountNotes/CountNoteAppService.cs

@@ -131,10 +131,10 @@ public class CountNoteAppService :
 
     private static void CheckCountPlanRequestType(CountPlanDTO countPlanDto)
     {
-        if (countPlanDto.RequestType != CountPlanRequestType.Import)
+        //if (countPlanDto.RequestType != CountPlanRequestType.Import)
-        {
+        //{
-            throw new UserFriendlyException("非Excel盘点执行方式不能使用导入");
+        //    throw new UserFriendlyException("非Excel盘点执行方式不能使用导入");
-        }
+        //}
     }
 
     private static void CheckCountPlanNumber(CountPlanDTO countPlanDto, string countPlanNumber)
@@ -196,10 +196,10 @@ public class CountNoteAppService :
 
             if (countplan != null)
             {
-                if (countplan.RequestType != CountPlanRequestType.Import)
+                //if (countplan.RequestType != CountPlanRequestType.Import)
-                {
+                //{
-                    throw new UserFriendlyException("非Excel盘点执行方式不能使用导入");
+                //    throw new UserFriendlyException("非Excel盘点执行方式不能使用导入");
-                }
+                //}
             }
             else
             {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Plans/CountPlans/CountPlanAppService.cs

@@ -65,36 +65,42 @@ public class CountPlanAppService :
         var entity = ObjectMapper.Map<CountPlanCreateRequestInput, CountPlan>(input);
 
         entity.Worker = CurrentUser.GetUserName();
-
+        TransactionTypeDTO tranTypeDto = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.CountPlan,
-        TransactionTypeDTO tranTypeDto = null;
+        EnumTransSubType.None).ConfigureAwait(false);
-        switch (input.RequestType)
+        if (tranTypeDto == null)
         {
-            case CountPlanRequestType.Manual:
+            throw new UserFriendlyException(
-                tranTypeDto = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.CountPlan,
+                $"没有设置库存事务类型。主事务类型{EnumTransType.CountPlan}，" +
-                    EnumTransSubType.ArtificialCountPlan).ConfigureAwait(false);
+                $"子事务类型{EnumTransSubType.None}");
-                if (tranTypeDto == null)
-                {
-                    throw new UserFriendlyException(
-                        $"盘点方式 {input.RequestType} 没有设置库存事务类型。主事务类型{EnumTransType.CountPlan}，" +
-                        $"子事务类型{EnumTransSubType.ArtificialCountPlan}");
-                }
-
-                break;
-            case CountPlanRequestType.Import:
-                tranTypeDto = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.CountPlan,
-                    EnumTransSubType.ExcelInCountPlan).ConfigureAwait(false);
-                if (tranTypeDto == null)
-                {
-                    throw new UserFriendlyException(
-                        $"盘点方式 {input.RequestType} 没有设置库存事务类型。主事务类型{EnumTransType.CountPlan}，" +
-                        $"子事务类型{EnumTransSubType.ExcelInCountPlan}");
-                }
-
-                break;
-            case CountPlanRequestType.None:
-            default:
-                throw new UserFriendlyException($"{input.RequestType}盘点方式设置错误");
         }
+        //switch (input.RequestType)
+        //{
+        //    case CountPlanRequestType.Manual:
+        //        tranTypeDto = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.CountPlan,
+        //            EnumTransSubType.ArtificialCountPlan).ConfigureAwait(false);
+        //        if (tranTypeDto == null)
+        //        {
+        //            throw new UserFriendlyException(
+        //                $"盘点方式 {input.RequestType} 没有设置库存事务类型。主事务类型{EnumTransType.CountPlan}，" +
+        //                $"子事务类型{EnumTransSubType.ArtificialCountPlan}");
+        //        }
+
+        //        break;
+        //    case CountPlanRequestType.Import:
+        //        tranTypeDto = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.CountPlan,
+        //            EnumTransSubType.ExcelInCountPlan).ConfigureAwait(false);
+        //        if (tranTypeDto == null)
+        //        {
+        //            throw new UserFriendlyException(
+        //                $"盘点方式 {input.RequestType} 没有设置库存事务类型。主事务类型{EnumTransType.CountPlan}，" +
+        //                $"子事务类型{EnumTransSubType.ExcelInCountPlan}");
+        //        }
+
+        //        break;
+        //    case CountPlanRequestType.None:
+        //    default:
+        //        throw new UserFriendlyException($"{input.RequestType}盘点方式设置错误");
+        //}
 
         entity.AutoCompleteJob = tranTypeDto.AutoCompleteJob;
         entity.AutoSubmit = tranTypeDto.AutoSubmitRequest;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/CountNotes/CountNoteManager.cs

@@ -95,12 +95,12 @@ public class CountNoteManager : SfsStoreManagerBase<CountNote, CountNoteDetail>,
 
         //变更盘点计划为完成
         var countPlan = await _countPlanRepository.GetAsync(p => p.Number == entity.CountPlanNumber).ConfigureAwait(false);
-        if (countPlan.RequestType == CountPlanRequestType.Import)
+        //if (countPlan.RequestType == CountPlanRequestType.Import)
-        {
+        //{
-            countPlan.RequestStatus = EnumRequestStatus.Completed;
+        //    countPlan.RequestStatus = EnumRequestStatus.Completed;
-            countPlan.EndTime = DateTime.Now;
+        //    countPlan.EndTime = DateTime.Now;
-            await _countPlanRepository.UpdateAsync(countPlan).ConfigureAwait(false);
+        //    await _countPlanRepository.UpdateAsync(countPlan).ConfigureAwait(false);
-        }
+        //}
     }
 
     private async Task ThawBalancesAsync(CountNote entity)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlan.cs

@@ -29,11 +29,6 @@ public class CountPlan : SfsStoreRequestAggregateRootBase<CountPlanDetail>
     /// </summary>
     public int InventoryStage { get; set; }
 
-    /// <summary>
-    /// 盘点执行形式
-    /// </summary>
-    public CountPlanRequestType RequestType { get; set; }
-
     /// <summary>
     /// 盘点方式
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Plans/CountPlans/CountPlanDbContextModelCreatingExtensions.cs

@@ -21,7 +21,6 @@ public static class CountPlanDbContextModelCreatingExtensions
             //Properties
             b.Property(q => q.Type).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.Stage).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
-            b.Property(q => q.RequestType).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.CountMethod).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.InventoryMode).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
             b.Property(q => q.RequestStatus).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Jobs/CountJobAutoMapperProfile.cs

@@ -45,7 +45,6 @@ public partial class StoreEventAutoMapperProfile : Profile
             .Ignore(x => x.AutoHandle)
             .Ignore(x => x.AutoCompleteJob)
             .Ignore(x => x.DirectCreateNote)
-            .Ignore(x => x.RequestType)
             .Ignore(x => x.ActiveDate)
             .Ignore(x => x.BeginTime)
             .Ignore(x => x.EndTime)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/CountPlanEventHandler.cs

@@ -37,21 +37,7 @@ public class CountPlanEventHandler
     public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<CountPlan> eventData)
     {
         var entity = eventData.Entity;
-
+        await FreezeBalancesAsync(entity).ConfigureAwait(false);
-        switch (entity.RequestType)
-        {
-            case CountPlanRequestType.Import:
-                //冻结库存
-                await FreezeBalancesAsync(entity).ConfigureAwait(false);
-                break;
-            case CountPlanRequestType.Manual:
-                //冻结库存
-                await FreezeBalancesAsync(entity).ConfigureAwait(false);
-                break;
-            case CountPlanRequestType.None:
-            default:
-                throw new UserFriendlyException("盘点执行方式错误");
-        }
     }
 
     /// <summary>