1

source/Common/util/AcSerialBean.cs

@@ -288,7 +288,7 @@ namespace OnlineStore.Common
             if (_serialPort.IsOpen)
             if (_serialPort.IsOpen)
             {
             {
                 //lock (lockObj)
                 //lock (lockObj)
-                if(Monitor.TryEnter(lockObj,Overtime))
+                if(Monitor.TryEnter(lockObj,Overtime+50))
                 {
                 {
                     //Monitor.Enter(lockObj);
                     //Monitor.Enter(lockObj);
                     try
                     try
@@ -358,7 +358,7 @@ namespace OnlineStore.Common
             if (_serialPort.IsOpen)
             if (_serialPort.IsOpen)
             {
             {
 
 
-                if (Monitor.TryEnter(lockObj, Overtime))
+                if (Monitor.TryEnter(lockObj, Overtime + 50))
                 {
                 {
                     //Monitor.Enter(lockObj);
                     //Monitor.Enter(lockObj);
                     try
                     try

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -436,7 +436,7 @@ namespace OnlineStore.DeviceLibrary
                                     CheckAlarmProcess(moveInfo, LineAlarmType.IoSingleTimeOut);
                                     CheckAlarmProcess(moveInfo, LineAlarmType.IoSingleTimeOut);
                                 }
                                 }
                             }
                             }
-                            else if (rwSpan.TotalSeconds > 8 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
+                            else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 8 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
                             {
                             {
                                 preRWTime = DateTime.Now;
                                 preRWTime = DateTime.Now;
                                 string msg = moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] " + NotOkMsg + "已等待 " + Math.Round(span.TotalSeconds, 1) + "秒，重写DO：";
                                 string msg = moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] " + NotOkMsg + "已等待 " + Math.Round(span.TotalSeconds, 1) + "秒，重写DO：";

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -917,7 +917,7 @@ namespace OnlineStore.DeviceLibrary
                             LogUtil.error(Name + " " + moveEquip.Name + "在复位过程中报警，需要重新复位，调用 moveEquip.Reset();");
                             LogUtil.error(Name + " " + moveEquip.Name + "在复位过程中报警，需要重新复位，调用 moveEquip.Reset();");
                             moveEquip.Reset();
                             moveEquip.Reset();
                             //如果小于80秒，继续等待
                             //如果小于80秒，继续等待
-                            if (span.TotalSeconds < 70)
+                            if (span.TotalSeconds < 80)
                             {
                             {
                                 isOk = false;
                                 isOk = false;
                                 break;
                                 break;