Browse Source

任务doing状态也可以取消

dev_DY_CC
周红军 11 months ago
parent
commit
c44bdc03d6
  1. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ThirdLocationRequests/ThirdLocationRequestAppService.cs
  2. 1
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobManagerBase.cs

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

@ -249,7 +249,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
{ {
foreach (var thirdLocationJobDto in list) foreach (var thirdLocationJobDto in list)
{ {
if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open) if (thirdLocationJobDto.JobStatus == EnumJobStatus.Open || thirdLocationJobDto.JobStatus == EnumJobStatus.Doing)
{ {
await _thirdLocationJobAppService.CancelAsync(thirdLocationJobDto.Id).ConfigureAwait(false); await _thirdLocationJobAppService.CancelAsync(thirdLocationJobDto.Id).ConfigureAwait(false);
} }
@ -311,7 +311,7 @@ public class ThirdLocationRequestAppService : SfsStoreRequestAppServiceBase<Thir
await LocalEventBus.PublishAsync(new SfsClosedEntityEventData<ThirdLocationJob>(thirdLocationJob), false).ConfigureAwait(false); await LocalEventBus.PublishAsync(new SfsClosedEntityEventData<ThirdLocationJob>(thirdLocationJob), false).ConfigureAwait(false);
await _thirdLocationJobRepository.UpdateAsync(thirdLocationJob).ConfigureAwait(false); await _thirdLocationJobRepository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
} }
else if (thirdLocationJob.JobStatus == EnumJobStatus.Open) else if (thirdLocationJob.JobStatus == EnumJobStatus.Open || thirdLocationJob.JobStatus == EnumJobStatus.Doing)
{ {
thirdLocationJob.JobStatus = EnumJobStatus.Closed; thirdLocationJob.JobStatus = EnumJobStatus.Closed;
await Task.CompletedTask.ConfigureAwait(false); await Task.CompletedTask.ConfigureAwait(false);

1
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/SfsJobManagerBase.cs

@ -219,6 +219,7 @@ public abstract class SfsJobManagerBase<TEntity, TDetailEntity>
validStatuses = new List<EnumJobStatus> validStatuses = new List<EnumJobStatus>
{ {
EnumJobStatus.Open, EnumJobStatus.Open,
EnumJobStatus.Doing,
EnumJobStatus.Closed, EnumJobStatus.Closed,
}; };
break; break;

Loading…
Cancel
Save