Skip to content

李娜 / SO908-XLRStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0da9290e 由 张东亮
选项

Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

2 个父辈 7794e5e5 ad492ae2
内嵌 并排
正在显示 5 个修改的文件 包含 25 行增加 和 9 行删除
source/DeviceLibrary/manager/model/DeviceBase.cs
...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public abstract class DeviceBase public abstract class DeviceBase
{ {
public DateTime LastAlarmTime = DateTime.Now;
public RunStatus runStatus = RunStatus.Wait; public RunStatus runStatus = RunStatus.Wait;
public string WarnMsg = ""; public string WarnMsg = "";
......
source/DeviceLibrary/storeBean/EquipBase.cs
...@@ -42,6 +42,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -42,6 +42,10 @@ namespace OnlineStore.DeviceLibrary
{ {
LastAlarmTime = DateTime.Now; LastAlarmTime = DateTime.Now;
} }
if (alarmType.Equals(AlarmType.None).Equals(false))
{
LastAlarmTime = DateTime.Now;
}
if (this.alarmType.Equals(alarmType)) if (this.alarmType.Equals(alarmType))
{ {
return; return;
......
source/DeviceLibrary/storeBean/XLRStoreBean.cs
...@@ -513,7 +513,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -513,7 +513,6 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
public DateTime LastAlarmTime = DateTime.Now;
public override void Alarm(AlarmType alarmType) public override void Alarm(AlarmType alarmType)
{ {
if (alarmType.Equals(AlarmType.None).Equals(false)) if (alarmType.Equals(AlarmType.None).Equals(false))
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs
...@@ -24,10 +24,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -24,10 +24,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (!Robot.CanStartWork()) //if (!Robot.CanStartWork())
{ //{
return false; // return false;
} //}
if (AgvClient.GetAction(Config.AgvName) == ClientAction.NeedLeave || AgvClient.GetAction(Config.AgvName) == ClientAction.MayLeave) if (AgvClient.GetAction(Config.AgvName) == ClientAction.NeedLeave || AgvClient.GetAction(Config.AgvName) == ClientAction.MayLeave)
{ {
//WorkLog("料串入料 ：等待AGV来取空料串1"); //WorkLog("料串入料 ：等待AGV来取空料串1");
......
source/XLRStoreClient/FrmXLRStore.cs
...@@ -467,12 +467,24 @@ namespace OnlineStore.XLRStore ...@@ -467,12 +467,24 @@ namespace OnlineStore.XLRStore
lblStatus.Text = StoreBean.GetRunStr() + canScanCode; lblStatus.Text = StoreBean.GetRunStr() + canScanCode;
string warnMsg = ""; string warnMsg = "";
if (StoreManager.XLRStore.runStatus > RunStatus.Wait) List<DeviceBase> deviceBases = new List<DeviceBase>() { StoreManager.XLRStore, StoreManager.XLRStore.inputEquip, StoreManager.XLRStore.boxEquip };
//if (StoreManager.XLRStore.runStatus > RunStatus.Wait)
//{
// string time = StoreManager.XLRStore.alarmType.Equals(AlarmType.None) ? "" : StoreManager.XLRStore.LastAlarmTime.ToLongTimeString();
// warnMsg = StoreManager.XLRStore.WarnMsg.Equals("") ? "" : (time + StoreManager.XLRStore.WarnMsg + "\r\n");
//}
foreach(DeviceBase device in deviceBases)
{ {
string time = StoreManager.XLRStore.alarmType.Equals(AlarmType.None) ? "" : StoreManager.XLRStore.LastAlarmTime.ToLongTimeString(); if (device.runStatus > RunStatus.Wait)
warnMsg = StoreManager.XLRStore.WarnMsg.Equals("") ? "" : (time + StoreManager.XLRStore.WarnMsg + "\r\n"); {
if (!device.WarnMsg.Equals(""))
{
string time = device.alarmType.Equals(AlarmType.None) ? "" : device.LastAlarmTime.ToLongTimeString();
warnMsg += device.WarnMsg.Equals("") ? "" : (time + device.WarnMsg + "\r\n");
} }
}
}
lblWarnMsg.Text = warnMsg; lblWarnMsg.Text = warnMsg;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!