Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cbbfca3a 由 LN
选项

IO模块断开时手动重连

1 个父辈 9211d903
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 107 行增加 和 7 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -558,6 +558,7 @@ namespace OnlineStore.AssemblyLine ...@@ -558,6 +558,7 @@ namespace OnlineStore.AssemblyLine
{ {
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState"; aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
} }
btnIOAutoCon.Enabled = (AIOAutoConSetting.autoConnect.Equals(false));
lblStatus.Text = lineBean.GetRunStr() + canScanCode; lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString(); string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n"; string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n";
...@@ -567,7 +568,10 @@ namespace OnlineStore.AssemblyLine ...@@ -567,7 +568,10 @@ namespace OnlineStore.AssemblyLine
{ {
warnMsg += TrayManager.TrayErrorMsg + "\r\n"; warnMsg += TrayManager.TrayErrorMsg + "\r\n";
} }
if (lineBean.IOErrorMsg.Equals("").Equals(false))
{
warnMsg += lineBean.IOErrorMsg + "\r\n";
}
foreach (EquipBase move in lineBean.AllEquipMap.Values) foreach (EquipBase move in lineBean.AllEquipMap.Values)
{ {
if (move.WarnMsg.Equals("").Equals(false)) if (move.WarnMsg.Equals("").Equals(false))
...@@ -1340,5 +1344,11 @@ namespace OnlineStore.AssemblyLine ...@@ -1340,5 +1344,11 @@ namespace OnlineStore.AssemblyLine
} }
LogUtil.info(Name + " 点击：" + 自动保存托盘信息ToolStripMenuItem.Text); LogUtil.info(Name + " 点击：" + 自动保存托盘信息ToolStripMenuItem.Text);
} }
private void btnIOAutoCon_Click(object sender, EventArgs e)
{
LogUtil.info("用户点击了：" + btnIOAutoCon.Text);
AIOAutoConSetting.SetAutoConnect(true, 3);
}
} }
} }
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
<Compile Include="baan\AxisBean.cs" /> <Compile Include="baan\AxisBean.cs" />
<Compile Include="baan\WaitUtil.cs" /> <Compile Include="baan\WaitUtil.cs" />
<Compile Include="deviceLibrary\halcon\CodeManager.cs" /> <Compile Include="deviceLibrary\halcon\CodeManager.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOAutoConSetting.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOX.cs" /> <Compile Include="deviceLibrary\IO\AIOBOX\AIOBOX.cs" />
<Compile Include="deviceLibrary\IO\AIOBOX\AIOBOXManager.cs" /> <Compile Include="deviceLibrary\IO\AIOBOX\AIOBOXManager.cs" />
<Compile Include="deviceLibrary\IO\IOManager.cs" /> <Compile Include="deviceLibrary\IO\IOManager.cs" />
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -47,6 +47,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -47,6 +47,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public Line_Config Config { get; set; } public Line_Config Config { get; set; }
public string IOErrorMsg = "";
#region 初始化 #region 初始化
public List<string> cioList = new List<string>(); public List<string> cioList = new List<string>();
// public List<string> rfidList = new List<string>(); // public List<string> rfidList = new List<string>();
...@@ -59,6 +61,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -59,6 +61,8 @@ namespace OnlineStore.DeviceLibrary
{ {
lineConfig.IOSingle_TimerOut = 5000; lineConfig.IOSingle_TimerOut = 5000;
} }
AIOAutoConSetting.SetAutoConnect(true, 0);
Init(); Init();
InitTimer(); InitTimer();
baseConfig = lineConfig; baseConfig = lineConfig;
...@@ -991,6 +995,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -991,6 +995,8 @@ namespace OnlineStore.DeviceLibrary
} }
msg = moveEquip.Name + "复位结束"; msg = moveEquip.Name + "复位结束";
isOk = false; isOk = false;
AIOAutoConSetting.SetAutoConnect(false);
LogUtil.info("环形线复位结束，设置IO模块自动连接=false");
break; break;
} }
else else
...@@ -1093,6 +1099,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -1093,6 +1099,18 @@ namespace OnlineStore.DeviceLibrary
{ {
alarmList.Add(new AlarmMsg(Name, "line." + alarmType, WarnMsg)); alarmList.Add(new AlarmMsg(Name, "line." + alarmType, WarnMsg));
} }
string ioMsg = AIOBOXManager.instance.GetIoErrorMsg();
if (!IOErrorMsg.Equals(ioMsg))
{
LogUtil.info($"IO模块报警变化：[{IOErrorMsg}]->[{ioMsg}]");
IOErrorMsg = ioMsg;
}
if (String.IsNullOrEmpty(IOErrorMsg).Equals(false))
{
alarmList.Add(new AlarmMsg(Name, "line.IO" , IOErrorMsg));
}
int num = TrayDisableManager.GetDisableList().Count; int num = TrayDisableManager.GetDisableList().Count;
if (num >= 5) if (num >= 5)
{ {
...@@ -1124,7 +1142,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1124,7 +1142,7 @@ namespace OnlineStore.DeviceLibrary
conIsPro = false; conIsPro = false;
} }
} }
public MoveEquip GetMoveByDId(int deviceId) public MoveEquip GetMoveByDId(int deviceId)
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOAutoConSetting.cs 0 → 100644
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
public class AIOAutoConSetting
{
public static bool autoConnect = true;
private static DateTime StartAutoConTime = DateTime.Now;
private static int AutoMinutes = -1;
public static void SetAutoConnect(bool autoCon, int minute=0)
{
autoConnect = autoCon;
StartAutoConTime = DateTime.Now;
AutoMinutes = minute;
LogUtil.info($"AIOAutoConSetting：autoCon={autoCon},minute={minute}");
}
public static bool NeedAutoConnect()
{
if (autoConnect)
{
if (AutoMinutes <= 0)
{
return true;
}
DateTime endConTime = StartAutoConTime.AddMinutes(AutoMinutes);
if (DateTime.Now <= endConTime)
{
return true;
}
else
{
autoConnect = false;
LogUtil.info($"AIOAutoConSetting：StartAutoConTime={StartAutoConTime},minute={AutoMinutes},自动重连IO模块结束");
}
}
return false;
}
}
}
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOX.cs
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
...@@ -620,8 +621,12 @@ namespace Asa.IOModule ...@@ -620,8 +621,12 @@ namespace Asa.IOModule
} }
else else
{ {
Thread.Sleep(100); if (AIOAutoConSetting.NeedAutoConnect())
if (_loop) Open(); {
Thread.Sleep(100);
if (_loop) Open();
}
} }
} }
} }
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
...@@ -30,10 +30,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,10 +30,9 @@ namespace OnlineStore.DeviceLibrary
//private object DILock = ""; //private object DILock = "";
//private object DOLock = ""; //private object DOLock = "";
public override void ConnectionIOList(List<string> DIONameList) public override void ConnectionIOList(List<string> DIONameList)
{ {
foreach (string ip in DIONameList) foreach (string ip in DIONameList)
{ {
ConnectionIP(ip); ConnectionIP(ip);
...@@ -41,7 +40,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -41,7 +40,23 @@ namespace OnlineStore.DeviceLibrary
} }
private bool isProcess = false; private bool isProcess = false;
private DateTime lastTime = DateTime.Now; private DateTime lastTime = DateTime.Now;
public override string GetIoErrorMsg()
{
string msg = "";
List<AIOBOX> lists = new List<AIOBOX>(AIOMap.Values);
foreach (AIOBOX aio in lists)
{
if (!aio.IsConn)
{
msg += $"[{aio.IP}]";
}
}
if (!String.IsNullOrEmpty(msg))
{
msg = "IO模块" + msg + "未连接";
}
return msg;
}
public void ConnectionIP(string ioIp) public void ConnectionIP(string ioIp)
{ {
AIOBOX aioBox = null; AIOBOX aioBox = null;
......
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
...@@ -203,5 +203,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,5 +203,7 @@ namespace OnlineStore.DeviceLibrary
public abstract bool IsConnect(string ip); public abstract bool IsConnect(string ip);
public abstract string GetIoErrorMsg();
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!