接驳台逻辑修改。

source/AssemblyLineClient/FrmLineStore.cs

@@ -609,7 +609,7 @@ namespace OnlineStore.AssemblyLine
             }
             }
         }
         }
 
 
-        private void SetItemColor(int i, LineRunStatus runStatus,LineAlarmType alarmType)
+        private void SetItemColor(int i, LineRunStatus runStatus, LineAlarmType alarmType)
         {
         {
             if (runStatus.Equals(LineRunStatus.Wait))
             if (runStatus.Equals(LineRunStatus.Wait))
             {
             {
@@ -632,7 +632,7 @@ namespace OnlineStore.AssemblyLine
             {
             {
                 SetItemColor(i, Color.LimeGreen);
                 SetItemColor(i, Color.LimeGreen);
             }
             }
-            if (runStatus.Equals(LineRunStatus.Runing))
+            else if (runStatus.Equals(LineRunStatus.Runing))
             {
             {
                 SetItemColor(i, Color.LightBlue);
                 SetItemColor(i, Color.LightBlue);
             }
             }

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -143,7 +143,8 @@ namespace OnlineStore.DeviceLibrary
                     SeparateStopRun(MoveInfo);
                     SeparateStopRun(MoveInfo);
 
 
                 }
                 }
-            }else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_10_StopSeparateLine))
+            }
+            else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_10_StopSeparateLine))
             {
             {
                 if (TrayProcessCanStartLine())
                 if (TrayProcessCanStartLine())
                 {
                 {
@@ -153,7 +154,8 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Location_Check3, IO_VALUE.HIGH));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Location_Check3, IO_VALUE.HIGH));
 
 
-                    Task.Factory.StartNew(delegate {
+                    Task.Factory.StartNew(delegate
+                    {
                         Thread.Sleep(1000);
                         Thread.Sleep(1000);
                         SeparateBackRun(null);
                         SeparateBackRun(null);
                     });
                     });
@@ -323,28 +325,35 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DON_07_SeparateCheck);
                 MoveInfo.NextMoveStep(LineMoveStep.DON_07_SeparateCheck);
                 //  Line3LastTrayP++;
                 //  Line3LastTrayP++;
-                LogUtil.info(hengyiName + MoveInfo.SLog + "送料，等待料盘到达接驳台，最多等待60000");
+                LogUtil.info(hengyiName + MoveInfo.SLog + "送料，等待料盘到达接驳台，最多等待65000");
                 MoveInfo.TimeOutSeconds = 40;
                 MoveInfo.TimeOutSeconds = 40;
                 MoveInfo.OneWaitCanEndStep = true;
                 MoveInfo.OneWaitCanEndStep = true;
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(60000));
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(65000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Check, IO_VALUE.HIGH));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Check, IO_VALUE.HIGH));
             }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_07_SeparateCheck))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_07_SeparateCheck))
             {
             {
+                TimeSpan span = DateTime.Now - MoveInfo.LastSetpTime;
                 MoveInfo.NextMoveStep(LineMoveStep.DON_08_CRun);
                 MoveInfo.NextMoveStep(LineMoveStep.DON_08_CRun);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
                 IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
                 IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
                 if (IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.HIGH))
                 if (IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.HIGH))
                 {
                 {
                     int robotIndex = GetRobotIndex();
                     int robotIndex = GetRobotIndex();
-                    LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台有料盘，等待2000，调用arriveRobotLocation=" + robotIndex+"["+StationInfo_Move.CodeStr+"]");
-
+                    LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台有料，调用arriveRobotLocation=" + robotIndex + "[" + StationInfo_Move.CodeStr + "]");
+                    SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr);
+                }
+                else if (span.TotalSeconds <= 60)
+                {
+                    int robotIndex = GetRobotIndex();
+                    LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台应有料"+FormUtil.GetSpanStr(span)+"，调用arriveRobotLocation=" + robotIndex + "[" + StationInfo_Move.CodeStr + "]");
                     SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr);
                     SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr);
                 }
                 }
                 else
                 else
                 {
                 {
-                    LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台无料盘，等待2000，");
+                    LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台无料");
                 }
                 }
+                MoveInfo.EndStepWait();
             }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_08_CRun))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_08_CRun))
             {
             {