bug修改

source/AssemblyLineClient/FrmHYEquip.cs

@@ -525,7 +525,7 @@ namespace OnlineStore.AssemblyLine
                 return;
                 return;
             }
             }
             LogUtil.info(equipBase.Name + "界面点击：" + HY_LineBackRun.Text);
             LogUtil.info(equipBase.Name + "界面点击：" + HY_LineBackRun.Text);
-            equipBean.LineStop();
+            equipBean.LineBackRun();
         }
         }
 
 
 
 

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -166,7 +166,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         protected void MoveTimeOut(LineMoveInfo move, string msg)
         protected void MoveTimeOut(LineMoveInfo move, string msg)
         { 
         { 
-            WarnMsg = move.Name + "[" + move.MoveStep + "] "+ msg + " [" + Math.Round(move.StepSpan().TotalSeconds, 1) + "]秒";
+            WarnMsg = move.Name + "[" + move.MoveStep + "] "+ msg + " [" +FormUtil.GetSpanStr( move.StepSpan()) + "]";
             int logId = DeviceID * 10000 + (int)move.MoveStep;
             int logId = DeviceID * 10000 + (int)move.MoveStep;
             LogUtil.error(WarnMsg, logId);
             LogUtil.error(WarnMsg, logId);
             Alarm(LineAlarmType.IoSingleTimeOut);
             Alarm(LineAlarmType.IoSingleTimeOut);
@@ -510,7 +510,7 @@ namespace OnlineStore.DeviceLibrary
                 else if (span.TotalSeconds > moveInfo.TimeOutSeconds)
                 else if (span.TotalSeconds > moveInfo.TimeOutSeconds)
                 {
                 {
                     WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg
                     WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg
-                      + "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
+                      + "超时[" + FormUtil.GetSpanStr(span)+"]";
                     int second = 10;
                     int second = 10;
                     if (IsLowAlarm(moveInfo))
                     if (IsLowAlarm(moveInfo))
                     {
                     {

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -891,7 +891,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (span.TotalSeconds > 120)
                 else if (span.TotalSeconds > 120)
                 {
                 {
-                    WarnMsg = Name + "[" + MoveInfo.MoveStep + "][" + msg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
+                    WarnMsg = Name + "[" + MoveInfo.MoveStep + "][" + msg + "]已等待[" + FormUtil.GetSpanStr(span ) + "]秒";
                     LogUtil.error(WarnMsg, 903);
                     LogUtil.error(WarnMsg, 903);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                 }
                 }
@@ -908,14 +908,7 @@ namespace OnlineStore.DeviceLibrary
             msg += "alarm：  " + alarmType + "\n";
             msg += "alarm：  " + alarmType + "\n";
             msg += "Move：" + MoveInfo.MoveType + "  " + MoveInfo.SLog + "\n";
             msg += "Move：" + MoveInfo.MoveType + "  " + MoveInfo.SLog + "\n";
             msg += "T3C1：" + T3C1_MoveInfo.MoveType + "  " + T3C1_MoveInfo.MoveStep + "\n";
             msg += "T3C1：" + T3C1_MoveInfo.MoveType + "  " + T3C1_MoveInfo.MoveStep + "\n";
-            //msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + "  " + SW41_MoveInfo.MoveStep + "\n";
-            //msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + "  " + SW23_MoveInfo.MoveStep + "\n";
-
-            ////msg += "分流1托盘： " + ShuntTrayNum + "  (" + ShuntWaitTrayNum + ")\n";
-            //msg += "分流1： " + Shunt_MoveInfo.MoveType + "  " + Shunt_MoveInfo.MoveStep +"  "+ ShuntTrayNum + " (" + ShuntWaitTrayNum + ")  " + "\n";
-            ////msg += "分流2托盘： " + Shunt2TrayNum + "  (" + Shunt2WaitTrayNum + ")\n";
-            //msg += "分流2： "  + Shunt2_MoveInfo.MoveType + "  " + Shunt2_MoveInfo.MoveStep + "  " + Shunt2TrayNum + "\n";
-
+        
             return msg;
             return msg;
         }
         }
 
 

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -176,7 +176,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else if (span.TotalSeconds > checkWaitInfo.TimeOutSeconds)
                 else if (span.TotalSeconds > checkWaitInfo.TimeOutSeconds)
                 {
                 {
-                    WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
+                    WarnMsg = checkWaitInfo.Name + "[" + checkWaitInfo.MoveStep + "][" + NotOkMsg + "]已等待[" + FormUtil.GetSpanStr(span) + "]秒";
                     LogUtil.error(WarnMsg, 900);
                     LogUtil.error(WarnMsg, 900);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                 }
                 }