Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Common] 

修正BaseDevice的子类重复定义Unit属性，以及某些函数没有override关键字的问题。
This commit is contained in:
DESKTOP-1N1NK8A\auvkk 2023-04-24 14:11:23 +08:00
parent f325f21d16
commit 441154b136
13 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MECF.Framework.RT.EquipmentLibrary/Core/BaseRoutineWithDeviceLocker.cs
View File

@ -66,7 +66,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.Core
EV.PostInfoLog(Module, $"[{Module}] Pump2 Locker reset");
}
public virtual void Abort()
public override void Abort()
{
CancelLockWaiting();
//UnlockPump2();

3
MECF.Framework.RT.EquipmentLibrary/Devices/IoPTOffsetAndK.cs
View File

@ -52,9 +52,6 @@ namespace Aitex.Core.RT.Device.Devices
}
}
public string Unit { get; set; }
private AOAccessor _aoPTOffset = null;
private AOAccessor _aoPTK = null;
private bool _isFloatAioType = false;

2
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/LoadPorts/LoadPortBase/LoadPortBaseDevice.cs
View File

@ -2743,7 +2743,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.LoadPortBas
}
}
public string InfoPadCarrierType { get; set; }
public virtual string InfoPadCarrierType { get; set; }
}
public enum LoadPortStateEnum
{

2
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/LoadPorts/OpenStages/OpenStageHHGyy.cs
View File

@ -30,7 +30,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.OpenStages
public EnumLoadPortType PortType { get; set; }
public bool Initalized { get; set; }
public bool Error { get; set; }
public virtual string InfoPadCarrierType { get; set; } = "";
public override string InfoPadCarrierType { get; set; } = "";
public override FoupDoorState DoorState
{
get

2
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/LoadPorts/OpenStages/OpenStageNCDUnisim.cs
View File

@ -24,7 +24,7 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.LoadPorts.OpenStages
public EnumLoadPortType PortType { get; set; }
public bool Initalized { get; set; }
public bool Error { get; set; }
public virtual string InfoPadCarrierType { get; set; } = "";
public override string InfoPadCarrierType { get; set; } = "";
public override FoupDoorState DoorState
{
get

1
MECF.Framework.RT.EquipmentLibrary/HardwareUnits/MachineVision/Keyence/KeyenceCVX300FConnection.cs
View File

@ -10,7 +10,6 @@ namespace MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.Keyence
public class KeyenceCVX300FConnection : TCPPortConnectionBase
{
private List<byte> _lstCacheBuffer = new List<byte>();
private object _lockerActiveHandler = new object();
public KeyenceCVX300FConnection(string sAddress)
: base(sAddress, "\n", false)
{

2
MECF.Framework.RT.EquipmentLibrary/Unit/IoFlowMeter.cs
View File

@ -157,8 +157,6 @@ namespace Aitex.Core.RT.Device.Unit
}
}
public string Unit { get; set; }
private AIAccessor _aiFlowValue = null;
//private DIAccessor _diValve;

5
MECF.Framework.RT.EquipmentLibrary/Unit/IoHeater.cs
View File

@ -163,11 +163,6 @@ namespace Aitex.Core.RT.Device.Unit
}
}
public string Unit
{
get; set;
}
private AITHeaterData DeviceData
{
get

6
MECF.Framework.RT.EquipmentLibrary/Unit/IoHeater2.cs
View File

@ -45,12 +45,6 @@ namespace Aitex.Core.RT.Device.Unit
return _aiFeedback.FloatValue;
}
}
public string Unit
{
get; set;
}
private AITHeaterData DeviceData
{
get

6
MECF.Framework.RT.EquipmentLibrary/Unit/IoPressureMeter.cs
View File

@ -43,11 +43,7 @@ namespace Aitex.Core.RT.Device.Unit
return GetMbar();
}
}
public string Unit { get; set; }
private AIAccessor ai = null;

3
MECF.Framework.RT.EquipmentLibrary/Unit/IoPressureMeter2.cs
View File

@ -105,9 +105,6 @@ namespace Aitex.Core.RT.Device.Unit
}
}
public string Unit { get; set; }
private AIAccessor _aiLow = null;
private AIAccessor _aiHigh = null;

2
MECF.Framework.RT.EquipmentLibrary/Unit/IoPressureMeter3.cs
View File

@ -123,8 +123,6 @@ namespace Aitex.Core.RT.Device.Unit
}
}
public string Unit { get; set; }
private AIAccessor _aiValue = null;
private string _formatString = "F5";

4
MECF.Framework.UI.Client/CenterViews/Operations/FA/FAViewModel.cs
View File

@ -366,7 +366,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.FA
ConfigSetPoint.Update(QueryDataClient.Instance.Service.PollConfig(ConfigSetPoint.GetKeys()));
}
bool OnTimer()
protected override bool OnTimer()
{
try
{
@ -381,7 +381,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Operations.FA
return true;
}
void Poll()
protected override void Poll()
{
if (_subscribedKeys.Count > 0)
{