7 changed files with 342 additions and 4 deletions
@ -0,0 +1,188 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text.Json; |
|||
using System.Threading.Tasks; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Application.Dtos; |
|||
using Volo.Abp.AspNetCore.Mvc; |
|||
using Win_in.Sfs.Auth.Application.Contracts; |
|||
using Win_in.Sfs.Shared.Domain; |
|||
using Win_in.Sfs.Shared.Domain.Shared; |
|||
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|||
|
|||
namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs.IssueJobs; |
|||
|
|||
/// <summary>
|
|||
/// kitting叫料PDA任务
|
|||
/// </summary>
|
|||
[ApiController] |
|||
[Route($"{PdaHostConst.ROOT_ROUTE}job/injection-issue")] |
|||
public class InjectionIssueJobsController : AbpController |
|||
{ |
|||
private readonly IInjectionIssueJobAppService _injectionIssueJobAppService; |
|||
|
|||
private readonly IUserWorkGroupAppService _userWorkGroupAppService; |
|||
|
|||
public InjectionIssueJobsController(IInjectionIssueJobAppService injectionIssueJobAppService, IUserWorkGroupAppService userWorkGroupAppService) |
|||
{ |
|||
_injectionIssueJobAppService = injectionIssueJobAppService; |
|||
_userWorkGroupAppService = userWorkGroupAppService; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 获取列表
|
|||
/// </summary>
|
|||
/// <param name="pageSize"></param>
|
|||
/// <param name="pageIndex"></param>
|
|||
/// <param name="isFinished"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("list")] |
|||
public virtual async Task<PagedResultDto<InjectionIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, |
|||
bool isFinished) |
|||
{ |
|||
var status = new List<int>(); |
|||
if (isFinished) |
|||
{ |
|||
status.Add((int)EnumJobStatus.Done); |
|||
} |
|||
else |
|||
{ |
|||
status.Add((int)EnumJobStatus.Open); |
|||
status.Add((int)EnumJobStatus.Wait); |
|||
status.Add((int)EnumJobStatus.Doing); |
|||
status.Add((int)EnumJobStatus.Partial); |
|||
} |
|||
|
|||
var jsonStatus = JsonSerializer.Serialize(status); |
|||
|
|||
var request = new SfsJobRequestInputBase |
|||
{ |
|||
MaxResultCount = pageSize, |
|||
SkipCount = (pageIndex - 1) * pageSize, |
|||
Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC", |
|||
Condition = new Condition |
|||
{ |
|||
Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") } |
|||
} |
|||
}; |
|||
|
|||
var list = await _injectionIssueJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false); |
|||
|
|||
return list; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 承接任务
|
|||
/// </summary>
|
|||
/// <param name="id"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("take/{id}")] |
|||
public virtual async Task TakeAsync(Guid id) |
|||
{ |
|||
await _injectionIssueJobAppService.AcceptAsync(id).ConfigureAwait(false); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 取消承接任务
|
|||
/// </summary>
|
|||
/// <param name="id"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("cancel-take/{id}")] |
|||
public virtual async Task CancelTakeAsync(Guid id) |
|||
{ |
|||
await _injectionIssueJobAppService.CancelAcceptAsync(id).ConfigureAwait(false); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 执行任务明细
|
|||
/// </summary>
|
|||
/// <returns></returns>
|
|||
[HttpPost("ExecuteDetail/{masterId}")] |
|||
public async Task ExecuteDetailAsync(Guid masterId, Guid detailId, InjectionIssueJobDetailDTO issueJobDetailDto) |
|||
{ |
|||
await _injectionIssueJobAppService.ExecuteDetailAsync(masterId, detailId, issueJobDetailDto).ConfigureAwait(false); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 获取任务数量
|
|||
/// </summary>
|
|||
/// <returns></returns>
|
|||
[HttpGet("count")] |
|||
public virtual async Task<ActionResult<long>> CountAsync() |
|||
{ |
|||
var status = new List<int> |
|||
{ |
|||
(int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial, (int)EnumJobStatus.Wait |
|||
}; |
|||
var jsonStatus = JsonSerializer.Serialize(status); |
|||
|
|||
var request = new SfsJobRequestInputBase |
|||
{ |
|||
Sorting = $"{nameof(InspectJobDTO.Priority)} ASC", |
|||
Condition = new Condition |
|||
{ |
|||
Filters = new List<Filter> |
|||
{ |
|||
//new(nameof(InspectJobDTO.WorkGroupCode),jsonCodes,"In"),
|
|||
new(nameof(InspectJobDTO.JobStatus), jsonStatus, "In") |
|||
} |
|||
} |
|||
}; |
|||
|
|||
var count = await _injectionIssueJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false); |
|||
|
|||
return Ok(count); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 获取任务详情
|
|||
/// </summary>
|
|||
/// <param name="id"></param>
|
|||
/// <returns></returns>
|
|||
[HttpGet("{id}")] |
|||
public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetAsync(Guid id) |
|||
{ |
|||
var result = await _injectionIssueJobAppService.GetAsync(id).ConfigureAwait(false); |
|||
return Ok(result); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 根据Job Number 获取盘点任务列表
|
|||
/// </summary>
|
|||
/// <param name="jobNumber"></param>
|
|||
/// <returns></returns>
|
|||
[HttpGet("by-number/{jobNumber}")] |
|||
public virtual async Task<ActionResult<InjectionIssueJobDTO>> GetByNumberAsync(string jobNumber) |
|||
{ |
|||
var jobDto = await _injectionIssueJobAppService.GetByNumberAsync(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}"); |
|||
} |
|||
|
|||
if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id) |
|||
{ |
|||
return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理"); |
|||
} |
|||
|
|||
return jobDto; |
|||
} |
|||
|
|||
/// <summary>
|
|||
///
|
|||
/// </summary>
|
|||
/// <param name="requestNumber"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("by-request-number/{requestNumber}")] |
|||
public virtual async Task<List<InjectionIssueJobDTO>> GetByRequestNumberAsync(string requestNumber) |
|||
{ |
|||
return await _injectionIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false); |
|||
} |
|||
} |
|||
@ -0,0 +1,135 @@ |
|||
using System; |
|||
using System.Collections.Generic; |
|||
using System.Text.Json; |
|||
using System.Threading.Tasks; |
|||
using Microsoft.AspNetCore.Mvc; |
|||
using Volo.Abp; |
|||
using Volo.Abp.Application.Dtos; |
|||
using Volo.Abp.AspNetCore.Mvc; |
|||
using Win_in.Sfs.Auth.Application.Contracts; |
|||
using Win_in.Sfs.Shared.Domain; |
|||
using Win_in.Sfs.Shared.Domain.Shared; |
|||
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|||
|
|||
namespace Win_in.Sfs.Wms.Pda.Controllers.Stores; |
|||
|
|||
/// <summary>
|
|||
/// 注塑叫料请求
|
|||
/// </summary>
|
|||
[ApiController] |
|||
[Route($"{PdaHostConst.ROOT_ROUTE}store/injection-request")] |
|||
public class InjectionRequestController : AbpController |
|||
{ |
|||
private readonly IInjectionIssueRequestAppService _injectionIssueRequestAppService; |
|||
|
|||
private readonly IUserWorkGroupAppService _userWorkGroupAppService; |
|||
|
|||
/// <summary>
|
|||
/// </summary>
|
|||
/// <param name="injectionIssueRequestAppService"></param>
|
|||
public InjectionRequestController(IInjectionIssueRequestAppService injectionIssueRequestAppService, |
|||
IUserWorkGroupAppService userWorkGroupAppService) |
|||
{ |
|||
_injectionIssueRequestAppService = injectionIssueRequestAppService; |
|||
_userWorkGroupAppService = userWorkGroupAppService; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// Kitting叫料申请
|
|||
/// </summary>
|
|||
/// <param name="input"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("")] |
|||
public virtual async Task CreateAsync(InjectionIssueRequestEditInput input) |
|||
{ |
|||
await _injectionIssueRequestAppService.CreateAndHandleAsync(input).ConfigureAwait(false); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// </summary>
|
|||
/// <param name="pageSize"></param>
|
|||
/// <param name="pageIndex"></param>
|
|||
/// <param name="isFinished"></param>
|
|||
/// <returns></returns>
|
|||
[HttpPost("list")] |
|||
public virtual async Task<PagedResultDto<InjectionIssueRequestDTO>> GetListAsync(int pageSize, int pageIndex, |
|||
bool isFinished) |
|||
{ |
|||
var status = new List<int>(); |
|||
if (isFinished) |
|||
{ |
|||
status.Add((int)EnumRequestStatus.Completed); |
|||
} |
|||
else |
|||
{ |
|||
status.Add((int)EnumRequestStatus.Partial); |
|||
status.Add((int)EnumRequestStatus.Handling); |
|||
status.Add((int)EnumRequestStatus.New); |
|||
} |
|||
|
|||
var jsonStatus = JsonSerializer.Serialize(status); |
|||
|
|||
var request = new SfsStoreRequestInputBase |
|||
{ |
|||
MaxResultCount = pageSize, |
|||
SkipCount = (pageIndex - 1) * pageSize, |
|||
Sorting = $"{nameof(InjectionIssueRequestDTO.CreationTime)} ASC", |
|||
Condition = new Condition |
|||
{ |
|||
Filters = new List<Filter> { new(nameof(InjectionIssueRequestDTO.RequestStatus), jsonStatus, "In") } |
|||
} |
|||
}; |
|||
|
|||
var list = await _injectionIssueRequestAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false); |
|||
|
|||
return list; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// </summary>
|
|||
/// <param name="id"></param>
|
|||
[HttpPost("handle/{id}")] |
|||
public virtual async Task HandleAsync(Guid id) |
|||
{ |
|||
await _injectionIssueRequestAppService.HandleAsync(id).ConfigureAwait(false); |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 根据Job Number 获取盘点任务列表
|
|||
/// </summary>
|
|||
/// <param name="requestNumber"></param>
|
|||
/// <returns></returns>
|
|||
[HttpGet("by-number/{requestNumber}")] |
|||
public virtual async Task<ActionResult<InjectionIssueRequestDTO>> GetByNumberAsync(string requestNumber) |
|||
{ |
|||
var jobDto = await _injectionIssueRequestAppService.GetByNumberAsync(requestNumber).ConfigureAwait(false); |
|||
if (jobDto == null) |
|||
{ |
|||
throw new UserFriendlyException($"未找到编号为 {requestNumber} 的请求"); |
|||
} |
|||
|
|||
return jobDto; |
|||
} |
|||
|
|||
/// <summary>
|
|||
/// 获取任务详情
|
|||
/// </summary>
|
|||
/// <param name="id"></param>
|
|||
/// <returns></returns>
|
|||
[HttpGet("{id}")] |
|||
public virtual async Task<ActionResult<InjectionIssueRequestDTO>> GetAsync(Guid id) |
|||
{ |
|||
var result = await _injectionIssueRequestAppService.GetAsync(id).ConfigureAwait(false); |
|||
return Ok(result); |
|||
} |
|||
|
|||
/// <summary>
|
|||
///
|
|||
/// </summary>
|
|||
/// <returns></returns>
|
|||
[HttpPost("IsHasNewJob")] |
|||
public virtual async Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber) |
|||
{ |
|||
return await _injectionIssueRequestAppService.IsHasNewJobAsync(requestNumber, jobNumber).ConfigureAwait(false); |
|||
} |
|||
} |
|||
Loading…
Reference in new issue