上料机构托盘是否有料检测修改。

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -296,22 +296,46 @@ namespace OnlineStore.DeviceLibrary
                 {
                     if (LineManager.useTrayCheck.Contains(DeviceID))
                     {
+                        bool isfull = TrayManager.GetTrayInfo(currTrayNum).IsFull;
                         if (Config.SidesWayNum <= 0)
                         {
-                            if (CylinderIsOk(IO_Type.FL_TopCylinder_Down, IO_Type.FL_TopCylinder_Up) && IOValue(IO_Type.FL_TrayCheck).Equals(IO_VALUE.HIGH))
+                            if (CylinderIsOk(IO_Type.FL_TopCylinder_Down, IO_Type.FL_TopCylinder_Up))
+                            {
+                                if ((!isfull) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.HIGH))
+                                {
+                                    ConfigIO io = Config.getWaitIO(IO_Type.ReelCheck);
+                                    if (io != null)
+                                    {
+                                        LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck));
+                                    }
+                                    LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开");
+                                    TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮");
+                                    TrayMoveOk();
+                                    return;
+                                }
+                            }
+                        }
+                        else if (CylinderIsOk(IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.HIGH))
+                        {
+                            if ((!isfull) && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.HIGH))
                             {
                                 LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开");
                                 TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮");
                                 TrayMoveOk();
                                 return;
                             }
-                        }
-                        else if (CylinderIsOk(IO_Type.SW_TopCylinder_Down, IO_Type.SW_TopCylinder_Up) && IOValue(IO_Type.SW_TrayCheck).Equals(IO_VALUE.HIGH))
-                        {
-                            LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 入库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘，暂时放托盘离开");
-                            TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮");
-                            TrayMoveOk();
-                            return;
+                            else if (isfull && IOValue(IO_Type.ReelCheck).Equals(IO_VALUE.LOW))
+                            {
+                                ConfigIO io = Config.getWaitIO(IO_Type.ReelCheck);
+                                if (io != null)
+                                {
+                                    LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.ReelCheck));
+                                }
+                                LogInfo(SecondMoveInfo.MoveNum + SecondMoveInfo.SLog + " 需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘，暂时放托盘离开");
+                                TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮");
+                                TrayMoveOk();
+                                return;
+                            }
                         }
                     }
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MO_11_CodeRember);
@@ -1716,7 +1740,7 @@ namespace OnlineStore.DeviceLibrary
                             MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_CylinderGive))
                         //if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray) && MoveInfo.IsInWait.Equals(false))
                         {
-                             
+
                             if (!MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray))
                             {
                                 //如果报警直接离开

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -383,7 +383,11 @@ namespace OnlineStore.DeviceLibrary
                           LineManager.useTrayCheck.Contains(DeviceID) &&
                           IOValue(IO_Type.TrayCheck).Equals(IO_VALUE.LOW))
                 {
-
+                    ConfigIO io = Config.getWaitIO(IO_Type.TrayCheck); 
+                    if(io!=null)
+                    {
+                        LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck));
+                    }
                     LogUtil.error(Name + "入库 [" + posId + "]，托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，升降轴上升，禁用托盘，同时放行托盘");
                     LogInfo("入库 [" + posId + "]" + MoveInfo.SLog + ":  升降轴上升，禁用托盘，同时放行托盘，顶升气缸1下降");
                     TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮");
@@ -641,6 +645,11 @@ namespace OnlineStore.DeviceLibrary
                         LineManager.useTrayCheck.Contains(DeviceID) &&
                         IOValue(IO_Type.TrayCheck).Equals(IO_VALUE.HIGH))
                     {
+                        ConfigIO io = Config.getWaitIO(IO_Type.TrayCheck);
+                        if (io != null)
+                        {
+                            LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck));
+                        }
                         LogInfo(" 出库中，需拦截空托盘【 " + currTrayNum + "】，空托盘料盘检测信号亮，禁用托盘");
                         TrayDisableManager.AddDisable(currTrayNum, Name, "空托盘料盘检测信号亮");
                     }
@@ -719,6 +728,11 @@ namespace OnlineStore.DeviceLibrary
                             LineManager.useTrayCheck.Contains(DeviceID) &&
                             IOValue(IO_Type.TrayCheck).Equals(IO_VALUE.LOW))
                         {
+                            ConfigIO io = Config.getWaitIO(IO_Type.TrayCheck);
+                            if (io != null)
+                            {
+                                LogInfo("当前托盘上的料盘检测信号[" + io.ConfigStr + "]的值：" + IOValue(IO_Type.TrayCheck));
+                            }
                             LogInfo(" 入库需拦截有料托盘【 " + currTrayNum + "】，有料托盘料盘检测信号不亮，禁用托盘");
                             TrayDisableManager.AddDisable(currTrayNum, Name, "有料托盘料盘检测信号不亮");
                             return false;