1

DeviceLibrary/theMachine/MainMachine _AutoInOutTest.cs

@@ -96,8 +96,9 @@ namespace DeviceLibrary
                         AIOTMoveInfo.log($"第一盘料盘已到达目的地");
                         if (CurrentPosIndex-1 < 0 || StopAutoInOut)
                         {
-                            AIOTMoveInfo.log($"已达到最后一个库位{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
+                            AIOTMoveInfo.log($"已达到最后一个库位:{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
                             AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut10);
+                            CloseFlipDoor(AIOTMoveInfo);
                             return;
                         }
                         AIOTMoveInfo.log($"开始转运料盘第二盘");
@@ -130,8 +131,9 @@ namespace DeviceLibrary
                         AIOTMoveInfo.log($"第二盘料盘已到达目的地");
                         if (CurrentPosIndex - 1 < 0 || StopAutoInOut)
                         {
-                            AIOTMoveInfo.log($"已达到最后一个库位{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
+                            AIOTMoveInfo.log($"已达到最后一个库位:{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
                             AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut10);
+                            CloseFlipDoor(AIOTMoveInfo);
                             return;
                         }
                         
@@ -154,8 +156,10 @@ namespace DeviceLibrary
                         var ac1 = poslist[CurrentPosIndex];
                         if (CurrentPosIndex - 2 < 0 || StopAutoInOut)
                         {
-                            AIOTMoveInfo.log($"已达到最后一个库位{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
+                            AIOTMoveInfo.log($"A已达到最后一个库位:{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
                             AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut10);
+                            CurrentPosIndex++;
+                            CloseFlipDoor(AIOTMoveInfo);
                             return;
                         }
                         var ac2 = poslist[CurrentPosIndex - 2];
@@ -176,7 +180,7 @@ namespace DeviceLibrary
                         AIOTMoveInfo.log($"料盘已到达目的地");                        
                         if (CurrentPosIndex-1 < 0 || StopAutoInOut)
                         {
-                            AIOTMoveInfo.log($"已达到最后一个库位{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
+                            AIOTMoveInfo.log($"B已达到最后一个库位:{CurrentPosIndex},或手动停止{StopAutoInOut},自动出入库停止,将料盘送至出口");
                             AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut10);
                             CloseFlipDoor(AIOTMoveInfo);
                             return;
@@ -210,7 +214,18 @@ namespace DeviceLibrary
                     }
                     break;
                 case MoveStep.StoreOut12:
-                    AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut13);
+                    if (ClampMoveInfo.MoveStep == MoveStep.Wait)
+                    {
+                        AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut13);
+                        AIOTMoveInfo.log($"NG口已空闲");
+                        CloseFlipDoor(AIOTMoveInfo);
+                    }
+                    else {
+                        AIOTMoveInfo.log($"等待NG口空闲");
+                    }
+                    break;
+                case MoveStep.StoreOut13:
+                    AIOTMoveInfo.NextMoveStep(MoveStep.StoreOut14);
                     ac = poslist[CurrentPosIndex-1];
                     reel = new ReelParam("auto", ac.BagWidth, ac.BagHigh);
                     if (!boxTransport.Start(new BoxStorePosition(Config, ac, reel), new BoxStorePosition(Config, StoreSide.NGDoor, reel), StoreMoveType.OutStore))
@@ -219,10 +234,10 @@ namespace DeviceLibrary
                         AutoInOutTest = false;
                         StopAutoInOut = true;
                         return;
-                    }
+                    }                    
                     AIOTMoveInfo.log($"开始转运料盘");
                     break;
-                case MoveStep.StoreOut13:
+                case MoveStep.StoreOut14:
                     if (boxTransport.IsComplateOrFree)
                     {
                         NGPuted("");

DeviceLibrary/theMachine/MainMachine _LedProcess.cs

@@ -29,50 +29,61 @@ namespace DeviceLibrary
             StandbyLed.LedState = LedState.off;
             AlarmLed.LedState = LedState.off;
             RunningLed.LedState = LedState.off;
-            //无法运行,量报警灯
-
-            if (runStatus != RunStatus.Stop)
+            //回原 绿闪
+            if (runStatus == RunStatus.HomeReset)
             {
+                RunningLed.LedState = LedState.blink;
+            }
+            //正常 绿亮
+            else if (runStatus == RunStatus.Running)
+            {
+                RunningLed.LedState = LedState.on;
+
+                //出入库 绿闪 黄闪
+                if (ClampMoveInfo.MoveStep > MoveStep.Wait
+                || StoreMoveInfo.MoveStep > MoveStep.Wait
+                || (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut))
+                {
+                    RunningLed.LedState = LedState.blink;
+                    StandbyLed.LedState = LedState.blink;
+                }
+                //温度超限 绿亮 黄闪
                 if (IsTHoutRange())
                 {
                     RunningLed.LedState = LedState.on;
                     StandbyLed.LedState = LedState.blink;
                 }
+                //温度超限30分钟 绿亮 黄闪 红闪
                 if (IsTHoutRangeOver30m())
                 {
                     RunningLed.LedState = LedState.on;
                     StandbyLed.LedState = LedState.blink;
                     AlarmLed.LedState = LedState.blink;
                 }
+                //系统暂停,说明书未定义, 绿闪, 黄闪
+                if (!canRunning || UserPause)
+                {
+                    RunningLed.LedState = LedState.blink;
+                    AlarmLed.LedState = LedState.blink;
+                }
             }
-
-
-            if (runStatus == RunStatus.HomeReset)
+            else if (runStatus == RunStatus.Stop)
             {
-                RunningLed.LedState = LedState.blink;
+                //系统停止时有报警, 红亮
+                if (hasAlarm)
+                {
+                    RunningLed.LedState = LedState.off;
+                    StandbyLed.LedState = LedState.off;
+                    AlarmLed.LedState = LedState.on;
+                }
             }
-            else if (runStatus == RunStatus.Running)
+            //系统运行时报警, 绿亮,红闪
+            if (runStatus != RunStatus.Stop && hasAlarm)
             {
                 RunningLed.LedState = LedState.on;
+                StandbyLed.LedState = LedState.off;
+                AlarmLed.LedState = LedState.blink;
             }
-            else if (runStatus == RunStatus.Stop && !hasAlarm)
-            {
-                if (!canRunning)
-                    RunningLed.LedState = LedState.blink;
-                if (UserPause)
-                    RunningLed.LedState = LedState.blink;
-            }
-
-            if (hasAlarm)
-                AlarmLed.LedState = LedState.on;
-
-            if (ClampMoveInfo.MoveStep > MoveStep.Wait
-                || StoreMoveInfo.MoveStep > MoveStep.Wait
-                || (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut)) {
-                RunningLed.LedState = LedState.blink;
-                StandbyLed.LedState = LedState.blink;
-            }
-
             Led.LedGroup.ForEach((x) => { x.run(); });
         }
     }