You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
233 lines
8.4 KiB
233 lines
8.4 KiB
using System.Threading.Tasks;
|
|
using System;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Volo.Abp.AspNetCore.Mvc;
|
|
using Win_in.Sfs.Auth.Application.Contracts;
|
|
using Win_in.Sfs.Wms.Store.Application.Contracts;
|
|
using System.Collections.Generic;
|
|
using Volo.Abp.Application.Dtos;
|
|
using Win_in.Sfs.Shared.Domain.Shared;
|
|
using System.Text.Json;
|
|
using Win_in.Sfs.Shared.Domain;
|
|
using Volo.Abp;
|
|
|
|
namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
|
|
|
|
[ApiController]
|
|
[Route($"{PdaHostConst.ROOT_ROUTE}job/unplanned-receipt")]
|
|
public class UnplannedReceiptJobController : AbpController
|
|
{
|
|
private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobAppService;
|
|
|
|
private readonly IUserWorkGroupAppService _userWorkGroupAppService;
|
|
|
|
public UnplannedReceiptJobController(IUnplannedReceiptJobAppService unplannedReceiptJobAppService, IUserWorkGroupAppService userWorkGroupAppService)
|
|
{
|
|
_unplannedReceiptJobAppService = unplannedReceiptJobAppService;
|
|
_userWorkGroupAppService = userWorkGroupAppService;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取非生产领料任务详情
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("{id}")]
|
|
|
|
public virtual async Task<ActionResult<UnplannedReceiptJobDTO>> GetAsync(Guid id)
|
|
{
|
|
var result = await _unplannedReceiptJobAppService.GetAsync(id).ConfigureAwait(false);
|
|
return Ok(result);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// 获取列表
|
|
/// </summary>
|
|
/// <param name="pageSize"></param>
|
|
/// <param name="pageIndex"></param>
|
|
/// <param name="isCreationTimeSorting"></param>
|
|
/// <param name="isToday"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("list")]
|
|
public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday)
|
|
{
|
|
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
|
|
var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
|
|
|
|
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
|
|
var jsonStatus = JsonSerializer.Serialize(status);
|
|
|
|
var request = new SfsJobRequestInputBase
|
|
{
|
|
MaxResultCount = pageSize,
|
|
SkipCount = (pageIndex - 1) * pageSize,
|
|
Sorting = $"{nameof(UnplannedReceiptJobDTO.Priority)} ASC",
|
|
Condition = new Condition
|
|
{
|
|
Filters = new List<Filter>
|
|
{
|
|
// new(nameof(UnplannedReceiptJobDTO.WorkGroupCode),jsonWlgCodes,"In"),
|
|
new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
|
|
}
|
|
}
|
|
};
|
|
if (isToday)//只看当日
|
|
{
|
|
request.Condition.Filters.Add(new Filter(nameof(UnplannedReceiptJobDTO.CreationTime), Clock.Now.ToString("yyyy-MM-dd"), ">=", "And"));
|
|
}
|
|
if (isCreationTimeSorting)//创建时间时间排序
|
|
{
|
|
request.Sorting = $"{nameof(UnplannedReceiptJobDTO.CreationTime)} ASC";
|
|
}
|
|
|
|
var list = await _unplannedReceiptJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
|
|
return list;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取列表 筛选
|
|
/// </summary>
|
|
/// <param name="sfsRequestDTO"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("list")]
|
|
public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
|
|
{
|
|
var list = await _unplannedReceiptJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false);
|
|
return list;
|
|
}
|
|
/// <summary>
|
|
/// 根据Job Number 获取收货任务列表
|
|
/// </summary>
|
|
/// <param name="jobNumber"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("by-number/{jobNumber}")]
|
|
public virtual async Task<ActionResult<UnplannedReceiptJobDTO>> GetByNumberAsync(string jobNumber)
|
|
{
|
|
var jobDto = await _unplannedReceiptJobAppService.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>
|
|
/// 根据UnplannedReceiptRequestNumber 获取任务列表
|
|
/// </summary>
|
|
/// <param name="requestNumber"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("list/by-request/{requestNumber}")]
|
|
public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListByAsnNumberAsync(string requestNumber)
|
|
{
|
|
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
|
|
var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
|
|
|
|
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
|
|
var jsonStatus = JsonSerializer.Serialize(status);
|
|
|
|
var requestInput = new SfsJobRequestInputBase
|
|
{
|
|
MaxResultCount = 100,
|
|
SkipCount = 0,
|
|
Sorting = $"{nameof(UnplannedReceiptJobDTO.Priority)} ASC",
|
|
Condition = new Condition
|
|
{
|
|
Filters = new List<Filter>
|
|
{
|
|
new(nameof(UnplannedReceiptJobDTO.UnplannedReceiptRequestNumber),requestNumber),
|
|
new(nameof(UnplannedReceiptJobDTO.WorkGroupCode),jsonWlgCodes,"In"),
|
|
new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In"),
|
|
}
|
|
}
|
|
};
|
|
var list = await _unplannedReceiptJobAppService.GetPagedListByFilterAsync(requestInput, true).ConfigureAwait(false);
|
|
return list;
|
|
}
|
|
|
|
/// <summary>
|
|
/// 获取任务数量
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
[HttpGet("count")]
|
|
public virtual async Task<ActionResult<long>> CountAsync()
|
|
{
|
|
var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
|
|
var jsonCodes = JsonSerializer.Serialize(wlgCodes);
|
|
|
|
var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
|
|
var jsonStatus = JsonSerializer.Serialize(status);
|
|
|
|
var request = new SfsJobRequestInputBase
|
|
{
|
|
Sorting = $"{nameof(UnplannedReceiptJobDTO.Priority)} ASC",
|
|
Condition = new Condition
|
|
{
|
|
Filters = new List<Filter>
|
|
{
|
|
new(nameof(UnplannedReceiptJobDTO.WorkGroupCode),jsonCodes,"In"),
|
|
new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
|
|
}
|
|
}
|
|
};
|
|
|
|
var count = await _unplannedReceiptJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false);
|
|
|
|
return Ok(count);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 承接任务
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("take/{id}")]
|
|
public virtual async Task TakeAsync(Guid id)
|
|
{
|
|
await _unplannedReceiptJobAppService.AcceptAsync(id).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 取消承接任务
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("cancel-take/{id}")]
|
|
public virtual async Task CancelTakeAsync(Guid id)
|
|
{
|
|
await _unplannedReceiptJobAppService.CancelAcceptAsync(id).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 执行任务
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <param name="dto"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("finish/{id}")]
|
|
public virtual async Task FinishAsync(Guid id, [FromBody] UnplannedReceiptJobDTO dto)
|
|
{
|
|
await _unplannedReceiptJobAppService.CompleteAsync(id, dto).ConfigureAwait(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// 作废任务
|
|
/// </summary>
|
|
/// <param name="id"></param>
|
|
/// <returns></returns>
|
|
[HttpPost("{id}")]
|
|
public virtual async Task DeleteAsync(Guid id)
|
|
{
|
|
await _unplannedReceiptJobAppService.CancelAsync(id).ConfigureAwait(false);
|
|
}
|
|
}
|
|
|