|
|
@ -45,22 +45,77 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
//Logger.LogInformation($"Read MesOut");//缴库
|
|
|
|
//var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
|
|
|
|
//var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
|
|
|
|
//var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
|
////读取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<MesOutReader>(); |
|
|
|
var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>(); |
|
|
|
var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>(); |
|
|
|
//读取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 Scrap");//报废
|
|
|
|
var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>(); |
|
|
|
var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>(); |
|
|
|
//读取并保存Scrap
|
|
|
|
var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换Scrap
|
|
|
|
await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"Read BackFlush");//耗用单
|
|
|
|
var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>(); |
|
|
|
var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>(); |
|
|
|
//读取并保存BackFlush
|
|
|
|
var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换BackFlush
|
|
|
|
await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"Read TransferNote");//储位调拨
|
|
|
|
var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>(); |
|
|
|
// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
|
//读取并保存TransferNote
|
|
|
|
var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换TransferNote
|
|
|
|
await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
Logger.LogInformation($"Read Frozen");//冻结解冻
|
|
|
|
var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>(); |
|
|
|
var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>(); |
|
|
|
//读取并保存Frozen
|
|
|
|
var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换Frozen
|
|
|
|
await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"Read Delivery");//成品发运
|
|
|
|
var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>(); |
|
|
|
var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>(); |
|
|
|
//读取并保存Delivery
|
|
|
|
var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换Delivery
|
|
|
|
await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"Read CallMtl");//自动叫料
|
|
|
|
var CallMtlReader = workerContext.ServiceProvider.GetRequiredService<CallMtlReader>(); |
|
|
|
var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService<CallMtlConverter>(); |
|
|
|
//读取并保存Delivery
|
|
|
|
var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换Delivery
|
|
|
|
await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
Logger.LogInformation($"Completed: Handling {Incoming}"); |
|
|
|
|
|
|
|
#region 未启用接口启用时需要看逻辑修改
|
|
|
|
//上海和安徽无此接口
|
|
|
|
//Logger.LogInformation($"Read PullTask");//拉动任务
|
|
|
|
//var pullTaskReader = workerContext.ServiceProvider.GetRequiredService<PullTaskReader>();
|
|
|
@ -70,15 +125,6 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase |
|
|
|
////转换PullTask
|
|
|
|
//await pullTaskConverter.ConvertAsync(pullTaskFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
//Logger.LogInformation($"Read Scrap");//报废
|
|
|
|
|
|
|
|
//var scrapReader = workerContext.ServiceProvider.GetRequiredService<ScrapReader>();
|
|
|
|
//var scrapConverter = workerContext.ServiceProvider.GetRequiredService<ScrapConverter>();
|
|
|
|
////读取并保存Scrap
|
|
|
|
//var scrapsFromExternalList = await scrapReader.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换Scrap
|
|
|
|
//await scrapConverter.ConvertAsync(scrapsFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
//上海和安徽无此接口
|
|
|
|
//Logger.LogInformation($"Read Issue");
|
|
|
|
//var pckHandleService = workerContext.ServiceProvider.GetRequiredService<IssueReader>();
|
|
|
@ -87,51 +133,7 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase |
|
|
|
//var pcksFromExternalList = await pckHandleService.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换Pck
|
|
|
|
//await pckConverter.ConvertAsync(pcksFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
//Logger.LogInformation($"Read BackFlush");//耗用单
|
|
|
|
//var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
|
|
|
|
//var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
|
|
|
|
////读取并保存BackFlush
|
|
|
|
//var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换BackFlush
|
|
|
|
//await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
|
|
|
|
//Logger.LogInformation($"Read TransferNote");//储位调拨
|
|
|
|
//var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
|
|
|
|
//// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
|
////读取并保存TransferNote
|
|
|
|
//var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换TransferNote
|
|
|
|
//await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
//Logger.LogInformation($"Read Frozen");//冻结解冻
|
|
|
|
//var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>();
|
|
|
|
//var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>();
|
|
|
|
////读取并保存Frozen
|
|
|
|
//var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换Frozen
|
|
|
|
//await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"Read Delivery");//成品发运
|
|
|
|
var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>(); |
|
|
|
var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>(); |
|
|
|
//读取并保存Delivery
|
|
|
|
var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false); |
|
|
|
//转换Delivery
|
|
|
|
await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//Logger.LogInformation($"Read CallMtl");//自动叫料
|
|
|
|
//var CallMtlReader = workerContext.ServiceProvider.GetRequiredService<CallMtlReader>();
|
|
|
|
//var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService<CallMtlConverter>();
|
|
|
|
////读取并保存Delivery
|
|
|
|
//var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false);
|
|
|
|
////转换Delivery
|
|
|
|
//await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false);
|
|
|
|
//Logger.LogInformation($"Completed: Handling {Incoming}");
|
|
|
|
#endregion
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|