From f7b088088ffd7452bb7eef397b71f5ab4b250194 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Thu, 21 Sep 2023 20:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=20=E8=BD=B4?=
=?UTF-8?q?=E8=BF=90=E5=8A=A8=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C=E5=BC=B9?=
=?UTF-8?q?=E6=A1=86=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Rs.SkyLine/Commom/AlarmManager.cs | 24 ++++++++++++++++++
Rs.SkyLine/Flow/TurnoverFlow.cs | 42 ++++++++++++++++++++++++++++++-
Rs.SkyLine/Rs.SkyLine.csproj | 1 +
3 files changed, 66 insertions(+), 1 deletion(-)
create mode 100644 Rs.SkyLine/Commom/AlarmManager.cs
diff --git a/Rs.SkyLine/Commom/AlarmManager.cs b/Rs.SkyLine/Commom/AlarmManager.cs
new file mode 100644
index 0000000..0b69e9b
--- /dev/null
+++ b/Rs.SkyLine/Commom/AlarmManager.cs
@@ -0,0 +1,24 @@
+using Rs.DataAccess;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Rs.MotionPlat.Commom
+{
+ public class AlarmManager
+ {
+ static SqliteHelper db = new SqliteHelper();
+ ///
+ /// 添加报警信息到数据库
+ ///
+ ///
+ ///
+ public static bool Add(string content)
+ {
+ string insertSql = $"insert into alarm(content,createtime) values('{content}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss fff")}')";
+ return db.ExecuteNonQuery(insertSql) > 0;
+ }
+ }
+}
diff --git a/Rs.SkyLine/Flow/TurnoverFlow.cs b/Rs.SkyLine/Flow/TurnoverFlow.cs
index cd9f18a..1b98931 100644
--- a/Rs.SkyLine/Flow/TurnoverFlow.cs
+++ b/Rs.SkyLine/Flow/TurnoverFlow.cs
@@ -144,6 +144,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待运动到周转盘取料位上方;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverY运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待运动到周转盘取料位上方:
if (Ops.IsStop(AxisControl.TurnoverY))
@@ -164,6 +168,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待运动到周转盘下方取料位;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待运动到周转盘下方取料位:
if (Ops.IsStop(AxisControl.TurnoverZ))
@@ -203,6 +211,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待到周转盘取料破真空位;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待到周转盘取料破真空位:
if (Ops.IsStop(AxisControl.TurnoverZ))
@@ -229,6 +241,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待周转盘取料完成抬起;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待周转盘取料完成抬起:
if (Ops.IsStop(AxisControl.TurnoverZ))
@@ -268,6 +284,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待运动到测试放料位上方;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverY运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待运动到测试放料位上方:
if (Ops.IsStop(AxisControl.TurnoverY))
@@ -288,6 +308,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待运动到到测试放料位下方;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待运动到到测试放料位下方:
if (Ops.IsStop(AxisControl.TurnoverZ))
@@ -322,6 +346,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待测试位放料完成抬起;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待测试位放料完成抬起:
if (Ops.IsStop(AxisControl.TurnoverZ))
@@ -351,7 +379,7 @@ namespace Rs.MotionPlat.Flow
logInfo = $"测试穴位 {msg} 真空异常";
MessageQueue.Instance.Insert(logInfo);
LogHelper.Debug(logInfo);
-
+ LogHelper.Debug(logInfo);
Msg.ShowError($"测试穴位 {msg} 真空异常，请处理后点击确定");
Step = ETurnoverFlowStep.到测试保压位上方;
}
@@ -366,6 +394,10 @@ namespace Rs.MotionPlat.Flow
LogHelper.Debug(logInfo);
Step = ETurnoverFlowStep.等待到测试保压位上方;
}
+ else
+ {
+ Msg.ShowError($"轴TurnoverY运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待到测试保压位上方:
if (Ops.IsStop(AxisControl.TurnoverY))
@@ -388,6 +420,10 @@ namespace Rs.MotionPlat.Flow
Step = ETurnoverFlowStep.等待到测试保压位下方1;
}
+ else
+ {
+ Msg.ShowError($"轴PressZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待到测试保压位下方1:
if (Ops.IsStop(AxisControl.PressZ))
@@ -414,6 +450,10 @@ namespace Rs.MotionPlat.Flow
Step = ETurnoverFlowStep.等待到测试保压位下方2;
}
+ else
+ {
+ Msg.ShowError($"轴PressZ运动异常 ret:{errCode}");
+ }
break;
case ETurnoverFlowStep.等待到测试保压位下方2:
if (Ops.IsStop(AxisControl.PressZ))
diff --git a/Rs.SkyLine/Rs.SkyLine.csproj b/Rs.SkyLine/Rs.SkyLine.csproj
index 9e53be5..0d388b7 100644
--- a/Rs.SkyLine/Rs.SkyLine.csproj
+++ b/Rs.SkyLine/Rs.SkyLine.csproj
@@ -110,6 +110,7 @@
CalibrationForm.cs
+