From 02926e7a2569a96df4c59756cf7d2e790622d3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Mon, 21 Oct 2024 16:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnplannedIssueJobAppService.cs                 | 14 ++++++++++++--
 .../UnplannedIssueRequestForDongyangAppService.cs  |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
index 51dc18e3d..431be17f9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
@@ -89,10 +89,20 @@ public class UnplannedIssueJobAppService
     {
         List<BalanceDTO> useBalancesOut = new EditableList<BalanceDTO>();
         var jobs = await BuildUnplannedIssueJobAsync(requestDto, useBalancesOut).ConfigureAwait(false);
+        if (useBalancesOut.Count == 0)
+        {
+            throw new UserFriendlyException($"请求单号{requestDto.Number},无推荐库位请检查是否又库存!");
+        }
+
+
+
         await _unplannedIssueJobManager.AddManyAsync(jobs).ConfigureAwait(false);
         //await _repository.InsertManyAsync(jobs.ToList()).ConfigureAwait(false);
         var first = jobs.FirstOrDefault();
         var outEditInputs = await BuildExpectOutAsync(useBalancesOut).ConfigureAwait(false);
+
+       
+
         foreach (var itm in outEditInputs)
         {
             itm.JobNumber = first.Number;
@@ -163,7 +173,7 @@ public class UnplannedIssueJobAppService
 
 
         // 返回实际扣减的库存数量
-        return balanceDTOs;
+        return tuple;
     }
 
 
@@ -512,7 +522,7 @@ public class UnplannedIssueJobAppService
         var handleEntity = ObjectMapper.Map<UnplannedIssueJobDTO, UnplannedIssueJob>(dto);
         var handleResult = await _unplannedIssueJobManager.CompleteAsync(handleEntity, CurrentUser).ConfigureAwait(false);
         handleDto = ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueJobDTO>(handleResult);
-        await _expectOutAppService.RemoveAsync(dto.Number).ConfigureAwait(false);
+        await _expectOutAppService.RemoveAsync(job.Number).ConfigureAwait(false);
 
         handleResult.CompleteUserName = dto.Worker;
         handleResult.JobStatus = EnumJobStatus.Done;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index d061f13b8..27218ff9b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -284,6 +284,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
             detail.ProjCapacityCode = first.ProjCapacityCode;
             detail.OnceBusiCode = first.OnceBusiCode;
             detail.Explain = first.Explain;
+            detail.ExpireDate = DateTime.MaxValue;