From 58b86a8daefd057622b268b375faa7845c1d0626 Mon Sep 17 00:00:00 2001 From: lvzb <35200379@qq.com> Date: Fri, 10 May 2024 10:09:36 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Incoming/MesIncomingBackgroundWorker.cs | 108 +++++++++--------- .../AgentModule.cs | 2 +- 2 files changed, 55 insertions(+), 55 deletions(-) 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 c32d339f7..950c015b9 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 @@ -45,20 +45,20 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase return; } - //Logger.LogInformation($"Read MesOut");//缴库 - //var mesOutReader = workerContext.ServiceProvider.GetRequiredService(); - //var mesOutConverter = workerContext.ServiceProvider.GetRequiredService(); - //var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取mes缴库 - //var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false); - //var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList(); - //var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList(); - ////转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位） - //await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false); - //if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务 - //{ - // await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false); - //} + Logger.LogInformation($"Read MesOut");//缴库 + var mesOutReader = workerContext.ServiceProvider.GetRequiredService(); + var mesOutConverter = workerContext.ServiceProvider.GetRequiredService(); + var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取mes缴库 + var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false); + var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList(); + var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList(); + //转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位） + await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false); + if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务 + { + await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false); + } //上海和安徽无此接口 @@ -69,14 +69,14 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase //var pullTaskFromExternalList = await pullTaskReader.ReadAsync().ConfigureAwait(false); ////转换PullTask //await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"Read Scrap");//报废 + Logger.LogInformation($"Read Scrap");//报废 - //var scrapReader = workerContext.ServiceProvider.GetRequiredService(); - //var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存Scrap - //var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); - ////转换Scrap - //await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); + var scrapReader = workerContext.ServiceProvider.GetRequiredService(); + var scrapConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存Scrap + var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); + //转换Scrap + await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); //上海和安徽无此接口 //Logger.LogInformation($"Read Issue"); @@ -87,39 +87,39 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase ////转换Pck //await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"Read BackFlush");//耗用单 - //var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); - //var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存BackFlush - //var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); - ////转换BackFlush - //await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); - - - // Logger.LogInformation($"Read TransferNote");//储位调拨 - // var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService(); - //// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService(); - // //读取并保存TransferNote - // var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false); - // //转换TransferNote - // await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false); - - //Logger.LogInformation($"Read Frozen");//冻结解冻 - //var FrozenReader = workerContext.ServiceProvider.GetRequiredService(); - // var FrozenConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存Frozen - //var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false); - ////转换Frozen - //await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false); - - - //Logger.LogInformation($"Read Delivery");//成品发运 - //var DeliveryReader = workerContext.ServiceProvider.GetRequiredService(); - //var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存Delivery - //var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false); - ////转换Delivery - //await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false); + Logger.LogInformation($"Read BackFlush");//耗用单 + var BackFlushReader = workerContext.ServiceProvider.GetRequiredService(); + var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存BackFlush + var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); + //转换BackFlush + await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); + + + Logger.LogInformation($"Read TransferNote");//储位调拨 + var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService(); + // var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存TransferNote + var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false); + //转换TransferNote + await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false); + + Logger.LogInformation($"Read Frozen");//冻结解冻 + var FrozenReader = workerContext.ServiceProvider.GetRequiredService(); + var FrozenConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存Frozen + var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false); + //转换Frozen + await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false); + + + Logger.LogInformation($"Read Delivery");//成品发运 + var DeliveryReader = workerContext.ServiceProvider.GetRequiredService(); + var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存Delivery + var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false); + //转换Delivery + await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false); diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs index 59cf323ef..28aa02cc5 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/AgentModule.cs @@ -150,6 +150,6 @@ public class AgentModule : AbpModule ApplicationInitializationContext context) { context.AddBackgroundWorkerAsync(); - // context.AddBackgroundWorkerAsync(); + context.AddBackgroundWorkerAsync(); } }