|
|
|
@ -4,6 +4,8 @@ using System.Linq; |
|
|
|
using System.Text.Json; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using Microsoft.Extensions.Logging; |
|
|
|
using Win_in.Sfs.Basedata.Application.Contracts; |
|
|
|
using Win_in.Sfs.Shared.Domain.Shared; |
|
|
|
using Win_in.Sfs.Wms.DataExchange.Domain; |
|
|
|
using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.MesOut; |
|
|
|
using Win_in.Sfs.Wms.DataExchange.Domain.Shared; |
|
|
|
@ -16,27 +18,38 @@ public class MesOutReader : IReader |
|
|
|
private readonly IMesOutManager _mesOutManager; |
|
|
|
private readonly IIncomingFromExternalManager _incomingFromExternalManager; |
|
|
|
private readonly ILogger<MesOutReader> _logger; |
|
|
|
|
|
|
|
private readonly ILocationAppService _locationAppService; |
|
|
|
public MesOutReader( |
|
|
|
IMesOutManager mesOutManager |
|
|
|
, IIncomingFromExternalManager incomingFromExternalManager |
|
|
|
, ILogger<MesOutReader> logger |
|
|
|
, ILocationAppService locationAppService |
|
|
|
) |
|
|
|
{ |
|
|
|
_mesOutManager = mesOutManager; |
|
|
|
_incomingFromExternalManager = incomingFromExternalManager; |
|
|
|
_logger = logger; |
|
|
|
_locationAppService = locationAppService; |
|
|
|
} |
|
|
|
|
|
|
|
public virtual async Task<List<IncomingFromExternal>> ReadAsync() |
|
|
|
{ |
|
|
|
//从MES读取待处理MesOut
|
|
|
|
var toBeProcessedMwsOuts = await _mesOutManager.GetToBeProcessedListAsync().ConfigureAwait(false); |
|
|
|
|
|
|
|
if (!toBeProcessedMwsOuts.Any()) |
|
|
|
{ |
|
|
|
_logger.LogInformation("no productreceipts"); |
|
|
|
return new List<IncomingFromExternal>(); |
|
|
|
} |
|
|
|
var mesoutnbr = await GetListByTypesAndErpCodeAsync(toBeProcessedMwsOuts).ConfigureAwait(false); |
|
|
|
if (mesoutnbr.Count > 0) |
|
|
|
{ |
|
|
|
toBeProcessedMwsOuts = toBeProcessedMwsOuts.Where(r => !mesoutnbr.Contains(r.Mesout_ref_nbr)).ToList(); |
|
|
|
var toBeProcessedEroMwsOuts = toBeProcessedMwsOuts.Where(r => mesoutnbr.Contains(r.Mesout_ref_nbr)).ToList(); |
|
|
|
|
|
|
|
await _mesOutManager.UpdateProcesseErrordListAsync(toBeProcessedEroMwsOuts).ConfigureAwait(false); |
|
|
|
} |
|
|
|
//MesOut逐一转换为ProductReceiptNote
|
|
|
|
var incomingDataList = BuildIncomingFromExternalFromShipAsync(toBeProcessedMwsOuts); |
|
|
|
await _incomingFromExternalManager.CreateManyAsync(incomingDataList).ConfigureAwait(false); |
|
|
|
@ -71,7 +84,25 @@ public class MesOutReader : IReader |
|
|
|
|
|
|
|
return incomingDataList; |
|
|
|
} |
|
|
|
private async Task<List<string>> GetListByTypesAndErpCodeAsync(List<MesOut> toBeProcessedShips) |
|
|
|
{ |
|
|
|
List<string> mesoutnbr = new List<string>(); |
|
|
|
|
|
|
|
foreach (var item in toBeProcessedShips) |
|
|
|
{ |
|
|
|
if (mesoutnbr.Contains(item.Mesout_ref_nbr)) |
|
|
|
{ |
|
|
|
continue; |
|
|
|
} |
|
|
|
List<EnumLocationType> types = new List<EnumLocationType> { EnumLocationType.FG, EnumLocationType.WIP }; |
|
|
|
var loc = await _locationAppService.GetListByTypesAndErpCodeAsync(types, item.Mesout_loc).ConfigureAwait(false); |
|
|
|
if (loc.Count == 0) |
|
|
|
{ |
|
|
|
mesoutnbr.Add(item.Mesout_ref_nbr); |
|
|
|
} |
|
|
|
} |
|
|
|
return mesoutnbr; |
|
|
|
} |
|
|
|
private static IncomingFromExternal BuildIncomingFromExternal(MesOut mesOut) |
|
|
|
{ |
|
|
|
var incomingData = new IncomingFromExternal() |
|
|
|
|
