From bf99be533ab1c21ce3adf27ab84da23cc241330b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 12 Nov 2024 19:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseReturnJobAppService.cs                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReturnJobs/PurchaseReturnJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReturnJobs/PurchaseReturnJobAppService.cs
index 95a45fa06..6af1a3003 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReturnJobs/PurchaseReturnJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/PurchaseReturnJobs/PurchaseReturnJobAppService.cs
@@ -77,6 +77,12 @@ public class PurchaseReturnJobAppService
     public override async Task<PurchaseReturnJobDTO> CompleteAsync(Guid id, PurchaseReturnJobDTO dto)
     {
         var job = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (job.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
+       or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
+        {
+            throw new UserFriendlyException($"任务状态错误：编号为【{job.Number}】的任务已经【{job.JobStatus.GetDisplayName()}】");
+        }
+
         var handleDto = new PurchaseReturnJobDTO();
 
         var handleEntity = ObjectMapper.Map<PurchaseReturnJobDTO, PurchaseReturnJob>(dto);
@@ -85,19 +91,14 @@ public class PurchaseReturnJobAppService
             await _purchaseReturnJobManager.CompleteAsync(handleEntity, CurrentUser).ConfigureAwait(false);
         handleDto = ObjectMapper.Map<PurchaseReturnJob, PurchaseReturnJobDTO>(handleResult);
 
-        if (job.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
-         or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
-        {
-            throw new UserFriendlyException($"任务状态错误：编号为【{job.Number}】的任务已经【{job.JobStatus.GetDisplayName()}】");
-        }
-
+      
         
         handleResult.CompleteUserName = dto.Worker;
         handleResult.JobStatus = EnumJobStatus.Done;
         job = await _repository.UpdateAsync(handleResult).ConfigureAwait(false);
         await UpdateRequestStatusAsync(job.PurchaseReturnRequestNumber).ConfigureAwait(false);
      
-
+    
 
         return handleDto;