From 9d51fa6bac2e2ec95738bdda40b62bd044b59c0f Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Sat, 11 May 2024 14:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KittingIssueJobs/IKittingIssueJobAppService.cs    |  2 ++
 .../ChassisOperationSequenceAppService.cs             |  2 +-
 .../KittingIssueJobs/KittingIssueJobAppService.cs     | 11 ++++++++++-
 .../KittingIssueRequestAppService.cs                  |  4 +---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/IKittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/IKittingIssueJobAppService.cs
index 549de9dac..42c4c5ab1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/IKittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/IKittingIssueJobAppService.cs
@@ -18,4 +18,6 @@ public interface IKittingIssueJobAppService
     /// </summary>
     /// <returns></returns>
     Task ExecuteDetailAsync(Guid masterId,Guid detailId, KittingIssueJobDetailDTO issueJobDetailDto);
+
+    Task CompleteAsync(Guid id);
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs
index 93187a8f7..949c1fb65 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs
@@ -86,7 +86,7 @@ public class ChassisOperationSequenceAppService
         {
             MaxResultCount = count,
             SkipCount = 0,
-            Sorting = $"{nameof(Chassis.SortNumber)} DESC",
+            Sorting = $"{nameof(Chassis.SortNumber)} ASC",
             Condition = new Condition
             {
                 Filters = new List<Filter>
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 95417e852..aabeebec9 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
@@ -213,6 +213,16 @@ public class KittingIssueJobAppService
         await _repository.UpdateAsync(kittingIssueJob).ConfigureAwait(false);
     }
 
+    [HttpPost("CompleteAsync/{id}")]
+    public async Task CompleteAsync(Guid id)
+    {
+        var kittingIssueJob=await _repository.FindAsync(id).ConfigureAwait(false);
+
+        kittingIssueJob.JobStatus = EnumJobStatus.Done;
+
+        await _repository.UpdateAsync(kittingIssueJob).ConfigureAwait(false);
+    }
+
     #region 私有
 
     /// <summary>
@@ -363,7 +373,6 @@ public class KittingIssueJobAppService
 
     private  async Task<ReusltObject> SyncIssueJobStereoAsync(List<KittingIssueJobDTO> input,string p_loc)
     {
-
         ReusltObject ret = new ReusltObject();
         ret.Code = "1";
         ret.Message = "操作成功";
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
index 7dac2cb09..39b83cadf 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs
@@ -183,7 +183,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
 
             foreach (var detail in kittingIssueRequest.Details)
             {
-                if (detail.Qty > detail.IssuedQty)
+                if (detail.Qty >= detail.IssuedQty)
                 {
                     flag = false;
                     return;
@@ -197,8 +197,6 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
                 await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false);
             }
         }
-
-        kittingIssueRequest.RequestStatus = EnumRequestStatus.Completed;
     }
 
     /// <summary>