Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs

@@ -103,8 +103,19 @@ public class ThirdLocationJobAppService
         {
             throw new UserFriendlyException($"未找到ID为 {id} 的任务");
         }
+        else
+        {
+            if (thirdLocationJob.JobStatus == EnumJobStatus.Partial)
+            {
+                await _thirdLocationJobManager.CloseAsync(thirdLocationJob).ConfigureAwait(false);
+            }
+            else
+            {
+                throw new UserFriendlyException($"【{thirdLocationJob.JobStatus.GetDisplayName()}】状态不允许终止");
+            }
+        }
+
        
-        await _thirdLocationJobManager.CloseAsync(thirdLocationJob).ConfigureAwait(false);
     }
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs

@@ -212,10 +212,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
         {
             foreach (var thirdLocationJobDto in list)
             {
-                if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open ||
+                if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open)
-                    thirdLocationJobDto.JobStatus == EnumJobStatus.Partial ||
-                    thirdLocationJobDto.JobStatus == EnumJobStatus.Doing ||
-                    thirdLocationJobDto.JobStatus == EnumJobStatus.Wait)
                 {
                     await _thirdLocationJobAppService.CancelAsync(thirdLocationJobDto.Id).ConfigureAwait(false);
                 }
@@ -226,7 +223,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
             }
         }
 
-        if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling ||
+        if (request.RequestStatus == EnumRequestStatus.Handling ||
             request.RequestStatus == EnumRequestStatus.New)
         {
             request.RequestStatus = EnumRequestStatus.Cancelled;
@@ -234,7 +231,6 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
             await LocalEventBus.PublishAsync(new SfsCancelledEntityEventData<ThirdLocationRequest>(request), false).ConfigureAwait(false);
             await _repository.UpdateAsync(request).ConfigureAwait(false);
             
-            
         }
         else
         {