chengsc
2025-03-10 d7fe0f4c66b134fca43bca44b1161c0e4aa28bcb
Wms/WMS.BLL/Logic/AllotLocation.cs
@@ -377,21 +377,25 @@
                            locate = GetLocateByRoadway(l.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                            if (locate != null)
                            {
                                list.Add(locate.LocatNo);
                                var isOk = LocateIsOk(locate);
                                if (!isOk)
                                {
                                    locate = null;
                                }
                                if (isOk)
                                {
                                    break;
                                }
                                break;
                                //list.Add(locate.LocatNo);
                                //var isOk = LocateIsOk(locate);
                                //if (!isOk)
                                //{
                                //    locate = null;
                                //}
                                //if (isOk)
                                //{
                                //    break;
                                //}
                            }
                        } while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时,再次循环巷道、区域查找储位
                        if (locate!=null)
                        {
                            break;
                        }
                    }
                    //如果跳巷道并且未找到合适空储位,则跳到最后一次使用的巷道查询
                    if (!isRoadway)
@@ -407,12 +411,13 @@
                                    locate = GetLocateByRoadway(log.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                                    if (locate != null)
                                    {
                                        list.Add(locate.LocatNo);
                                        var isOk = LocateIsOk(locate);
                                        if (!isOk)
                                        {
                                            locate = null;
                                        }
                                        break;
                                        //list.Add(locate.LocatNo);
                                        //var isOk = LocateIsOk(locate);
                                        //if (!isOk)
                                        //{
                                        //    locate = null;
                                        //}
                                    }
                                    
                                    
@@ -434,21 +439,25 @@
                            locate = GetLocateByRoadway(item.RoadwayNo, topOrBom, leftOrRight, areaList, list, ref count);
                            if (locate != null)
                            {
                                list.Add(locate.LocatNo);
                                var isOk = LocateIsOk(locate);
                                if (!isOk)
                                {
                                    locate = null;
                                }
                                if (isOk)
                                {
                                    break;
                                }
                                break;
                                //list.Add(locate.LocatNo);
                                //var isOk = LocateIsOk(locate);
                                //if (!isOk)
                                //{
                                //    locate = null;
                                //}
                                //if (isOk)
                                //{
                                //    break;
                                //}
                            }
                        } while (count != 0 && locate == null);//当查询储位数量不等0 并且储位为空时,再次循环巷道、区域查找储位
                        if (locate != null)
                        {
                            break;
                        }
                    }
                }
@@ -515,7 +524,7 @@
        }
        /// <summary>
        /// 验证储位是否可入库
        /// 验证储位是否可入库 双深位验证
        /// </summary>
        /// <param name="locate"></param>
        /// <returns></returns>