Browse Source

接口修改

master
lvzb 1 year ago
parent
commit
dfa809cd32
  1. 8
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs
  2. 3
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs
  3. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs
  4. 2
      be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs

8
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluConverter.cs

@ -11,7 +11,6 @@ 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;
@ -97,10 +96,17 @@ public class BackFluConverter : IIncomingConverter
wmsBack.WarehouseCode = "jiekou"; wmsBack.WarehouseCode = "jiekou";
wmsBack.Lot = "jiekou"; wmsBack.Lot = "jiekou";
wmsBack.Details = new List<BackFlushNoteDetailInput>(); wmsBack.Details = new List<BackFlushNoteDetailInput>();
List<BackFlushNoteDetailInput> list = 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);
list.Add(wmsBackDetail);
}
var details = list.GroupBy(r =>new { r.ItemCode, r.LocationErpCode }).Select(p=> new BackFlushNoteDetailExchangeDto { ItemCode=p.Key.ItemCode,LocationErpCode=p.Key.LocationErpCode,Qty=p.Sum(item=>item.Qty)});//按零件汇总数量
foreach (var detail in details.ToList())
{
var wmsBackDetail = _objectMapper.Map<BackFlushNoteDetailExchangeDto, BackFlushNoteDetailInput>(detail);
wmsBackDetail.Lot = ""; wmsBackDetail.Lot = "";
var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false); var item = await _itemBasicAppService.GetByCodeAsync(wmsBackDetail.ItemCode).ConfigureAwait(false);

3
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/BackFluReader.cs

@ -34,7 +34,8 @@ public class BackFluReader : IReader
public virtual async Task<List<IncomingFromExternal>> ReadAsync() public virtual async Task<List<IncomingFromExternal>> ReadAsync()
{ {
//从Tyrp读取待处理bom //从Tyrp读取待处理bom
var toBeProcessedBack = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false); var toBeProcessedBack = await _ibackfluManager.GetToBeProcessedListAsync().ConfigureAwait(false);
toBeProcessedBack= toBeProcessedBack.OrderBy(r => r.scmout_dt_w).Take(3000).ToList();
if (!toBeProcessedBack.Any()) if (!toBeProcessedBack.Any())
{ {
_logger.LogInformation("no backflus"); _logger.LogInformation("no backflus");

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/MesOutReader.cs

@ -36,7 +36,7 @@ public class MesOutReader : IReader
{ {
//从MES读取待处理MesOut //从MES读取待处理MesOut
var toBeProcessedMwsOuts = await _mesOutManager.GetToBeProcessedListAsync().ConfigureAwait(false); var toBeProcessedMwsOuts = await _mesOutManager.GetToBeProcessedListAsync().ConfigureAwait(false);
toBeProcessedMwsOuts = toBeProcessedMwsOuts.OrderBy(r=>r.Mesout_dt).Take(3000).ToList();
if (!toBeProcessedMwsOuts.Any()) if (!toBeProcessedMwsOuts.Any())
{ {
_logger.LogInformation("no productreceipts"); _logger.LogInformation("no productreceipts");

2
be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Incoming/ScrapReader.cs

@ -39,7 +39,7 @@ public class ScrapReader : IReader
_logger.LogInformation("no scraps"); _logger.LogInformation("no scraps");
return new List<IncomingFromExternal>(); return new List<IncomingFromExternal>();
} }
var sclist = toBeProcessedScraps.Take(10).ToList(); var sclist = toBeProcessedScraps.Take(100).ToList();
//scrap逐一转换为ScrapNote //scrap逐一转换为ScrapNote
var incomingDataList = BuildIncomingFromExternalFromScrapAsync(sclist); var incomingDataList = BuildIncomingFromExternalFromScrapAsync(sclist);
await _incomingFromExternalManager.CreateManyAsync(incomingDataList).ConfigureAwait(false); await _incomingFromExternalManager.CreateManyAsync(incomingDataList).ConfigureAwait(false);

Loading…
Cancel
Save