AOI和尺寸同步验证

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -262,31 +262,66 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     ClearTimeoutAlarm("获取料盘高度完成超时");
                     ClearTimeoutAlarm("获取料盘高度完成超时");
                     int Height = moveBean.LastHeight;
                     int Height = moveBean.LastHeight;
-                    int width = 7;
+                    int width = 0;
                     if (IOValue(IO_Type.Feeding_Reel_13_Check).Equals(IO_VALUE.HIGH))
                     if (IOValue(IO_Type.Feeding_Reel_13_Check).Equals(IO_VALUE.HIGH))
                     {
                     {
                         width = 13;
                         width = 13;
                     }
                     }
-                    if (ConfigHelper.Config.Get("IPCamera_EnableAOI", false))
+                    else if (IOValue(IO_Type.Feeding_Reel_7_Check).Equals(IO_VALUE.HIGH))
                     {
                     {
-                        var check13 = moveBean.CameraCheck(MoveInfo.Name, out string err);
-                        if (check13)
+                        width = 7;
+                    }
+                    MoveLog($"入库取料{shelf}{MoveInfo.SLog}:信号检测宽度:{width}");
+                    var getReel = CheckClampHasReel();
+                    if (!getReel)
+                    {
+                        MoveInfo.MoveParam.PosInfo.IsNG = true;
+                        MoveInfo.MoveParam.PosInfo.NgMsg = "未抓到料盘";
+                        MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  未抓到料盘");
+                    }
+                    else //抓到料盘
+                    {
+                        var checkSizeOk = true;
+                        if (ConfigHelper.Config.Get("IPCamera_EnableAOI", false))
                         {
                         {
-                            width = 13;
-                            MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 检测到有料，认为13寸：{err}");
+                            var check13 = moveBean.CameraCheck(MoveInfo.Name, out string err);
+                            if (check13)
+                            {
+                                if (width != 13)
+                                {
+                                    checkSizeOk = false;
+                                }
+                                MoveLog($"入库取料{shelf}{MoveInfo.SLog}: AOI检测到有料，认为13寸：{err}");
+                            }
+                            else
+                            {
+                                if (width != 7)
+                                {
+                                    checkSizeOk = false;
+                                }
+                                MoveLog($"入库取料{shelf}{MoveInfo.SLog}: AOI检测到无料，认为7寸：{err}");
+                            }
+                        }
+                        if (checkSizeOk)
+                        {
+                            MoveInfo.MoveParam.PosInfo.PlateH = Height;
+                            MoveInfo.MoveParam.PosInfo.PlateTotalH = moveBean.LastTotalHeight;
+                            MoveInfo.MoveParam.PosInfo.PlateW = width;
+                            MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  料盘尺寸{width}X{Height}");
                         }
                         }
                         else
                         else
                         {
                         {
-                            width = 7;
-                            MoveLog($"入库取料{shelf}{MoveInfo.SLog}: 检测到无料，认为7寸：{err}");
+                            MoveInfo.MoveParam.PosInfo.IsNG = true;
+                            MoveInfo.MoveParam.PosInfo.NgMsg = "信号检测尺寸和AOI不符";
+                            MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  信号检测尺寸和AOI不符");
                         }
                         }
                     }
                     }
-                    MoveInfo.MoveParam.PosInfo.PlateH = Height;
-                    MoveInfo.MoveParam.PosInfo.PlateTotalH = moveBean.LastTotalHeight;
-                    MoveInfo.MoveParam.PosInfo.PlateW = width;
-
-                    MoveLog($"入库取料{shelf}{MoveInfo.SLog}:  料盘尺寸{width}X{Height}");
-                    II13_GetPosId();
+                    if (MoveInfo.MoveParam.PosInfo.IsNG)
+                    {
+                        StrartToTargetP();
+                    }
+                    else
+                        II13_GetPosId();
                 }
                 }
                 else if (MoveInfo.IsTimeOut(60))
                 else if (MoveInfo.IsTimeOut(60))
                 {
                 {
@@ -747,7 +782,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
 
 
                         //从服务器获取库位号
                         //从服务器获取库位号
-                        GetPosResult result = SServerManager.GetPosId(Name, codeList, pos.PlateH, pos.PlateW, pos.rfid, lastPosId,pos.PlateTotalH);
+                        GetPosResult result = SServerManager.GetPosId(Name, codeList, pos.PlateH, pos.PlateW, pos.rfid, lastPosId, pos.PlateTotalH);
                         LastResult = result.Result;
                         LastResult = result.Result;
                         if (result.IsTimeOut)
                         if (result.IsTimeOut)
                         {
                         {