修改：皮带线信号超时时还可以送料

source/AssemblyLineClient/FrmProvidingEquip.cs

@@ -259,14 +259,17 @@ namespace OnlineStore.AssemblyLine
 
 
         private void btnStart_Click(object sender, EventArgs e)
         private void btnStart_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(equipBean.Name + "点击：启动调试");
             StartDebug();
             StartDebug();
         } 
         } 
         private void btnStop_Click(object sender, EventArgs e)
         private void btnStop_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(equipBean.Name + "点击：停止");
             StopRun();
             StopRun();
         } 
         } 
         private void btnReset_Click(object sender, EventArgs e)
         private void btnReset_Click(object sender, EventArgs e)
         {
         {
+            LogUtil.info(equipBean.Name + "点击：复位");
             Reset();
             Reset();
         }
         }
         private void chbDebug_CheckedChanged(object sender, EventArgs e)
         private void chbDebug_CheckedChanged(object sender, EventArgs e)

source/DeviceLibrary/assemblyLine/DischargeLine.cs

@@ -375,7 +375,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         internal bool Line3TurnIsStop()
         internal bool Line3TurnIsStop()
         {
         {
-            if (Line3Turn.InTurn.Equals(false) && NoAlarm())
+            if (Line3Turn.InTurn.Equals(false) && NoErrorAlarm())
             {
             {
                 if (IOValue(IO_Type.DLine_Run3).Equals(IO_VALUE.LOW))
                 if (IOValue(IO_Type.DLine_Run3).Equals(IO_VALUE.LOW))
                 {
                 {

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         internal bool CanStartOut(int lineNum)
         internal bool CanStartOut(int lineNum)
         {
         {
-            if (NoAlarm() || runStatus > LineRunStatus.HomeMoving)
+            if (NoErrorAlarm() || runStatus > LineRunStatus.HomeMoving)
             {
             {
                 if (lineNum.Equals(1) && TrayLine1.MoveInfo.MoveType.Equals(LineMoveType.None))
                 if (lineNum.Equals(1) && TrayLine1.MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                 {