1

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -898,20 +898,22 @@ namespace OnlineStore.DeviceLibrary
             if (!MoveInfo.IsInWait)
             {
                 bool isOk = true;
+                string msg = "";
                 //判断是否所有的已经返回完成
-
+                TimeSpan span = DateTime.Now - MoveInfo.LastSetpTime;
                 foreach (EquipBase moveEquip in this.AllEquipMap.Values)
                 {
                     if (moveEquip.IsDebug)
                     {
-                        TimeSpan span = DateTime.Now - MoveInfo.LastSetpTime;
+                        
                         if (!moveEquip.OpenStopCylinderOk(span))
                         {
-                            if(span.TotalSeconds> LineManager.Config.IOSingle_TimerOut)
+                            if (span.TotalSeconds > LineManager.Config.IOSingle_TimerOut)
                             {
                                 SetWarnMsg(moveEquip.Name + "下降阻挡气缸超时，已等待" + FormUtil.GetSpanStr(span));
-                                LogUtil.error( moveEquip.Name + "下降阻挡气缸超时，已等待" + FormUtil.GetSpanStr(span),112);
+                                LogUtil.error(moveEquip.Name + "下降阻挡气缸超时，已等待" + FormUtil.GetSpanStr(span), 112);
                             }
+                            msg = moveEquip.Name + "下降阻挡气缸";
                             isOk = false;
                             break;
                         }
@@ -925,6 +927,7 @@ namespace OnlineStore.DeviceLibrary
                             {
                                 continue;
                             }
+                            msg = moveEquip.Name + "复位结束";
                             isOk = false;
                             break;
                         }
@@ -950,6 +953,12 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.EndMove();
                     LogUtil.info(Name + "所有移栽模块复位完成，打开流水线，开始运转！");
                 }
+                else if (span.TotalSeconds > 180)
+                {
+                    WarnMsg = Name + "[" + MoveInfo.MoveStep + "][" + msg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
+                    LogUtil.error(WarnMsg, 100);
+                    Alarm(LineAlarmType.IoSingleTimeOut);
+                }
             }
         } 
         public string GetMoveStr()

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -394,11 +394,7 @@ namespace OnlineStore.DeviceLibrary
             //只有当BOX可以进行出出料时，移栽物品，防止卡住
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.PO_02_UpDownCylinderDownWait))
             {
-                int lineId = 1;
-                if (DeviceID > 102)
-                {
-                    lineId = 2;
-                }
+                int lineId = DeviceID % 100;  
                 MoveInfo.NextMoveStep(LineMoveStep.PO_03_ClampCylinderSlack);
                 OutLog("出库 " + MoveInfo.SLog + " : 夹料气缸夹紧，更新料盘位置【"+ MoveInfo.MoveParam.WareCode + "】【INBELT】【"+ lineId + "】");
                 CylinderMove(MoveInfo, IO_Type.ClampCylinder_Tighten, IO_Type.ClampCylinder_Slack);