1

DeviceLibrary/theMachine/BoxTransport.cs

@@ -197,26 +197,27 @@ namespace DeviceLibrary
                             MoveInfo.log($"{storeMoveType}:取完料后料叉机构料盘检测X30灭，去单料口");
                             MoveInfo.log($"{storeMoveType}:取完料后料叉机构料盘检测X30灭，去单料口");
                             MoveInfo.EndMove();
                             MoveInfo.EndMove();
                             ErrMsgTxt = "";
                             ErrMsgTxt = "";
+                            return false;
                         }
                         }
-                        else
-                            Msg.add(crc.GetString(L.out_store_not_detect_material, "取料后料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
+                        //else
+                        //    Msg.add(crc.GetString(L.out_store_not_detect_material, "取料后料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                         if (Common.IsOutStore(storeMoveType))
                         if (Common.IsOutStore(storeMoveType))
                         {
                         {
                             //出库异常，屏蔽库位
                             //出库异常，屏蔽库位
                             ServerCommunication.DisablePos(mainMachine.Name, From?.Reel?.WareCode, From?.Reel?.PosID, "出库时从库位取出料盘，料叉未检测到信号");
                             ServerCommunication.DisablePos(mainMachine.Name, From?.Reel?.WareCode, From?.Reel?.PosID, "出库时从库位取出料盘，料叉未检测到信号");
                         }
                         }
                     }
                     }
+
+
+                    Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
+                    IgnoreX09 = false;
+                    if (To.posid == BoxStorePosition.strings && ConfigHelper.Config.Get("Device_Use_Fixpos", false) && Fix != null)
+                        MoveInfo.NextMoveStep(MoveStep.StoreFIX01);
                     else
                     else
-                    {
-                        Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
-                        IgnoreX09 = false;
-                        if (To.posid == BoxStorePosition.strings && ConfigHelper.Config.Get("Device_Use_Fixpos", false) && Fix != null)
-                            MoveInfo.NextMoveStep(MoveStep.StoreFIX01);
-                        else
-                            MoveInfo.NextMoveStep(MoveStep.StoreTS10);
-                        MoveInfo.log($"{storeMoveType}:料叉取到料");
-                        InOutEndProcess(StoreMoveType.OutStore, From.posid);
-                    }
+                        MoveInfo.NextMoveStep(MoveStep.StoreTS10);
+                    MoveInfo.log($"{storeMoveType}:料叉取到料");
+                    InOutEndProcess(StoreMoveType.OutStore, From.posid);
+
                     break;
                     break;
 
 
                 #region 校准库位
                 #region 校准库位
@@ -452,8 +453,8 @@ namespace DeviceLibrary
                             MoveInfo.EndMove();
                             MoveInfo.EndMove();
                             ErrMsgTxt = "";
                             ErrMsgTxt = "";
                         }
                         }
-                        else
-                            Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上仍然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
+                        //else
+                        //    Msg.add(crc.GetString(L.in_store_detect_material, "放料后料叉X30上仍然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                     }
                     }
                     else
                     else
                     {
                     {