diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs index f9642b25b..6c04f28ce 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs @@ -44,7 +44,7 @@ public class SparePartIssueJobsController : AbpController if (jobStatus == "ALL") { status.Add((int)EnumJobStatus.Open); - status.Add((int)EnumJobStatus.Wait); + //status.Add((int)EnumJobStatus.Wait); status.Add((int)EnumJobStatus.Doing); status.Add((int)EnumJobStatus.Partial); } @@ -162,17 +162,18 @@ public class SparePartIssueJobsController : AbpController [HttpGet("by-number/{jobNumber}")] public virtual async Task> GetByNumberAsync(string jobNumber) { - var jobDto = await _sparePartIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false); + //var jobDto = await _sparePartIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false); + var jobDto = await _sparePartIssueJobAppService.GetByNumber2Async(jobNumber).ConfigureAwait(false); if (jobDto == null) { throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务"); } - var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); - if (!wlgCodes.Contains(jobDto.WorkGroupCode)) - { - return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); - } + //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); + //if (!wlgCodes.Contains(jobDto.WorkGroupCode)) + //{ + // return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}"); + //} if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.ClaimsUserId != CurrentUser.Id.ToString()) { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs index ac7a71a34..0aaefbff3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs @@ -24,4 +24,6 @@ public interface ISparePartIssueJobAppService /// /// Task CompleteByRequestNumberAsync(string requestNumber); + + Task GetByNumber2Async(string number); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index f4962a014..26cedaeac 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; using MyNamespace; using Volo.Abp; +using Volo.Abp.ObjectMapping; using Volo.Abp.Uow; using Volo.Abp.Users; using Win_in.Sfs.Basedata.Application.Contracts; @@ -64,6 +65,14 @@ public class SparePartIssueJobAppService _currentUser = currentUser; } + [HttpPost("get-by-number-2")] + public async Task GetByNumber2Async(string number) + { + var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false); + + return ObjectMapper.Map(entity); + } + [HttpPost("add-many")] public override async Task> CreateManyAsync(List inputs) {