diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs index 677a44fa8..b9de3d016 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent/Outgoing/EosOutgoingBackgroundWorker.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.EosAgent; @@ -29,10 +30,24 @@ public class EosOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"开始: 执行 {Outgoing}"); - if (!_options.Value.IncomingOptions.Active) + + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("EOS-OUT").ConfigureAwait(false); + if (confitem == null) + { + if (!_options.Value.OutgoingOptions.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } + } + else { - Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); - return; + if (!confitem.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } } Logger.LogInformation($"传出 采购上架单"); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs index 6f9e10808..bc6238dd0 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent/Incoming/InjectionMoldingTaskIncomingBackgroundWorker.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent.Incoming; using Win_in.Sfs.Wms.Store.Application.Contracts; @@ -13,7 +14,7 @@ namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.InjectionMoldingTaskAgent; public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase { - private readonly string Incoming = "InjectionMoldingTask Incoming"; + private readonly string Incoming = "视觉接收"; private readonly IOptions _options; @@ -32,30 +33,36 @@ public class InjectionMoldingTaskIncomingBackgroundWorker : AsyncPeriodicBackgro _options.Value.AutoRemote.Interval = 2; #endif - - Timer.Period = options.Value.AutoRemote.TimeCycle * 60 * 1000; //default 10 minutes } [UnitOfWork] protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { - Logger.LogInformation($"Starting: Handling {Incoming}"); - if (!_options.Value.IncomingOptions.Active) + Logger.LogInformation($"开始: 执行 {Incoming}"); + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("SJ-IN").ConfigureAwait(false); + if (confitem == null) { - Logger.LogInformation($"{Incoming} is not active!"); - return; + if (!_options.Value.IncomingOptions.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } } - int min = DateTime.Now.Hour*60+ DateTime.Now.Minute;//第二天00:05:00与当天23:55:00不执行避免tyrpnumber重复 - if ( (24*60-5)<= min || min <= 5) + else { - Logger.LogInformation($"{Incoming} 时间小于第二天00:05:00大于当天23:55:00"); - return; + if (!confitem.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } } + Logger.LogInformation($"注塑任务");//缴库 var reader = workerContext.ServiceProvider.GetService(); await reader.ReadAsync().ConfigureAwait(false); - Logger.LogInformation($"Completed: Handling {Incoming}"); + Logger.LogInformation($"提交: 执行 {Incoming}"); } } 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 e0482a972..e2b0a43e9 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 @@ -7,6 +7,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Shared; using Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Incoming; @@ -32,12 +33,27 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"开始: 执行 {Incoming}"); - if (!_options.Value.IncomingOptions.Active) + + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("MES-IN").ConfigureAwait(false); + if (confitem == null) { - Logger.LogInformation($"{Incoming} 已关闭没有执行!"); - return; + if (!_options.Value.IncomingOptions.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } + } + else + { + if (!confitem.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } } + int min = DateTime.Now.Hour*60+ DateTime.Now.Minute;//第二天00:05:00与当天23:55:00不执行避免tyrpnumber重复 if ( (24*60-5)<= min || min <= 5) { @@ -45,94 +61,93 @@ public class MesIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase return; } - //#region 缴库 MesOut - //Logger.LogInformation($"读取缴库（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($"处理完工收货(缴库)【{mesOutsFromExternalList_ProductReceipt.Count}】条数据"); - //Logger.LogInformation($"处理储位调拨【{mesOutsFromExternalList_TransferNote.Count}】条数据"); - //#endregion - - //#region 冻结解冻 Frozen - //Logger.LogInformation($"读取冻结解冻 （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($"处理冻结解冻【{mesNoteFromExternalList.Count}】条数据"); - //#endregion - - - //#region 报废 Scrap - //Logger.LogInformation($"读取报废（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); - //Logger.LogInformation($"处理报废【{scrapsFromExternalList.Count}】条数据"); - //#endregion - - //#region 耗用单 BackFlush - //Logger.LogInformation($"读取耗用单 （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($"处理耗用单【{backFlushsFromExternalList.Count}】条数据"); - //#endregion - - //#region 储位调拨 TransferNote - //Logger.LogInformation($"读取储位调拨 （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($"处理储位调拨【{transferNoteFromExternalList.Count}】条数据"); - //#endregion - - - - //#region 成品发运 Delivery - //Logger.LogInformation($"读取成品发运 （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($"处理成品发运【{deliveryNoteFromExternalList.Count}】条数据"); - //#endregion - - //#region 自动叫料 CallMtl - - //Logger.LogInformation($"读取自动叫料 （CallMtl）");//自动叫料 - //var CallMtlReader = workerContext.ServiceProvider.GetRequiredService(); - //var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService(); - ////读取并保存Delivery - //var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false); - ////转换Delivery - //await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false); - //Logger.LogInformation($"处理自动叫料【{callMtlFromExternalList.Count}】条数据"); - //#endregion + #region 缴库 MesOut + Logger.LogInformation($"读取缴库（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($"处理完工收货(缴库)【{mesOutsFromExternalList_ProductReceipt.Count}】条数据"); + Logger.LogInformation($"处理储位调拨【{mesOutsFromExternalList_TransferNote.Count}】条数据"); + #endregion + + #region 冻结解冻 Frozen + Logger.LogInformation($"读取冻结解冻 （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($"处理冻结解冻【{mesNoteFromExternalList.Count}】条数据"); + #endregion + + + #region 报废 Scrap + Logger.LogInformation($"读取报废（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); + Logger.LogInformation($"处理报废【{scrapsFromExternalList.Count}】条数据"); + #endregion + + #region 耗用单 BackFlush + Logger.LogInformation($"读取耗用单 （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($"处理耗用单【{backFlushsFromExternalList.Count}】条数据"); + #endregion + + #region 储位调拨 TransferNote + Logger.LogInformation($"读取储位调拨 （TransferNote）");//储位调拨 + var TransferNoteReader = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存TransferNote + var transferNoteFromExternalList = await TransferNoteReader.ReadAsync().ConfigureAwait(false); + //转换TransferNote + await TransferNoteConverter.ConvertAsync(transferNoteFromExternalList).ConfigureAwait(false); + Logger.LogInformation($"处理储位调拨【{transferNoteFromExternalList.Count}】条数据"); + #endregion + + + + #region 成品发运 Delivery + Logger.LogInformation($"读取成品发运 （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($"处理成品发运【{deliveryNoteFromExternalList.Count}】条数据"); + #endregion + + #region 自动叫料 CallMtl + + Logger.LogInformation($"读取自动叫料 （CallMtl）");//自动叫料 + var CallMtlReader = workerContext.ServiceProvider.GetRequiredService(); + var CallMtlConverter = workerContext.ServiceProvider.GetRequiredService(); + //读取并保存Delivery + var callMtlFromExternalList = await CallMtlReader.ReadAsync().ConfigureAwait(false); + //转换Delivery + await CallMtlConverter.ConvertAsync(callMtlFromExternalList).ConfigureAwait(false); + Logger.LogInformation($"处理自动叫料【{callMtlFromExternalList.Count}】条数据"); + #endregion #region 底盘 Chassis diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs index 44efc9126..115e3c408 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent/Outgoing/MesOutgoingBackgroundWorker.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent.Outgoing; namespace Win_in.Sfs.Wms.DataExchange.Fawtyg.MesAgent; @@ -30,10 +31,24 @@ public class MesOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"Starting: Handling {Outgoing}"); - if (!_options.Value.IncomingOptions.Active) + + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("MES-OUT").ConfigureAwait(false); + if (confitem == null) + { + if (!_options.Value.OutgoingOptions.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } + } + else { - Logger.LogInformation($"{Outgoing} is not active!"); - return; + if (!confitem.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } } Logger.LogInformation($"Write Issue"); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs index e1cb31cb6..d2660f40e 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Incoming/TyrpIncomingBackgroundWorker.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Shared; using Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Incoming; @@ -34,10 +35,24 @@ public class TyrpIncomingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"开始: 执行 {Incoming}"); - if (!_options.Value.IncomingOptions.Active) + + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("TYRP-IN").ConfigureAwait(false); + if (confitem == null) { - Logger.LogInformation($"{Incoming} 已关闭没有执行!"); - return; + if (!_options.Value.IncomingOptions.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } + } + else + { + if (!confitem.Active) + { + Logger.LogInformation($"{Incoming} 已关闭没有执行!"); + return; + } } //var repository = workerContext.ServiceProvider.GetRequiredService(); diff --git a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs index bba3b1d39..e44fd2cd1 100644 --- a/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs +++ b/be/DataExchange/Fawtyg/Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent/Outgoing/TyrpOutgoingBackgroundWorker.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.BackgroundWorkers; using Volo.Abp.Threading; using Volo.Abp.Uow; +using Win_in.Sfs.Wms.DataExchange.Domain; using Win_in.Sfs.Wms.DataExchange.Domain.Shared; using Win_in.Sfs.Wms.DataExchange.Fawtyg.TyrpAgent.Outgoing; @@ -33,11 +34,23 @@ public class TyrpOutgoingBackgroundWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation($"开始: 执行 {Outgoing}"); - - if (!_options.Value.OutgoingOptions.Active) + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("TYRP-OUT").ConfigureAwait(false); + if (confitem == null) { - Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); - return; + if (!_options.Value.OutgoingOptions.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } + } + else + { + if (!confitem.Active) + { + Logger.LogInformation($"{Outgoing} 已关闭没有执行!"); + return; + } } var scontrolWriter = workerContext.ServiceProvider.GetRequiredService();//scontrol中间表服务 var wmsoutmWriter = workerContext.ServiceProvider.GetRequiredService();//wmsoutm中间表的服务 diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs index 9993e4930..9248aa46a 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/IncomingToWmsWorker.cs @@ -50,25 +50,24 @@ public class IncomingToWmsWorker : AsyncPeriodicBackgroundWorkerBase protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { Logger.LogInformation("开始接收数据..."); - // var configManager = workerContext.ServiceProvider.GetRequiredService(); - //var confitem = await configManager.GetInterfaceConfig("").ConfigureAwait(false); - // if (confitem == null) - // { - // if (!_options.Value.IncomingOptions.Active) - // { - // Logger.LogInformation("Wms接收接口已关闭!"); - // return; - // } - // } - // else - // { - // if (!confitem.Active) - // { - // Logger.LogInformation("Wms接收接口已关闭!"); - // return; - // } - // } - + var configManager = workerContext.ServiceProvider.GetRequiredService(); + var confitem = await configManager.GetInterfaceConfig("WMS-IN").ConfigureAwait(false); + if (confitem == null) + { + if (!_options.Value.IncomingOptions.Active) + { + Logger.LogInformation("Wms接收接口已关闭!"); + return; + } + } + else + { + if (!confitem.Active) + { + Logger.LogInformation("Wms接收接口已关闭!"); + return; + } + } await HandleIncomingDataAsync(workerContext).ConfigureAwait(false); diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs index bc8b8b739..b59cbd929 100644 --- a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs +++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/OutgoingFromWmsWorker.cs @@ -29,8 +29,9 @@ public class OutgoingFromWmsWorker : AsyncPeriodicBackgroundWorkerBase [UnitOfWork] protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext) { + Logger.LogInformation("开始传出数据..."); var configManager = workerContext.ServiceProvider.GetRequiredService(); - var confitem = await configManager.GetInterfaceConfig("").ConfigureAwait(false); + var confitem = await configManager.GetInterfaceConfig("WMS-OUT").ConfigureAwait(false); if (confitem == null) { if (!_options.Active) @@ -79,5 +80,6 @@ public class OutgoingFromWmsWorker : AsyncPeriodicBackgroundWorkerBase { Logger.LogInformation(ex.Message+ex?.InnerException.Message); } + Logger.LogInformation("提交传出数据..."); } } diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs index 77dbbbde3..7e92e6198 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs @@ -344,8 +344,8 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase