diff --git a/Aucma.Scada.Business/InStoreTaskHandle.cs b/Aucma.Scada.Business/InStoreTaskHandle.cs index d2144809..d4a76b85 100644 --- a/Aucma.Scada.Business/InStoreTaskHandle.cs +++ b/Aucma.Scada.Business/InStoreTaskHandle.cs @@ -35,12 +35,12 @@ namespace Aucma.Scada.Business private PlcConfig plcConfig = PlcConfig.Instance; - private JsonChange jsonChange = JsonChange.Instance; - private PlcPool _pool = PlcPool.Instance; private PlcSpaceConfig spaceConfig = PlcSpaceConfig.Instance; + private JsonChange jsonChange = JsonChange.Instance; + /// /// 实时任务 /// @@ -91,12 +91,6 @@ namespace Aucma.Scada.Business public delegate void RefreshLinerStock(); public event RefreshLinerStock RefreshLinerStockEvent; - /// - /// 库容告警 - /// - public delegate void SpaceCapacityAlarm(string storeCode,string spaceName); - public event SpaceCapacityAlarm SpaceCapacityAlarmEvent; - /// /// 入库完成 @@ -116,6 +110,12 @@ namespace Aucma.Scada.Business public delegate void BareBoardHandle(string storeCode, bool isFlag = true); public event BareBoardHandle BareBoardHandleEvent; + + /// + /// 库容告警 + /// + public delegate void SpaceCapacityAlarm(string storeCode, string spaceName); + public event SpaceCapacityAlarm SpaceCapacityAlarmEvent; #endregion @@ -158,9 +158,9 @@ namespace Aucma.Scada.Business RefreshShellStockEvent?.Invoke(); RefreshLinerStockEvent?.Invoke(); - if((spaceInfo.spaceCapacity - spaceInfo.spaceStock) <= 5) + if ((spaceInfo.spaceCapacity - spaceInfo.spaceStock) <= 5) { - if(spaceInfo.storeCode == appConfig.shellStoreCode) + if (spaceInfo.storeCode == appConfig.shellStoreCode) { ShellAlarmSpaceName.Add(spaceInfo.spaceName); } @@ -174,10 +174,10 @@ namespace Aucma.Scada.Business if (ShellAlarmSpaceName.Count > 0) { - SpaceCapacityAlarmEvent?.Invoke(appConfig.shellStoreCode,jsonChange.ModeToJson(ShellAlarmSpaceName)); + SpaceCapacityAlarmEvent?.Invoke(appConfig.shellStoreCode, jsonChange.ModeToJson(ShellAlarmSpaceName)); } - if(LinerAlarmSpaceName.Count > 0) + if (LinerAlarmSpaceName.Count > 0) { SpaceCapacityAlarmEvent?.Invoke(appConfig.linerStoreCode, jsonChange.ModeToJson(LinerAlarmSpaceName)); }