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 /// /// 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 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 私有 /// @@ -363,7 +373,6 @@ public class KittingIssueJobAppService private async Task SyncIssueJobStereoAsync(List 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 detail.IssuedQty) + if (detail.Qty >= detail.IssuedQty) { flag = false; return; @@ -197,8 +197,6 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase