Skip to content

李娜 / SO664-AssemblyLine

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

紧急料从T4出。

1 个父辈 a7c13f83
内嵌 并排
正在显示 4 个修改的文件 包含 22 行增加 和 22 行删除
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -1096,7 +1096,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1096,7 +1096,7 @@ namespace OnlineStore.DeviceLibrary
bool debugNeed = (runStatus >= LineRunStatus.Runing) && info.IsFull && info.InOrOutStore.Equals(2); bool debugNeed = (runStatus >= LineRunStatus.Runing) && info.IsFull && info.InOrOutStore.Equals(2);
debugNeed = false; debugNeed = false;
bool isJinji = (param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing; bool isJinji = (param.cutReel||param.urgentReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
//bool isJinji = (param.urgentReel || param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing; //bool isJinji = (param.urgentReel || param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
if (debugNeed || isJinji) if (debugNeed || isJinji)
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -255,7 +255,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false); bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false)||String.IsNullOrEmpty(RFIDIP);
if (preTrayIsC1Line && Config.IsOutLineOut && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH)) if (preTrayIsC1Line && Config.IsOutLineOut && IOValue(IO_Type.HY_OL_Tray_Check).Equals(IO_VALUE.HIGH))
{ {
//C1线和出料线交替处理 //C1线和出料线交替处理
...@@ -313,7 +313,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -313,7 +313,7 @@ namespace OnlineStore.DeviceLibrary
} }
private void HY71_OL_Wait() private void HY71_OL_Wait()
{ {
bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false); bool check2IsOk = CheckStopWatch(trayCheckLowWait, TrayWaitTime, false) || String.IsNullOrEmpty(RFIDIP);
if (CheckStopWatch(olcheckWatch, TrayWaitTime, false) && check2IsOk) if (CheckStopWatch(olcheckWatch, TrayWaitTime, false) && check2IsOk)
{ {
preTrayIsC1Line = false; preTrayIsC1Line = false;
...@@ -882,12 +882,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -882,12 +882,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (DeviceID.Equals(215)) else if (DeviceID.Equals(215))
{ {
//非分盘料的出库需要横移 //非分盘料，紧急料 的出库需要横移
//非11,12,23,24的入库料需要横移 //非11,12,23,24的入库料需要横移
//NG料直接横移 //NG料直接横移
if (tray.IsFull) if (tray.IsFull)
{ {
if (tray.InOrOutStore.Equals(2) && (!tray.InoutPar.cutReel)) if (tray.InOrOutStore.Equals(2) && (!tray.InoutPar.cutReel) && (!tray.InoutPar.urgentReel))
{ {
return true; return true;
} }
...@@ -909,12 +909,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -909,12 +909,12 @@ namespace OnlineStore.DeviceLibrary
} }
else if (DeviceID.Equals(218)) else if (DeviceID.Equals(218))
{ {
//HY4,满料托盘，如果不是分盘出料的需要横移， //HY4,满料托盘，如果不是分盘出料，紧急料，的需要横移，
//空托盘,T5都不在上料时需要横移 //空托盘,T5都不在上料时需要横移
if (tray.IsFull) if (tray.IsFull)
{ {
//如果是分盘料盘，不需要横移 //如果是分盘料盘，不需要横移
if (tray.InOrOutStore.Equals(2) && tray.InoutPar.cutReel) if (tray.InOrOutStore.Equals(2) && (tray.InoutPar.cutReel || tray.InoutPar.urgentReel))
{ {
return false; return false;
} }
...@@ -998,13 +998,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -998,13 +998,13 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.MoveParam = param; MoveInfo.MoveParam = param;
return true ; return true ;
} }
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel && this.DeviceID.Equals(216)) //else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel && this.DeviceID.Equals(216))
{ //{
//紧急料到NG箱 // //紧急料到NG箱
LogInfo(" C1->出料线：紧急料" + "" + param.ToStr()); // LogInfo(" C1->出料线：紧急料" + "" + param.ToStr());
MoveInfo.MoveParam = param; // MoveInfo.MoveParam = param;
return true; // return true;
} //}
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel.Equals(false) && param.cutReel.Equals(false)) else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel.Equals(false) && param.cutReel.Equals(false))
{ {
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -392,13 +392,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -392,13 +392,13 @@ namespace OnlineStore.DeviceLibrary
//MoveInfo.MoveParam = inoup; //MoveInfo.MoveParam = inoup;
return true; return true;
} }
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.DeviceID.Equals(217)) //else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.DeviceID.Equals(217))
{ //{
LogInfo(" 紧急料->NG箱" + "" + inoup.ToStr()); // LogInfo(" 紧急料->NG箱" + "" + inoup.ToStr());
SecondMoveInfo.MoveParam = inoup; // SecondMoveInfo.MoveParam = inoup;
//MoveInfo.MoveParam = inoup; // //MoveInfo.MoveParam = inoup;
return true; // return true;
} //}
} }
} }
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -460,7 +460,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -460,7 +460,7 @@ namespace OnlineStore.DeviceLibrary
HY_C1Line hy8 = (HY_C1Line)HYEquipMap[208]; HY_C1Line hy8 = (HY_C1Line)HYEquipMap[208];
if (hy8.runStatus > LineRunStatus.Wait && hy8.MoveInfo.MoveType.Equals(LineMoveType.None)) if (hy8.runStatus > LineRunStatus.Wait && hy8.MoveInfo.MoveType.Equals(LineMoveType.None))
{ {
LogUtil.info("进仓05托盘离开，" + hy8.Name + "开始等待托盘检测信号 HY03_FrontStopUp"); LogUtil.debug("进仓05托盘离开，" + hy8.Name + "开始等待托盘检测信号 HY03_FrontStopUp");
hy8.HY03_FrontStopUp(); hy8.HY03_FrontStopUp();
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!