等待finishenter超时关闭

DeviceLibrary/bean/job/SendShelfJob.cs

@@ -192,13 +192,19 @@ namespace DeviceLibrary
                     msg += runInfo;
                     curJobStep.Msg = msg;
                 }
-                else if (curJobStep.IsTimeOut(120000, out TimeSpan timeSpan))
+                else if (curJobStep.IsTimeOut(30000, out TimeSpan timeSpan))
                 {
-                    runInfo = string.Format("等待线体[{0}]进料完成信号[FinishEnter]超时", TargetPlace);
+                    RecordRunLog(agv, curJobStep.CurStep(), runInfo, TargetPlace);
+                    curJobStep.ToNextStep(EXECUTE_STEP.P6_TURN_DIRECTION);
+                    runInfo = "料架进入" + TargetPlace + "完成";
+                    agv.HasError = false;
                     msg += runInfo;
                     curJobStep.Msg = msg;
-                    agv.HasError = true;
-                    agv.SetErrorMsg($"等待线体[{TargetPlace}]进料完成信号[FinishEnter]超时", timeSpan.TotalMinutes.ToString("f2"));
+                    //runInfo = string.Format("等待线体[{0}]进料完成信号[FinishEnter]超时", TargetPlace);
+                    //msg += runInfo;
+                    //curJobStep.Msg = msg;
+                    //agv.HasError = true;
+                    //agv.SetErrorMsg($"等待线体[{TargetPlace}]进料完成信号[FinishEnter]超时", timeSpan.TotalMinutes.ToString("f2"));
                 }
 
                 if (CommonVar.CheckEnterOrLeaveFinished(agv, SettingString.Leave, CurTaskState))