1

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -228,12 +228,12 @@ namespace OnlineStore.DeviceLibrary
                     }
                     }
                     else if (SecondMoveInfo.IsTimeOut())
                     else if (SecondMoveInfo.IsTimeOut())
                     {
                     {
-                        MoveTimeOut(SecondMoveInfo, "等待移栽机构开始抓料超时");
+                        MoveTimeoutAlarm(SecondMoveInfo, "等待移栽机构开始抓料超时");
                     }
                     }
                 }
                 }
                 else if (SecondMoveInfo.IsTimeOut())
                 else if (SecondMoveInfo.IsTimeOut())
                 {
                 {
-                    MoveTimeOut(SecondMoveInfo, "等待移栽机构开始抓料超时");
+                    MoveTimeoutAlarm(SecondMoveInfo, "等待移栽机构开始抓料超时");
                 }
                 }
             }
             }
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
             else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_09_WaitProcessReel))
@@ -447,7 +447,7 @@ 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(216))
+                    else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.DeviceID.Equals(217))
                     {
                     {
                         //盘点料到NG箱
                         //盘点料到NG箱
                         LogInfo(" 盘点料->NG箱" + "" + inoup.ToStr());
                         LogInfo(" 盘点料->NG箱" + "" + inoup.ToStr());
@@ -672,7 +672,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))
                 {
                 {
-                    MoveTimeOut(MoveInfo, "等待给服务器发送 " + log + " 完成");
+                    MoveTimeoutAlarm(MoveInfo, "等待给服务器发送 " + log + " 完成");
                 }
                 }
             }
             }
             else
             else