|
|
@ -1,13 +1,17 @@ |
|
|
|
|
|
using System; |
|
|
using System.Collections.Generic; |
|
|
using System.Collections.Generic; |
|
|
using System.Linq; |
|
|
using System.Linq; |
|
|
using System.Text.Json; |
|
|
using System.Text.Json; |
|
|
using System.Threading.Tasks; |
|
|
using System.Threading.Tasks; |
|
|
|
|
|
using Castle.Components.DictionaryAdapter; |
|
|
using Microsoft.Extensions.Logging; |
|
|
using Microsoft.Extensions.Logging; |
|
|
using Volo.Abp.ObjectMapping; |
|
|
using Volo.Abp.ObjectMapping; |
|
|
using Win_in.Sfs.Basedata.Application.Contracts; |
|
|
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; |
|
|
using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote; |
|
|
using Win_in.Sfs.Wms.DataExchange.WMS.BackFlushNote; |
|
|
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|
|
using Win_in.Sfs.Wms.Store.Application.Contracts; |
|
|
|
|
|
using Win_in.Sfs.Wms.Store.Domain; |
|
|
|
|
|
|
|
|
namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming; |
|
|
namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming; |
|
|
|
|
|
|
|
|
@ -18,13 +22,14 @@ public class BackFluConverter : IIncomingConverter |
|
|
private readonly IItemBasicAppService _itemBasicAppService; |
|
|
private readonly IItemBasicAppService _itemBasicAppService; |
|
|
private readonly IObjectMapper _objectMapper; |
|
|
private readonly IObjectMapper _objectMapper; |
|
|
private readonly ILogger<BackFluConverter> _logger; |
|
|
private readonly ILogger<BackFluConverter> _logger; |
|
|
|
|
|
private readonly ILocationAppService _locationAppService; |
|
|
public BackFluConverter( |
|
|
public BackFluConverter( |
|
|
IIncomingToWmsManager incomingToWmsManager, |
|
|
IIncomingToWmsManager incomingToWmsManager, |
|
|
IItemBasicAppService itemBasicAppService, |
|
|
IItemBasicAppService itemBasicAppService, |
|
|
IObjectMapper objectMapper, |
|
|
IObjectMapper objectMapper, |
|
|
ILogger<BackFluConverter> logger |
|
|
ILogger<BackFluConverter> logger, |
|
|
, |
|
|
IIncomingFromExternalManager incomingFromExternalManager, |
|
|
IIncomingFromExternalManager incomingFromExternalManager |
|
|
ILocationAppService locationAppService |
|
|
|
|
|
|
|
|
) |
|
|
) |
|
|
{ |
|
|
{ |
|
|
@ -33,6 +38,7 @@ public class BackFluConverter : IIncomingConverter |
|
|
_objectMapper = objectMapper; |
|
|
_objectMapper = objectMapper; |
|
|
_logger = logger; |
|
|
_logger = logger; |
|
|
_incomingFromExternalManager = incomingFromExternalManager; |
|
|
_incomingFromExternalManager = incomingFromExternalManager; |
|
|
|
|
|
_locationAppService = locationAppService; |
|
|
} |
|
|
} |
|
|
public virtual async Task ConvertAsync(List<IncomingFromExternal> incomingFromExternalList) |
|
|
public virtual async Task ConvertAsync(List<IncomingFromExternal> incomingFromExternalList) |
|
|
{ |
|
|
{ |
|
|
@ -66,12 +72,54 @@ public class BackFluConverter : IIncomingConverter |
|
|
incomingToWms.SetEffectiveDate(first.EffectiveDate); |
|
|
incomingToWms.SetEffectiveDate(first.EffectiveDate); |
|
|
var exchangeBack = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent); |
|
|
var exchangeBack = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(first.DestinationDataContent); |
|
|
var wmsBack = _objectMapper.Map<BackFlushNoteExchangeDto, BackFlushNoteEditInput>(exchangeBack); |
|
|
var wmsBack = _objectMapper.Map<BackFlushNoteExchangeDto, BackFlushNoteEditInput>(exchangeBack); |
|
|
|
|
|
var item1 = await _itemBasicAppService.GetByCodeAsync(wmsBack.ItemCode).ConfigureAwait(false); |
|
|
|
|
|
wmsBack.ProductReceiptNumber = DateTime.Now.ToShortDateString().Replace("/","").Trim(); |
|
|
|
|
|
if (item1 != null) |
|
|
|
|
|
{ |
|
|
|
|
|
wmsBack.ItemName = item1.Name; |
|
|
|
|
|
wmsBack.Uom = item1.BasicUom; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
wmsBack.ItemName = ""; |
|
|
|
|
|
wmsBack.Uom = ""; |
|
|
|
|
|
} |
|
|
|
|
|
wmsBack.PackingCode = "jiekou"; |
|
|
|
|
|
wmsBack.LocationCode = "jiekou"; |
|
|
|
|
|
wmsBack.LocationArea = "jiekou"; |
|
|
|
|
|
wmsBack.LocationGroup = "jiekou"; |
|
|
|
|
|
wmsBack.LocationErpCode = "jiekou"; |
|
|
|
|
|
|
|
|
|
|
|
wmsBack.ProductionPlanNumber = "jiekou"; |
|
|
|
|
|
wmsBack.Workshop = "jiekou"; |
|
|
|
|
|
wmsBack.ProdLine = "jiekou"; |
|
|
|
|
|
wmsBack.WarehouseCode = "jiekou"; |
|
|
|
|
|
wmsBack.Lot = "jiekou"; |
|
|
wmsBack.Details = new List<BackFlushNoteDetailInput>(); |
|
|
wmsBack.Details = new List<BackFlushNoteDetailInput>(); |
|
|
foreach (var incomingFromExternal in group.ToList()) |
|
|
foreach (var incomingFromExternal in group.ToList()) |
|
|
{ |
|
|
{ |
|
|
var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent); |
|
|
var back = JsonSerializer.Deserialize<BackFlushNoteExchangeDto>(incomingFromExternal.DestinationDataContent); |
|
|
var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail); |
|
|
var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(back.Detail); |
|
|
|
|
|
wmsBackDetail.Lot = ""; |
|
|
|
|
|
var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
if (item != null) |
|
|
|
|
|
{ |
|
|
|
|
|
wmsBackDetail.ItemName = item.Name; |
|
|
|
|
|
wmsBackDetail.Uom = item.BasicUom; |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
wmsBackDetail.ItemName = ""; |
|
|
|
|
|
wmsBackDetail.Uom = ""; |
|
|
|
|
|
} |
|
|
|
|
|
var typesAndErpCodeAsync = await _locationAppService.GetListByTypesAndErpCodeAsync(new EditableList<EnumLocationType>() { EnumLocationType.WIP }, wmsBackDetail.LocationErpCode).ConfigureAwait(false); |
|
|
|
|
|
var loctioncode = typesAndErpCodeAsync.First(); |
|
|
|
|
|
wmsBackDetail.LocationCode = loctioncode.Code; |
|
|
|
|
|
wmsBackDetail.WarehouseCode = loctioncode.WarehouseCode; |
|
|
|
|
|
wmsBackDetail.LocationArea = loctioncode.AreaCode; |
|
|
|
|
|
wmsBackDetail.LocationGroup = loctioncode.LocationGroupCode; |
|
|
|
|
|
wmsBackDetail.PackingCode = "jiekou"; |
|
|
wmsBack.Details.Add(wmsBackDetail); |
|
|
wmsBack.Details.Add(wmsBackDetail); |
|
|
} |
|
|
} |
|
|
incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack); |
|
|
incomingToWms.DataContent = JsonSerializer.Serialize(wmsBack); |
|
|
|
郑渤旭[Irelia]
2 years ago