TyroneGit/MoviconHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据新需求更改

Browse Source
This commit is contained in:
Tyrone CT
2025-09-17 17:22:09 +08:00
parent e7adae128e
commit a954427d41
21 changed files with 633 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
MoviconHub.App/frmMain.cs
View File

@@ -70,6 +70,7 @@ namespace MoviconHub.App
ClearActionInstance = new ClearAction();
ClearActionInstance.ClearActionEvent += ClearActionInstance_ClearActionEvent;
ClearActionInstance.DeviceStateChangeEvent += ClearActionInstance_DeviceStateChangeEvent;
ListAlarmModels = new List<AlarmModel>()
{
@@ -437,6 +438,29 @@ namespace MoviconHub.App
}
private void ClearActionInstance_DeviceStateChangeEvent(object sender, StateInfo Value)
{
var Data = new DeviceStatusChange()
{
DeviceCode = "942010002",
DeviceName = "机车构架及大部件自动化智能清洗设备",
DeviceState = Value.State,
StartTime = Value.StartTime,
EndTime = Value.EndTime,
};
var Result = FRemoteSqlContext.FDb.Insert<DeviceStatusChange>(Data).ExecuteInserted();
if (Result != null && Result.Count > 0)
{
Logger.Info("设备数据状态改变保存完成");
BeginInvoke(new Action(() =>
{
MainText.AppendText($"时间:{DateTime.Now}-Msg:设备数据状态改变保存完成 {Environment.NewLine}");
}));
}
}
/// <summary>
/// 清洗动作实例信息
/// </summary>
@@ -532,7 +556,23 @@ namespace MoviconHub.App
// 监控信息
Test_ElectricSurveillance = CurDBServices.RealtimeData.TestData.Test_ElectricSurveillance,
Test_SteamSurveillance = CurDBServices.RealtimeData.TestData.Test_SteamSurveillance
Test_SteamSurveillance = CurDBServices.RealtimeData.TestData.Test_SteamSurveillance,
//Test_Rob1Axis7BackwardLimitOK = CurDBServices.RealtimeData.TestData.Test_Rob1Axis7BackwardLimitOK,
//Test_Rob1Axis7ForwardLimitOK = CurDBServices.RealtimeData.TestData.Test_Rob1Axis7ForwardLimitOK,
//Test_Rob1Axis7Home = CurDBServices.RealtimeData.TestData.Test_Rob1Axis7Home,
//Test_Rob2Axis7BackwardLimitOK = CurDBServices.RealtimeData.TestData.Test_Rob2Axis7BackwardLimitOK,
//Test_Rob2Axis7ForwardLimitOK = CurDBServices.RealtimeData.TestData.Test_Rob2Axis7ForwardLimitOK,
//Test_Rob2Axis7Home = CurDBServices.RealtimeData.TestData.Test_Rob2Axis7Home,
//Test_TrussLiftHome = CurDBServices.RealtimeData.TestData.Test_TrussLiftHome,
//Test_TrussLiftLowerLimit = CurDBServices.RealtimeData.TestData.Test_TrussLiftLowerLimit,
//Test_TrussLiftPoolPos = CurDBServices.RealtimeData.TestData.Test_TrussLiftPoolPos,
//Test_TrussLiftRiseLimit = CurDBServices.RealtimeData.TestData.Test_TrussLiftRiseLimit,
//Test_TrussLiftWashPos = CurDBServices.RealtimeData.TestData.Test_TrussLiftWashPos,
//Test_TrussMoveBackwardLimit = CurDBServices.RealtimeData.TestData.Test_TrussMoveBackwardLimit,
//Test_TrussMoveForwardLimit = CurDBServices.RealtimeData.TestData.Test_TrussMoveForwardLimit,
//Test_TrussMoveHome = CurDBServices.RealtimeData.TestData.Test_TrussMoveHome,
};
var Result = FRemoteSqlContext.FDb.Insert<ClearData>(curRunData).ExecuteInserted();
@@ -594,6 +634,8 @@ namespace MoviconHub.App
/// </summary>
private OperateResult<Int16[]> OperateResultDeviceStateStatic { get; set; }
private OperateResult<Int16> OperateResultDeviceStateChange { get; set; }
/// <summary>
/// 通信初始化
/// </summary>
@@ -677,18 +719,26 @@ namespace MoviconHub.App
}
}
OperateResultDeviceStateChange = MelsecMcNetDrive.ReadInt16("D4000");
if (OperateResultDeviceStateChange.IsSuccess)
{
ClearActionInstance.DeviceState = OperateResultDeviceStateChange.Content;
}
//OperateResultClearEnd = MelsecMcNetDrive.ReadBool("M210");
//if (OperateResultClearEnd.IsSuccess)
//{
// ClearActionInstance.ClearEnd = OperateResultClearEnd.Content;
//}
//设备清洗结束
OperateResultClearEnd = MelsecMcNetDrive.ReadBool("M211");
if (OperateResultClearEnd.IsSuccess)
{
ClearActionInstance.ClearEnd = OperateResultClearEnd.Content;
}
//设备关机
OperateResultDeviceClose = MelsecMcNetDrive.ReadBool("M210");
if (OperateResultDeviceClose.IsSuccess)
{