Browse Source

备件任务编号查询不到,问题修复

dev_DY_CC
周红军 10 months ago
parent
commit
64781b3bc9
  1. 15
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/IssueJobs/SparePartIssueJobsController.cs
  2. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs
  3. 9
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

15
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<ActionResult<SparePartIssueJobDTO>> 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())
{

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/ISparePartIssueJobAppService.cs

@ -24,4 +24,6 @@ public interface ISparePartIssueJobAppService
/// <param name="requestNumber"></param>
/// <returns></returns>
Task CompleteByRequestNumberAsync(string requestNumber);
Task<SparePartIssueJobDTO> GetByNumber2Async(string number);
}

9
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<SparePartIssueJobDTO> GetByNumber2Async(string number)
{
var entity = await _repository.FindAsync(p => p.Number == number).ConfigureAwait(false);
return ObjectMapper.Map<SparePartIssueJob, SparePartIssueJobDTO>(entity);
}
[HttpPost("add-many")]
public override async Task<List<SparePartIssueJobDTO>> CreateManyAsync(List<SparePartIssueJobEditInput> inputs)
{

Loading…
Cancel
Save