Commit 0145d73d 张东亮

出入库前检查料叉不停止设备,避免料串运动造成误感应

1 个父辈 85c1de37
...@@ -64,7 +64,7 @@ namespace DeviceLibrary ...@@ -64,7 +64,7 @@ namespace DeviceLibrary
public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; } public bool boxTransportIsFree { get => boxTransport.IsComplateOrFree; }
public event Action<string, StoreMoveType, bool> InOutEndProcessEvent; public event Action<string, StoreMoveType, bool> InOutEndProcessEvent;
ServerCommunication ServerCM = new ServerCommunication(); ServerCommunication ServerCM;
/// <summary> /// <summary>
/// 开始运行的时间 /// 开始运行的时间
/// </summary> /// </summary>
...@@ -192,6 +192,7 @@ namespace DeviceLibrary ...@@ -192,6 +192,7 @@ namespace DeviceLibrary
ConfigHelper.Config.Set("CamTestReel_debug", false); ConfigHelper.Config.Set("CamTestReel_debug", false);
ConfigHelper.Config.Get("Device_1315_ReelHeight_Compensation", 0); ConfigHelper.Config.Get("Device_1315_ReelHeight_Compensation", 0);
initAgv(); initAgv();
ServerCM = new ServerCommunication();
} }
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
......
...@@ -70,7 +70,7 @@ namespace DeviceLibrary ...@@ -70,7 +70,7 @@ namespace DeviceLibrary
//} //}
//else //else
Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm); Msg.add(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"), MsgLevel.alarm);
RobotManage.UserPause(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查")); //RobotManage.UserPause(crc.GetString("Res0004", "收到出库任务,但料叉上有料,无法启动,请检查"));
return; return;
} }
else else
......
...@@ -100,7 +100,7 @@ namespace DeviceLibrary ...@@ -100,7 +100,7 @@ namespace DeviceLibrary
} }
catch (Exception ex) { catch (Exception ex) {
LogUtil.error(ex.ToString()); LogUtil.error("Init ", ex);
LoadFinishEvent?.Invoke(false, ex.Message); LoadFinishEvent?.Invoke(false, ex.Message);
return; return;
} }
......
...@@ -317,7 +317,7 @@ namespace TheMachine ...@@ -317,7 +317,7 @@ namespace TheMachine
lm.Add(m); lm.Add(m);
} }
SetMsg(lm); SetMsg(lm);
//WindowManager.Show(); WindowManager.Show();
} }
void SetMsg(List<Msg> msgs) void SetMsg(List<Msg> msgs)
{ {
......
...@@ -54,12 +54,12 @@ namespace TheMachine ...@@ -54,12 +54,12 @@ namespace TheMachine
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
LogUtil.error(e.ToString()); LogUtil.error($"CurrentDomain_UnhandledException:" +e.ToString());
} }
private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e) private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{ {
LogUtil.error(e.ToString()); LogUtil.error($"Application_ThreadException:" +e.ToString());
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!