|
|
@ -45,24 +45,36 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
#region 缴库 MesOut
|
|
|
//#region 缴库 MesOut
|
|
|
Logger.LogInformation($"读取缴库（MesOut）");//缴库
|
|
|
//Logger.LogInformation($"读取缴库（MesOut）");//缴库
|
|
|
var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>(); |
|
|
//var mesOutReader = workerContext.ServiceProvider.GetRequiredService<MesOutReader>();
|
|
|
var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>(); |
|
|
//var mesOutConverter = workerContext.ServiceProvider.GetRequiredService<MesOutConverter>();
|
|
|
var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>(); |
|
|
//var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
//读取mes缴库
|
|
|
////读取mes缴库
|
|
|
var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false); |
|
|
//var mesOutsFromExternalList = await mesOutReader.ReadAsync().ConfigureAwait(false);
|
|
|
var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList(); |
|
|
//var mesOutsFromExternalList_ProductReceipt = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.ProductReceipt.ToString()).ToList();
|
|
|
var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList(); |
|
|
//var mesOutsFromExternalList_TransferNote = mesOutsFromExternalList.Where(r => r.DataType == EnumIncomingDataType.TransferNote.ToString()).ToList();
|
|
|
//转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位）
|
|
|
////转换缴库数据（如果有质量补得数据直接生产移库数据移到客户库位）
|
|
|
await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false); |
|
|
//await mesOutConverter.ConvertAsync(mesOutsFromExternalList_ProductReceipt).ConfigureAwait(false);
|
|
|
if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务
|
|
|
//if (mesOutsFromExternalList_TransferNote.Count > 0)//如果有质量补则生产储位调拨任务
|
|
|
{ |
|
|
//{
|
|
|
await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false); |
|
|
// await TransferNoteConverter.ConvertAsync(mesOutsFromExternalList_TransferNote).ConfigureAwait(false);
|
|
|
} |
|
|
//}
|
|
|
Logger.LogInformation($"处理完工收货(缴库)【{mesOutsFromExternalList_ProductReceipt.Count}】条数据"); |
|
|
//Logger.LogInformation($"处理完工收货(缴库)【{mesOutsFromExternalList_ProductReceipt.Count}】条数据");
|
|
|
Logger.LogInformation($"处理储位调拨【{mesOutsFromExternalList_TransferNote.Count}】条数据"); |
|
|
//Logger.LogInformation($"处理储位调拨【{mesOutsFromExternalList_TransferNote.Count}】条数据");
|
|
|
#endregion
|
|
|
//#endregion
|
|
|
|
|
|
|
|
|
|
|
|
//#region 冻结解冻 Frozen
|
|
|
|
|
|
//Logger.LogInformation($"读取冻结解冻 （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($"处理冻结解冻【{mesNoteFromExternalList.Count}】条数据");
|
|
|
|
|
|
//#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#region 报废 Scrap
|
|
|
#region 报废 Scrap
|
|
|
Logger.LogInformation($"读取报废（Scrap）");//报废
|
|
|
Logger.LogInformation($"读取报废（Scrap）");//报废
|
|
|
@ -75,61 +87,52 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase |
|
|
Logger.LogInformation($"处理报废【{scrapsFromExternalList.Count}】条数据"); |
|
|
Logger.LogInformation($"处理报废【{scrapsFromExternalList.Count}】条数据"); |
|
|
#endregion
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
#region 耗用单 BackFlush
|
|
|
//#region 耗用单 BackFlush
|
|
|
Logger.LogInformation($"读取耗用单 （BackFlush）");//耗用单
|
|
|
//Logger.LogInformation($"读取耗用单 （BackFlush）");//耗用单
|
|
|
var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>(); |
|
|
//var BackFlushReader = workerContext.ServiceProvider.GetRequiredService<BackFluReader>();
|
|
|
var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>(); |
|
|
//var BackFlushConverter = workerContext.ServiceProvider.GetRequiredService<BackFluConverter>();
|
|
|
//读取并保存BackFlush
|
|
|
////读取并保存BackFlush
|
|
|
var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false); |
|
|
//var backFlushsFromExternalList = await BackFlushReader.ReadAsync().ConfigureAwait(false);
|
|
|
//转换BackFlush
|
|
|
////转换BackFlush
|
|
|
await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false); |
|
|
//await BackFlushConverter.ConvertAsync(backFlushsFromExternalList).ConfigureAwait(false);
|
|
|
Logger.LogInformation($"处理耗用单【{backFlushsFromExternalList.Count}】条数据"); |
|
|
//Logger.LogInformation($"处理耗用单【{backFlushsFromExternalList.Count}】条数据");
|
|
|
#endregion
|
|
|
//#endregion
|
|
|
|
|
|
|
|
|
#region 储位调拨 TransferNote
|
|
|
//#region 储位调拨 TransferNote
|
|
|
Logger.LogInformation($"读取储位调拨 （TransferNote）");//储位调拨
|
|
|
//Logger.LogInformation($"读取储位调拨 （TransferNote）");//储位调拨
|
|
|
var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>(); |
|
|
//var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService<QtyrfeReader>();
|
|
|
// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
//// var TransferNoteConverter = workerContext.ServiceProvider.GetRequiredService<QtyrfeConverter>();
|
|
|
//读取并保存TransferNote
|
|
|
////读取并保存TransferNote
|
|
|
var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false); |
|
|
//var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false);
|
|
|
//转换TransferNote
|
|
|
////转换TransferNote
|
|
|
await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false); |
|
|
//await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false);
|
|
|
Logger.LogInformation($"处理储位调拨【{transferNoteFromExternalList.Count}】条数据"); |
|
|
//Logger.LogInformation($"处理储位调拨【{transferNoteFromExternalList.Count}】条数据");
|
|
|
#endregion
|
|
|
//#endregion
|
|
|
|
|
|
|
|
|
#region 冻结解冻 Frozen
|
|
|
|
|
|
Logger.LogInformation($"读取冻结解冻 （Frozen）");//冻结解冻
|
|
|
|
|
|
var FrozenReader = workerContext.ServiceProvider.GetRequiredService<FrozenReader>(); |
|
|
//#region 成品发运 Delivery
|
|
|
var FrozenConverter = workerContext.ServiceProvider.GetRequiredService<FrozenConverter>(); |
|
|
//Logger.LogInformation($"读取成品发运 （Delivery）");//成品发运
|
|
|
//读取并保存Frozen
|
|
|
//var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>();
|
|
|
var mesNoteFromExternalList = await FrozenReader.ReadAsync().ConfigureAwait(false); |
|
|
//var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>();
|
|
|
//转换Frozen
|
|
|
////读取并保存Delivery
|
|
|
await FrozenConverter.ConvertAsync(mesNoteFromExternalList).ConfigureAwait(false); |
|
|
//var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false);
|
|
|
Logger.LogInformation($"处理冻结解冻【{mesNoteFromExternalList.Count}】条数据"); |
|
|
////转换Delivery
|
|
|
#endregion
|
|
|
//await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false);
|
|
|
|
|
|
//Logger.LogInformation($"处理成品发运【{deliveryNoteFromExternalList.Count}】条数据");
|
|
|
#region 成品发运 Delivery
|
|
|
//#endregion
|
|
|
Logger.LogInformation($"读取成品发运 （Delivery）");//成品发运
|
|
|
|
|
|
var DeliveryReader = workerContext.ServiceProvider.GetRequiredService<DeliveryReader>(); |
|
|
//#region 自动叫料 CallMtl
|
|
|
var DeliveryConverter = workerContext.ServiceProvider.GetRequiredService<DeliveryConverter>(); |
|
|
|
|
|
//读取并保存Delivery
|
|
|
//Logger.LogInformation($"读取自动叫料 （CallMtl）");//自动叫料
|
|
|
var deliveryNoteFromExternalList = await DeliveryReader.ReadAsync().ConfigureAwait(false); |
|
|
//var CallMtlReader = workerContext.ServiceProvider.GetRequiredService<CallMtlReader>();
|
|
|
//转换Delivery
|
|
|
//var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService<CallMtlConverter>();
|
|
|
await DeliveryConverter.ConvertAsync(deliveryNoteFromExternalList).ConfigureAwait(false); |
|
|
////读取并保存Delivery
|
|
|
Logger.LogInformation($"处理成品发运【{deliveryNoteFromExternalList.Count}】条数据"); |
|
|
//var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false);
|
|
|
#endregion
|
|
|
////转换Delivery
|
|
|
|
|
|
//await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false);
|
|
|
#region 自动叫料 CallMtl
|
|
|
//Logger.LogInformation($"处理自动叫料【{callMtlFromExternalList.Count}】条数据");
|
|
|
|
|
|
//#endregion
|
|
|
Logger.LogInformation($"读取自动叫料 （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($"处理自动叫料【{callMtlFromExternalList.Count}】条数据"); |
|
|
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
Logger.LogInformation($"提交: 执行 {Incoming}"); |
|
|
Logger.LogInformation($"提交: 执行 {Incoming}"); |
|
|
|
|
|
|
|
|
|
lvzb
10 months ago