From 60a86026e4964f7dbfb9e125aa3c3ae57e4047c7 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Tue, 14 May 2024 09:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueJobs/KittingIssueJobAppService.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index c349fbe50..1be488c64 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@@ -104,6 +104,15 @@ public class KittingIssueJobAppService
         {
             throw new UserFriendlyException($"未找到ID为 {id} 的任务");
         }
+
+        if (kittingJob.JobStatus == EnumJobStatus.Open || kittingJob.JobStatus == EnumJobStatus.Partial ||
+            kittingJob.JobStatus == EnumJobStatus.Wait)
+        {
+            throw new UserFriendlyException($"任务状态不是{kittingJob.JobStatus == EnumJobStatus.Open}、" +
+                                            $"{kittingJob.JobStatus == EnumJobStatus.Partial}、" +
+                                            $"{kittingJob.JobStatus == EnumJobStatus.Wait}");
+        }
+
         await _expectOutAppService.RemoveByNumberAsync(kittingJob.Number).ConfigureAwait(false);
         kittingJob.JobStatus = EnumJobStatus.Cancelled;
         await _repository.UpdateAsync(kittingJob).ConfigureAwait(false);
@@ -138,11 +147,15 @@ public class KittingIssueJobAppService
     {
         var job = await _repository.FindAsync(p => p.Number == dto.CallJobNumber).ConfigureAwait(false);
 
-        var transferLibJobDto = await _transferLibJobAppService.GetByNumberAsync(dto.Number).ConfigureAwait(false);
+        if (job.JobStatus != EnumJobStatus.Wait)
+        {
+            throw new UserFriendlyException($"任务状态不是{EnumJobStatus.Wait.GetDisplayName()}");
+        }
 
         var transferLibNoteDetail = dto.Details.First();
 
         var jobDetail = job.Details.First();
+
         job.JobStatus = EnumJobStatus.Open;
 
         jobDetail.TransferLibFromArriveDate = transferLibNoteDetail.HandledFromArriveDate;