From b96ce0a45451c34d7c108c577ae3cf70aef84826 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 13 Jun 2024 08:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=BA=93=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=94=B9=E6=88=90=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ThirdLocationJobs/ThirdLocationJobAppService.cs   | 11 ++++++++++-
 .../Jobs/ThirdLocationJobEventHandler.cs              |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs
index 83121b505..9707f05ec 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs
+++ b/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
             {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs
index af8b6ad51..aa86d7425 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/ThirdLocationJobEventHandler.cs
+++ b/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);
 
         }