修改记录

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -99,15 +99,11 @@ public class KittingIssueJobAppService
             throw new UserFriendlyException($"未找到ID为 {id} 的任务");
         }
 
-        if (kittingJob.JobStatus == EnumJobStatus.Open || kittingJob.JobStatus == EnumJobStatus.Partial ||
-            kittingJob.JobStatus == EnumJobStatus.Wait)
+        if (kittingJob.JobStatus == EnumJobStatus.Open ||
+            kittingJob.JobStatus == EnumJobStatus.Partial ||
+            kittingJob.JobStatus == EnumJobStatus.Wait||
+            kittingJob.JobStatus == EnumJobStatus.Doing)
         {
-            throw new UserFriendlyException($"任务状态不是" +
-                                            $"{EnumJobStatus.Open.GetDisplayName()}、" +
-                                            $"{EnumJobStatus.Partial.GetDisplayName()}、" +
-                                            $"{EnumJobStatus.Wait.GetDisplayName()}");
-        }
-
             await _expectOutAppService.RemoveByNumberAsync(kittingJob.Number).ConfigureAwait(false);
             await _transferLibRequestAppService.CancelByCallRequestNumberAsync(kittingJob.KittingRequestNumber)
                 .ConfigureAwait(false);
@@ -115,6 +111,15 @@ public class KittingIssueJobAppService
             kittingJob.JobStatus = EnumJobStatus.Cancelled;
             await _repository.UpdateAsync(kittingJob).ConfigureAwait(false);
         }
+        else
+        {
+            throw new UserFriendlyException($"任务状态不是" +
+                                            $"{EnumJobStatus.Open.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Partial.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Doing.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Wait.GetDisplayName()}");
+        }
+    }
 
     [HttpPost("by-request-number/{requestNumber}")]
     public virtual async Task<List<KittingIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs

@@ -398,10 +398,13 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
             await _repository.UpdateAsync(request).ConfigureAwait(false);
         }
         else
+        {
+            if (request.RequestStatus != EnumRequestStatus.Completed)
             {
                 throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
             }
         }
+    }
 
     /// <summary>
     ///     【创建】库移请求