Commit 40157967 LN

横移机构优化

1 个父辈 ab7e32ab
...@@ -114,11 +114,11 @@ namespace OnlineStore.Common ...@@ -114,11 +114,11 @@ namespace OnlineStore.Common
catch(WebException ex) catch(WebException ex)
{ {
IsTimeOut = true; IsTimeOut = true;
LogUtil.error("POST ["+ url + "]["+paramData+"] WebException :" + ex .ToString(), 101); LogUtil.error("POST ["+ url + "] WebException :" + ex .ToString(), 101);
} }
catch (Exception e) catch (Exception e)
{ {
LogUtil.error("POST [" + url + "][" + paramData + "] ERROR:" + e.ToString(), 101); LogUtil.error("POST [" + url + "] ERROR:" + e.ToString(), 101);
} }
if (!result.Contains("null") && result.Length != 0) if (!result.Contains("null") && result.Length != 0)
{ {
......
...@@ -88,9 +88,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -88,9 +88,9 @@ namespace OnlineStore.DeviceLibrary
if (Config.SidesWayNum > 0) if (Config.SidesWayNum > 0)
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
if (IOValue(IO_Type.SW_TrayCheck).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.SW_TrayCheck).Equals(IO_VALUE.HIGH))
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, false) && canProcess) if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, false) && canProcess)
{ {
swWaitWatch.Stop(); swWaitWatch.Stop();
...@@ -113,6 +113,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -113,6 +113,7 @@ namespace OnlineStore.DeviceLibrary
else if (Config.SidesWayNum.Equals(2) && IOValue(IO_Type.SW_StopCheck).Equals(IO_VALUE.HIGH) else if (Config.SidesWayNum.Equals(2) && IOValue(IO_Type.SW_StopCheck).Equals(IO_VALUE.HIGH)
&& (DateTime.Now - lastStopDown).TotalSeconds > 3) && (DateTime.Now - lastStopDown).TotalSeconds > 3)
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, false) && canProcess) if (TrayManager.checkWatch(swWaitWatch, TrayManager.SwTrayWaitTime, false) && canProcess)
{ {
swWaitWatch.Stop(); swWaitWatch.Stop();
......
...@@ -46,10 +46,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,10 +46,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中,直接返回 "); LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中,直接返回 ");
return; return;
} }
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
//int num = TrayManager.GetTrayNum(DeviceID); //int num = TrayManager.GetTrayNum(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
trayCheck2LowWait.Stop(); trayCheck2LowWait.Stop();
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && canProcess) if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && canProcess)
{ {
...@@ -66,6 +66,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -66,6 +66,7 @@ namespace OnlineStore.DeviceLibrary
bool check2Ok = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false); bool check2Ok = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH) && (DateTime.Now - lastStopDown).TotalSeconds > 3) if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH) && (DateTime.Now - lastStopDown).TotalSeconds > 3)
{ {
bool canProcess = (LineManager.Line.SwNoProcess(Config.SidesWayNum));
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2Ok && canProcess) if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2Ok && canProcess)
{ {
trayCheckWait.Stop(); trayCheckWait.Stop();
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!