关仓门时，检查折叠板是否有料，没料关门

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -13,7 +13,7 @@ namespace DeviceLibrary
 {
 {
     partial class ServerCommunication
     partial class ServerCommunication
     {
     {
-        volatile StoreStatus _storeStatus = StoreStatus.Debugging;
+        volatile StoreStatus _storeStatus = StoreStatus.None;
         public StoreStatus storeStatus
         public StoreStatus storeStatus
         {
         {
             get => _storeStatus;
             get => _storeStatus;
@@ -436,14 +436,14 @@ namespace DeviceLibrary
                 return map;
                 return map;
 
 
 
 
-            if (//RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH) &&
+            if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH) &&
                  (RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.StringOut_Released
                  (RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.StringOut_Released
                  || RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait))
                  || RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait))
             {
             {
                 //map.Add(ParamDefine.doorStatus, "料串门关闭");
                 //map.Add(ParamDefine.doorStatus, "料串门关闭");
                 map[ParamDefine.openLock] = ParamDefine.enable;
                 map[ParamDefine.openLock] = ParamDefine.enable;
             }
             }
-            //else// if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Open).Equals(IO_VALUE.HIGH))
+            else if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Open).Equals(IO_VALUE.HIGH))
             {
             {
                 map[ParamDefine.closeLock] = ParamDefine.enable;
                 map[ParamDefine.closeLock] = ParamDefine.enable;
                 //map.Add(ParamDefine.doorStatus, "料串门打开");
                 //map.Add(ParamDefine.doorStatus, "料串门打开");

DeviceLibrary/theMachine/MainMachine.cs

@@ -308,8 +308,8 @@ namespace DeviceLibrary
                     //ProcessMoveinfoEvent?.Invoke(MoveInfo.List);
                     //ProcessMoveinfoEvent?.Invoke(MoveInfo.List);
                     if (!UserPause)
                     if (!UserPause)
                         Msg.clear();
                         Msg.clear();
-                    else
-                        currnetstoreStatus = StoreStatus.Debugging;
+                    //else
+                    //    currnetstoreStatus = StoreStatus.Debugging;
 
 
                     if (currnetstoreStatus!=StoreStatus.None)
                     if (currnetstoreStatus!=StoreStatus.None)
                         ServerCM.storeStatus = currnetstoreStatus;
                         ServerCM.storeStatus = currnetstoreStatus;

DeviceLibrary/theMachine/MainMachine_ServerControl.cs

@@ -51,6 +51,18 @@ namespace DeviceLibrary
                 ClampMoveInfo.NewMove(MoveStep.SingleInRun);
                 ClampMoveInfo.NewMove(MoveStep.SingleInRun);
                 return crc.GetString(L.close_singledoor, "关闭单料门");
                 return crc.GetString(L.close_singledoor, "关闭单料门");
             }
             }
+            else
+            {
+                if(NGDoor_Tray_Test_Reel)
+                {
+                    RobotManage.UserPause(crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘"));
+                    return crc.GetString("please_take_ngdoor_reel", "等待取走单口料盘");
+                }
+                else
+                {
+                    RobotManage.UserPause("",false);
+                }
+            }
             LogUtil.info($"取料机构当前没有在等待单盘入库:{ClampMoveInfo.MoveStep}");
             LogUtil.info($"取料机构当前没有在等待单盘入库:{ClampMoveInfo.MoveStep}");
             return crc.GetString(L.not_in_single_prosses, "当前没有在等待单盘入库:")+ClampMoveInfo.MoveStep;
             return crc.GetString(L.not_in_single_prosses, "当前没有在等待单盘入库:")+ClampMoveInfo.MoveStep;
         }
         }