Commit fbaeecb9 张东亮

门禁打开时停止运动,需要手动恢复

1 个父辈 15c3d0ce
......@@ -19,7 +19,13 @@ namespace OnlineStore.DeviceLibrary
public static bool TrayToOutLineTest = false;
//public static bool DisSecurityAccess = ConfigAppSettings.GetIntValue(Setting_Init.DisSecurityAccess).Equals(1);
/// <summary>
/// 软件屏蔽光栅
/// </summary>
public static bool DisSecurityAccess = false;
/// <summary>
/// 软件屏蔽门禁
/// </summary>
public static bool DisBoxDoorLimit = false;
public static bool DisGetWare = false;
......
......@@ -1110,9 +1110,10 @@ namespace OnlineStore.DeviceLibrary
return;
}
LogUtil.info($"{Name} {doorname}被打开,停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop},报警急停");
SetWarnMsg($"{doorname}被打开,报警急停");
Alarm(AlarmType.SuddenStop);
LogUtil.info($"{Name} {doorname}被打开,停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop},报警停止运动");
MoveStop = true;
SetWarnMsg($"{doorname}被打开,报警停止运动");
//Alarm(AlarmType.SuddenStop);
}
......@@ -1127,7 +1128,7 @@ namespace OnlineStore.DeviceLibrary
return;
}
CurDoorLimitState = 0;
MoveStop = false;
//MoveStop = false;
if (alarmType > (AlarmType.IoSingleTimeOut))
{
......
......@@ -233,6 +233,10 @@ namespace OnlineStore.XLRStore
{
FormStatus(true);
}
if (boxBean.MoveStop != chbMoveStop.Checked)
{
chbMoveStop.Checked= boxBean.MoveStop;
}
}
else
{
......@@ -521,7 +525,10 @@ namespace OnlineStore.XLRStore
{
return;
}
if(boxBean.MoveStop == chbMoveStop.Checked)
{
return;
}
boxBean.MoveStop = chbMoveStop.Checked;
LogUtil.info(boxBean.Name + "用户切换是否暂停: " + boxBean.MoveStop);
}
......@@ -548,7 +555,6 @@ namespace OnlineStore.XLRStore
}
}
}
}
}
......
......@@ -121,7 +121,7 @@
<value>17, 11</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
<value>73</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!