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 useBalancesOut = new EditableList(); 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(dto); var handleResult = await _unplannedIssueJobManager.CompleteAsync(handleEntity, CurrentUser).ConfigureAwait(false); handleDto = ObjectMapper.Map(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;