Skip to content

孙克 / RC1250-AssemblyLine

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

流水线去掉NextStopCheck的验证

1 个父辈 a153e9f2
内嵌 并排
正在显示 7 个修改的文件 包含 31 行增加 和 21 行删除
source/AssemblyLineClient/记录.txt
...@@ -137,6 +137,12 @@ DI,17,17NSC-进仓18阻挡1检测,NextStopCheck,10,PRO_AOI_IP_35,0,17NSC-进仓1 ...@@ -137,6 +137,12 @@ DI,17,17NSC-进仓18阻挡1检测,NextStopCheck,10,PRO_AOI_IP_35,0,17NSC-进仓1
DI,18,18NSC-出料4阻挡1检测,NextStopCheck,4,PRO_AOI_IP_36,0,18NSC-出料4阻挡1检测,X555,X555 DI,18,18NSC-出料4阻挡1检测,NextStopCheck,4,PRO_AOI_IP_36,0,18NSC-出料4阻挡1检测,X555,X555
20200220
agvclien增加cancelState的参数设置.
去掉功能：阻挡2下降的时候需要验证下一个阻挡1检测无信号
20200221
agv客户端启动时需要设置状态为none
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -32,10 +32,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -32,10 +32,10 @@ namespace OnlineStore.DeviceLibrary
agvClient.CloseDoor += AgvClient_CloseDoor; agvClient.CloseDoor += AgvClient_CloseDoor;
} }
actionMap = new Dictionary<string, Asa.ClientAction>(); actionMap = new Dictionary<string, Asa.ClientAction>();
foreach (string key in NodeList) //foreach (string key in NodeList)
{ //{
actionMap.Add(key, Asa.ClientAction.None); // actionMap.Add(key, Asa.ClientAction.None);
} //}
if (!LineManager.Line.UseAgvClient) if (!LineManager.Line.UseAgvClient)
{ {
LogUtil.info("LineManager.Line.UseAgvClient 未启用，直接返回"); LogUtil.info("LineManager.Line.UseAgvClient 未启用，直接返回");
...@@ -65,12 +65,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -65,12 +65,16 @@ namespace OnlineStore.DeviceLibrary
} }
public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low) public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
{ {
ClientAction currA = GetAction(id); // ClientAction currA = GetAction(id);
//相同状态就设置一次 if (actionMap.ContainsKey(id))
{
ClientAction currA = actionMap[id]; //相同状态就设置一次
if (currA.Equals(action)) if (currA.Equals(action))
{ {
return; return;
} }
}
agvClient.SetStatus(id, "", shelfId, action, level); agvClient.SetStatus(id, "", shelfId, action, level);
UpdateAction(id, action); UpdateAction(id, action);
} }
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -246,7 +246,7 @@ namespace OnlineStore.DeviceLibrary
LogInfo(SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前 【" + tray.ToStr() + "】没有出入料任务，放盘通过~"); LogInfo(SecondMoveInfo.MoveNum + "***************上个托盘号【" + preTrayNum + "】，当前 【" + tray.ToStr() + "】没有出入料任务，放盘通过~");
//CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，移栽2，需要判断是否可以放盘通过,最多等待10000）"); //CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，移栽2，需要判断是否可以放盘通过,最多等待10000）");
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW)); // SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
else else
{ {
...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -331,7 +331,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW)); // SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_WaitCanGo)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_WaitCanGo))
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -516,7 +516,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -516,7 +516,7 @@ namespace OnlineStore.DeviceLibrary
} }
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW)); // SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
} }
catch (Exception ex) catch (Exception ex)
...@@ -583,7 +583,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -583,7 +583,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW)); // SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_WaitCanGo)) else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_15_WaitCanGo))
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
...@@ -313,7 +313,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -313,7 +313,7 @@ namespace OnlineStore.DeviceLibrary
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_15_WaitCanGo);
CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0"); CheckLog("托盘放行 " + SecondMoveInfo.SLog + " ，等待 NextStopCheck=0");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW)); // SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.NextStopCheck, IO_VALUE.LOW));
} }
} }
......
source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
...@@ -300,11 +300,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -300,11 +300,11 @@ namespace OnlineStore.LoadCSVLibrary
ConfigIO nsc = null; ConfigIO nsc = null;
foreach (string key in diList.Keys) foreach (string key in diList.Keys)
{ {
if (key.Equals(IO_Type.NextStopCheck)) //if (key.Equals(IO_Type.NextStopCheck))
{ //{
nsc = diList[key]; // nsc = diList[key];
continue; // continue;
} //}
DIList.Add(key, diList[key]); DIList.Add(key, diList[key]);
if (!IOIPList.Contains(diList[key].IO_IP)) if (!IOIPList.Contains(diList[key].IO_IP))
{ {
...@@ -321,10 +321,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -321,10 +321,10 @@ namespace OnlineStore.LoadCSVLibrary
} }
} }
if (nsc!=null) //if (nsc!=null)
{ //{
DIList.Add(IO_Type.NextStopCheck, nsc); // DIList.Add(IO_Type.NextStopCheck, nsc);
} //}
} }
public ConfigIO getWaitIO(string ioType) public ConfigIO getWaitIO(string ioType)
{ {
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -660,7 +660,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -660,7 +660,7 @@ namespace OnlineStore.LoadCSVLibrary
#endregion #endregion
public static string NextStopCheck = "NextStopCheck"; // public static string NextStopCheck = "NextStopCheck";
} }
public enum IO_VALUE public enum IO_VALUE
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!