From acc2ff28e0b6d71f3e30c937a403697e98774583 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Mon, 13 May 2024 09:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=AE=A1=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueJobs/KittingIssueJobAppService.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 439faa51a..782d22947 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
@@ -201,14 +201,14 @@ public class KittingIssueJobAppService
 
         if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
-            await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
+            await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty).ConfigureAwait(false);
         }
         else
         {
             var detail = kittingIssueJob.Details.First(p => p.Id == issueJobDetailDto.Id);
             if (issueJobDetail.HandledToQty >= detail.RequestQty)
             {
-                await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
+                await UpdateRequestAndjobStatusDoneAsync(kittingIssueJob, issueJobDetailDto, issueJobDetailDto.HandledToQty).ConfigureAwait(false);
             }
         }
 
@@ -350,7 +350,7 @@ public class KittingIssueJobAppService
     /// <returns></returns>
     /// <exception cref="UserFriendlyException"></exception>
     private async Task UpdateRequestAndjobStatusDoneAsync(KittingIssueJob kittingIssueJob,
-        KittingIssueJobDetailDTO kittingIssueJobDetailDto)
+        KittingIssueJobDetailDTO kittingIssueJobDetailDto,decimal handledToQty)
     {
         if (kittingIssueJob.JobStatus is EnumJobStatus.Closed or EnumJobStatus.Cancelled or EnumJobStatus.None
             or EnumJobStatus.Done) //需要考虑下 多次提交的问题 所以不判断 进行中
@@ -365,9 +365,9 @@ public class KittingIssueJobAppService
             kittingIssueJobDetailDto.ItemCode,
             kittingIssueJobDetailDto.HandledToLocationCode, kittingIssueJobDetailDto.HandledToPackingCode,
             kittingIssueJobDetailDto.Status, kittingIssueJobDetailDto.HandledToLot,
-            kittingIssueJobDetailDto.HandledToQty).ConfigureAwait(false);
+            handledToQty).ConfigureAwait(false);
 
-        await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
+        //await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
 
         await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber)
             .ConfigureAwait(false);