From 19292afd2f916d6c9758516cc796f1662b233282 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Wed, 20 Dec 2023 10:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E9=80=80=E6=96=99pad=E6=9C=8D=E5=8A=A1=E5=92=8Coa?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/MesIncomingBackgroundWorker.cs | 9 + .../Jobs/UnplannedIssueJobController.cs | 234 ++++++++++++++++++ .../Jobs/UnplannedReceiptJobController.cs | 233 +++++++++++++++++ .../Balances/BalanceAppService.cs | 2 +- .../UnplannedReceiptRequestAppService.cs | 2 +- .../ProductReceiptNoteEventHandler.cs | 2 +- 6 files changed, 479 insertions(+), 3 deletions(-) create mode 100644 be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs create mode 100644 be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs index 2d1e6a1a3..87b487f78 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesIncomingBackgroundWorker.cs @@ -1,3 +1,4 @@ +using System; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; @@ -34,6 +35,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase Logger.LogInformation($"{Incoming} is not active!"); return; } + + int min = DateTime.Now.Hour*60+ DateTime.Now.Minute;//第二天00:05:00与当天23:55:00不执行避免tyrpnumber重复 + if ( (24*60-5)<= min || min <= 5) + { + Logger.LogInformation($"{Incoming} 时间小于第二天00:05:00大于当天23:55:00"); + return; + } + Logger.LogInformation($"Read MesOut");//缴库 var mesOutReader = workerContext.ServiceProvider.GetRequiredService(); var mesOutConverter = workerContext.ServiceProvider.GetRequiredService(); diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs new file mode 100644 index 000000000..df7f70b1e --- /dev/null +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs @@ -0,0 +1,234 @@ +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-issue")] +public class UnplannedIssueJobController : AbpController +{ + private readonly IUnplannedIssueJobAppService _unplannedIssueJobAppService; + + private readonly IUserWorkGroupAppService _userWorkGroupAppService; + + public UnplannedIssueJobController(IUnplannedIssueJobAppService unplannedIssueJobAppService, IUserWorkGroupAppService userWorkGroupAppService) + { + _unplannedIssueJobAppService=unplannedIssueJobAppService; + _userWorkGroupAppService = userWorkGroupAppService; + } + + /// + /// 获取非生产领料任务详情 + /// + /// + /// + [HttpGet("{id}")] + + public virtual async Task> GetAsync(Guid id) + { + var result = await _unplannedIssueJobAppService.GetAsync(id).ConfigureAwait(false); + return Ok(result); + } + + + /// + /// 获取列表 + /// + /// + /// + /// + /// + /// + [HttpGet("list")] + public virtual async Task> 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)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; + var jsonStatus = JsonSerializer.Serialize(status); + + var request = new SfsJobRequestInputBase + { + MaxResultCount = pageSize, + SkipCount = (pageIndex - 1) * pageSize, + Sorting = $"{nameof(UnplannedIssueJobDTO.Priority)} ASC", + Condition = new Condition + { + Filters = new List + { + new(nameof(UnplannedIssueJobDTO.WorkGroupCode),jsonWlgCodes,"In"), + new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In") + } + } + }; + if (isToday)//只看当日 + { + request.Condition.Filters.Add(new Filter(nameof(UnplannedIssueJobDTO.CreationTime), Clock.Now.ToString("yyyy-MM-dd"), ">=", "And")); + } + if (isCreationTimeSorting)//创建时间时间排序 + { + request.Sorting = $"{nameof(UnplannedIssueJobDTO.CreationTime)} ASC"; + } + + var list = await _unplannedIssueJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false); + return list; + } + + /// + /// 获取列表 筛选 + /// + /// + /// + [HttpPost("list")] + public virtual async Task> GetListAsync(SfsJobRequestInputBase sfsRequestDTO) + { + var list = await _unplannedIssueJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false); + return list; + } + /// + /// 根据Job Number 获取收货任务列表 + /// + /// + /// + [HttpGet("by-number/{jobNumber}")] + public virtual async Task> GetByNumberAsync(string jobNumber) + { + var jobDto = await _unplannedIssueJobAppService.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; + } + + + /// + /// 根据UnplannedIssueRequestNumber获取任务列表 + /// + /// + /// + [HttpGet("list/by-request/{requestNumber}")] + public virtual async Task> GetListByAsnNumberAsync(string requestNumber) + { + var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); + var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); + + var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; + var jsonStatus = JsonSerializer.Serialize(status); + + var requestInput = new SfsJobRequestInputBase + { + MaxResultCount = 100, + SkipCount = 0, + Sorting = $"{nameof(UnplannedIssueJobDTO.Priority)} ASC", + Condition = new Condition + { + Filters = new List + { + new(nameof(UnplannedIssueJobDTO.UnplannedIssueRequestNumber),requestNumber), + new(nameof(UnplannedIssueJobDTO.WorkGroupCode),jsonWlgCodes,"In"), + new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In"), + } + } + }; + var list = await _unplannedIssueJobAppService.GetPagedListByFilterAsync(requestInput, true).ConfigureAwait(false); + return list; + } + + /// + /// 获取任务数量 + /// + /// + [HttpGet("count")] + public virtual async Task> CountAsync() + { + var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); + var jsonCodes = JsonSerializer.Serialize(wlgCodes); + + var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing }; + var jsonStatus = JsonSerializer.Serialize(status); + + var request = new SfsJobRequestInputBase + { + Sorting = $"{nameof(UnplannedIssueJobDTO.Priority)} ASC", + Condition = new Condition + { + Filters = new List + { + new(nameof(UnplannedIssueJobDTO.WorkGroupCode),jsonCodes,"In"), + new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In") + } + } + }; + + var count = await _unplannedIssueJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false); + + return Ok(count); + } + + /// + /// 承接任务 + /// + /// + /// + [HttpPost("take/{id}")] + public virtual async Task TakeAsync(Guid id) + { + await _unplannedIssueJobAppService.AcceptAsync(id).ConfigureAwait(false); + } + + /// + /// 取消承接任务 + /// + /// + /// + [HttpPost("cancel-take/{id}")] + public virtual async Task CancelTakeAsync(Guid id) + { + await _unplannedIssueJobAppService.CancelAcceptAsync(id).ConfigureAwait(false); + } + + /// + /// 执行任务 + /// + /// + /// + /// + [HttpPost("finish/{id}")] + public virtual async Task FinishAsync(Guid id, [FromBody] UnplannedIssueJobDTO dto) + { + await _unplannedIssueJobAppService.CompleteAsync(id, dto).ConfigureAwait(false); + } + + /// + /// 作废任务 + /// + /// + /// + [HttpPost("{id}")] + public virtual async Task DeleteAsync(Guid id) + { + await _unplannedIssueJobAppService.CancelAsync(id).ConfigureAwait(false); + } +} diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs new file mode 100644 index 000000000..d78220798 --- /dev/null +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs @@ -0,0 +1,233 @@ +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; + } + + /// + /// 获取非生产领料任务详情 + /// + /// + /// + [HttpGet("{id}")] + + public virtual async Task> GetAsync(Guid id) + { + var result = await _unplannedReceiptJobAppService.GetAsync(id).ConfigureAwait(false); + return Ok(result); + } + + + /// + /// 获取列表 + /// + /// + /// + /// + /// + /// + [HttpGet("list")] + public virtual async Task> 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)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 + { + 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; + } + + /// + /// 获取列表 筛选 + /// + /// + /// + [HttpPost("list")] + public virtual async Task> GetListAsync(SfsJobRequestInputBase sfsRequestDTO) + { + var list = await _unplannedReceiptJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false); + return list; + } + /// + /// 根据Job Number 获取收货任务列表 + /// + /// + /// + [HttpGet("by-number/{jobNumber}")] + public virtual async Task> 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; + } + + + /// + /// 根据UnplannedReceiptRequestNumber 获取任务列表 + /// + /// + /// + [HttpGet("list/by-request/{requestNumber}")] + public virtual async Task> GetListByAsnNumberAsync(string requestNumber) + { + var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); + var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes); + + var status = new List() { (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 + { + 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; + } + + /// + /// 获取任务数量 + /// + /// + [HttpGet("count")] + public virtual async Task> CountAsync() + { + var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false); + var jsonCodes = JsonSerializer.Serialize(wlgCodes); + + var status = new List() { (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 + { + new(nameof(UnplannedReceiptJobDTO.WorkGroupCode),jsonCodes,"In"), + new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In") + } + } + }; + + var count = await _unplannedReceiptJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false); + + return Ok(count); + } + + /// + /// 承接任务 + /// + /// + /// + [HttpPost("take/{id}")] + public virtual async Task TakeAsync(Guid id) + { + await _unplannedReceiptJobAppService.AcceptAsync(id).ConfigureAwait(false); + } + + /// + /// 取消承接任务 + /// + /// + /// + [HttpPost("cancel-take/{id}")] + public virtual async Task CancelTakeAsync(Guid id) + { + await _unplannedReceiptJobAppService.CancelAcceptAsync(id).ConfigureAwait(false); + } + + /// + /// 执行任务 + /// + /// + /// + /// + [HttpPost("finish/{id}")] + public virtual async Task FinishAsync(Guid id, [FromBody] UnplannedReceiptJobDTO dto) + { + await _unplannedReceiptJobAppService.CompleteAsync(id, dto).ConfigureAwait(false); + } + + /// + /// 作废任务 + /// + /// + /// + [HttpPost("{id}")] + public virtual async Task DeleteAsync(Guid id) + { + await _unplannedReceiptJobAppService.CancelAsync(id).ConfigureAwait(false); + } +} diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index 71c7135e0..9878c2452 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -471,7 +471,7 @@ public class BalanceAppService /// /// [HttpGet("recommend-list-location")] - public virtual async Task> GetRecommendBalancesAsync(RecommendBalanceRequestInput input) + public virtual async Task> GetRecommendBalancesAsync1(RecommendBalanceRequestInput input) { var traceId = GuidGenerator.Create(); var itemCode = input.ItemCode; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAppService.cs index bd52a2e00..e866cccad 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestAppService.cs @@ -35,7 +35,7 @@ public abstract class UnplannedReceiptRequestAppService : { var entity = ObjectMapper.Map(input); - await _unplannedReceiptRequestManager.CreateAsync(entity).ConfigureAwait(false); + await _unplannedReceiptRequestManager.CreateAsync(entity).ConfigureAwait(false); var dto = ObjectMapper.Map(entity); return dto; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs index c20a43160..23ca8e141 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ProductReceiptNoteEventHandler.cs @@ -32,7 +32,7 @@ public class ProductReceiptNoteEventHandler protected override async Task AddExchangeDataAsync(List entities) { - var dtos = ObjectMapper.Map, List>(entities); + var dtos = ObjectMapper.Map, List>(entities); foreach (var detail in dtos.SelectMany(dto => dto.Details)) { await detail.TrySetLocationAsync(LocationAclService, detail.LocationCode).ConfigureAwait(false);