kitting发料修改

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/IKittingIssueRequestAppService.cs

@@ -11,7 +11,7 @@ public interface IKittingIssueRequestAppService
 
 {
     Task<KittingIssueRequestDTO> CreateAndHandleAsync(KittingIssueRequestEditInput input);
-    Task UpdateStatusCompletedAsync(string number);
+    Task UpdateStatusCompletedAsync(string number, string jobNumber);
     Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber);
     Task CreateImportExcelAsync(List<KittingIssueRequestEditInput> inputs);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs

@@ -18,6 +18,6 @@ public interface ITransferLibRequestAppService
          CancellationToken cancellationToken = default);
 
     Task CompleteByJobAsync(string requestNumber);
-    Task CancelByCallRequestNumberAsync(string callRequestNumber);
+    Task CancelByCallRequestNumberAsync(string callJobNumber);
     Task CompleteByCallRequestNumberAsync(string callRequestNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -622,7 +622,7 @@ public class KittingIssueJobAppService
 
         //await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
 
-        await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber)
+        await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber,kittingIssueJob.Number)
             .ConfigureAwait(false);
 
         await Task.CompletedTask.ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs

@@ -179,11 +179,11 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
     }
 
     [HttpPost("UpdateStatusCompleted")]
-    public async Task UpdateStatusCompletedAsync(string number)
+    public async Task UpdateStatusCompletedAsync(string number,string jobNumber)
     {
         var kittingIssueRequest = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
 
-        await UpdateKittingIssueRequestDetailQtyAsync(kittingIssueRequest, new EditableList<KittingIssueJobDTO>())
+        await UpdateKittingIssueRequestDetailQtyAsync(kittingIssueRequest, jobNumber, new EditableList<KittingIssueJobDTO>())
             .ConfigureAwait(false);
 
         var kittingIssueJobDtos = await _kittingIssueJobAppService.GetByRequestNumberAsync(kittingIssueRequest.Number)
@@ -281,7 +281,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
     /// <param name="kittingIssueRequest"></param>
     /// <param name="addKittingIssueJobDtos"></param>
     /// <returns></returns>
-    private async Task UpdateKittingIssueRequestDetailQtyAsync(KittingIssueRequest kittingIssueRequest,
+    private async Task UpdateKittingIssueRequestDetailQtyAsync(KittingIssueRequest kittingIssueRequest,string jobNumber,
         List<KittingIssueJobDTO> addKittingIssueJobDtos)
     {
         //原有任务
@@ -322,7 +322,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         }
 
         await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false);
-        await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(kittingIssueRequest.Number).ConfigureAwait(false);
+        await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false);
     }
 
     #endregion

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs

@@ -313,10 +313,10 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
 
     #endregion
 
-    [HttpPost("Cancel-By-CallRequestNumber")]
-    public async Task CancelByCallRequestNumberAsync(string callRequestNumber)
+    [HttpPost("Cancel-By-CallJobNumber")]
+    public async Task CancelByCallRequestNumberAsync(string callJobNumber)
     {
-        var list=await _repository.GetListAsync(p=>p.CallRequestNumber==callRequestNumber).ConfigureAwait(false);
+        var list=await _repository.GetListAsync(p=>p.CallJobNumber== callJobNumber).ConfigureAwait(false);
         foreach (var request in list)
         {
             await CancelAsync(request.Id).ConfigureAwait(false);