测试ok

DeviceLibrary/theMachine/MainMachine_Store.cs

@@ -4,6 +4,7 @@ using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
 using System.Drawing;
 using System.Drawing;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
@@ -204,12 +205,19 @@ namespace DeviceLibrary
                 case MoveStep.StoreInNG_03:
                 case MoveStep.StoreInNG_03:
                     StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_04);
                     StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_04);
                     StoreMoveInfo.MoveParam.IsNg = true;
                     StoreMoveInfo.MoveParam.IsNg = true;
-                   BoxStorePosition tar = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam);
+                    BoxStorePosition tar = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam);
                     boxTransport.Start(null, tar, StoreMoveType.InStore);
                     boxTransport.Start(null, tar, StoreMoveType.InStore);
                     StoreMoveInfo.log($"开始转运料盘到单料口");
                     StoreMoveInfo.log($"开始转运料盘到单料口");
                     break;
                     break;
                 case MoveStep.StoreInNG_04:
                 case MoveStep.StoreInNG_04:
-                    if (boxTransport.IsPutOnOut)
+                    if (boxTransport.IsNGReel)//放完料料叉信号还亮
+                    {
+                        StoreMoveInfo.log($"料盘已到达单料口");
+                        NGPuted(crc.GetString(L.instore_abnormal_reel, "入库过程中料叉检测料盘异常"));
+                        StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_05);
+                        StoreMoveInfo.log($"放完料料叉信号还亮，重新到单料口");
+                    }
+                    else if (boxTransport.IsPutOnOut)
                     {
                     {
                         StoreMoveInfo.log($"料盘已到达单料口");
                         StoreMoveInfo.log($"料盘已到达单料口");
                         NGPuted(crc.GetString(L.instore_abnormal_reel, "入库过程中料叉检测料盘异常"));
                         NGPuted(crc.GetString(L.instore_abnormal_reel, "入库过程中料叉检测料盘异常"));
@@ -217,6 +225,14 @@ namespace DeviceLibrary
                     }
                     }
                     break;
                     break;
                 case MoveStep.StoreInNG_05:
                 case MoveStep.StoreInNG_05:
+                    if (ClampMoveInfo.MoveStep == MoveStep.Wait)
+                    {
+                        StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02);
+                        CloseFlipDoor(StoreMoveInfo);
+                        CodeManager.TestHasRight = true;
+                        boxTransport.IsNGReel = false;
+                        StoreMoveInfo.log($"单料口空闲，放完料料叉信号还亮，重新到单料口");
+                    }
 
 
                     break;
                     break;
                 case MoveStep.StoreOut_NGPre:
                 case MoveStep.StoreOut_NGPre: