三方库终止功能改成完成

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

@@ -6,13 +6,16 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Domain.Shared;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -107,7 +110,13 @@ public class ThirdLocationJobAppService
         {
             if (thirdLocationJob.JobStatus == EnumJobStatus.Partial)
             {
-                await _thirdLocationJobManager.CloseAsync(thirdLocationJob).ConfigureAwait(false);
+                thirdLocationJob.JobStatus = EnumJobStatus.Done;
+                await Task.CompletedTask.ConfigureAwait(false);
+                await LocalEventBus.PublishAsync(new SfsClosedEntityEventData<ThirdLocationJob>(thirdLocationJob), false).ConfigureAwait(false);
+                await Repository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
+
+                //await _thirdLocationJobManager.CloseAsync(thirdLocationJob).ConfigureAwait(false);
+
             }
             else
             {

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

@@ -123,7 +123,7 @@ public class ThirdLocationJobEventHandler :
 
             await _transferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
 
-            thirdLocationRequest.RequestStatus = EnumRequestStatus.Abort;
+            thirdLocationRequest.RequestStatus = EnumRequestStatus.Completed;
             await _thirdLocationRequestManager.UpdateAsync(thirdLocationRequest).ConfigureAwait(false);
 
         }