入库ng不上报完成状态

DeviceLibrary/theMachine/BoxTransport.cs

@@ -452,7 +452,7 @@ namespace DeviceLibrary
                     break;
                 case MoveStep.StoreTS14:
                     MoveInfo.NextMoveStep(MoveStep.StoreTS15);
-                    if (Common.IsInstore(storeMoveType))
+                    if (Common.IsInstore(storeMoveType) && !(mainMachine?.StoreMoveInfo?.MoveParam.IsNg ?? false))
                     {
                         if (!mainMachine.ServerCM.SendStoreState(mainMachine?.StoreMoveInfo?.MoveParam?.PosID, StoreStatus.InStoreEnd))
                         {

DeviceLibrary/theMachine/MainMachine_Store.cs

@@ -180,10 +180,9 @@ namespace DeviceLibrary
                     }
                     else if (h1.Value)
                     {
-                        StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_03);
-                        StoreMoveInfo.log($"单料口有料盘，系统暂停");
-                        Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.alarm);
-                        RobotManage.UserPause(crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘"));
+                        StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02_1);
+                        StoreMoveInfo.log($"单料口有料盘，打开门");
+                        SingleDoor.ToHigh(StoreMoveInfo);
                     }
                     else
                     {
@@ -192,8 +191,19 @@ namespace DeviceLibrary
                     }
 
                     break;
+                case MoveStep.StoreInNG_02_1:
+                    StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_02_2);
+                    Msg.add(crc.GetString(L.please_take_ngdoor_reel, "等待取走单料口料盘"), MsgLevel.alarm);
+                    RobotManage.UserPause(crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘"));
+                    break;
+                case MoveStep.StoreInNG_02_2:
+                    StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_03);
+                    SingleDoor.ToLow(StoreMoveInfo);
+                    StoreMoveInfo.log($"确认完毕，关门");
+                    break;
                 case MoveStep.StoreInNG_03:
                     StoreMoveInfo.NextMoveStep(MoveStep.StoreInNG_04);
+                    StoreMoveInfo.MoveParam.IsNg = true;
                    BoxStorePosition tar = new BoxStorePosition(Config, StoreSide.NGDoor, StoreMoveInfo.MoveParam);
                     boxTransport.Start(null, tar, StoreMoveType.InStore);
                     StoreMoveInfo.log($"开始转运料盘到单料口");

DeviceLibrary/theMachine/MoveStep.cs

@@ -118,6 +118,8 @@ namespace DeviceLibrary
 
         StoreInNG_01,
         StoreInNG_02,
+        StoreInNG_02_1,
+        StoreInNG_02_2,
         StoreInNG_03,
         StoreInNG_04,
         StoreInNG_05,