'手动上传'

Admin

2026-01-21 00e64cba66377cb75c9c947908627fe9f631746e

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs

@@ -163,7 +163,7 @@
        public string AccessingTunnel(int WarehouseId, int LocationType)
        {
            List<Dt_LocationInfo> locationData = BaseDal.QueryData(x => x.WarehouseId == WarehouseId);
            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.EnableStatus== (int)EnableEnum.Enable).GroupBy(x => x.RoadwayNo)
            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
            .Select(g => new
            {
                RoadwayNo = g.Key,
@@ -176,22 +176,21 @@
                if (LocationType == 2) minRequired = 6;

                var selectedRoadway = roadwayGroups.FirstOrDefault(g => g.LocationCount >= minRequired);
                return selectedRoadway.RoadwayNo;
            }
            else
            {
                var selectedRoadway = roadwayGroups.FirstOrDefault(g => g.LocationCount >= minRequired);
                if(selectedRoadway != null)
                {
                    return selectedRoadway.RoadwayNo;
                if(selectedRoadway!=null) return selectedRoadway.RoadwayNo;

                }
                else
                {
                var selectedRoadway = roadwayGroups.FirstOrDefault(g => g.LocationCount >= minRequired);
                if(selectedRoadway == null)
                {
                    selectedRoadway = roadwayGroups.FirstOrDefault(g => g.RoadwayNo =="5" && g.LocationCount != 0);

                }
                return selectedRoadway.RoadwayNo;
                if(selectedRoadway != null) return selectedRoadway.RoadwayNo;
            }

            return "0";
        }


@@ -227,7 +226,8 @@
                    if (emptyLocations[i].Depth == 1)//判断是否1深货位
                    {
                        //查询深库位
                        int emprow = emptyLocations[i].Row == 2 ? 1 : 4;
                        //int emprow = emptyLocations[i].Row == 2 ? 1 : 4;
                        int emprow = judgmentRow(emptyLocations[i].RoadwayNo,emptyLocations[i].Row);

                        Dt_LocationInfo? sencondDepthLocationShen = emptyLocations.FirstOrDefault(x => x.Row == emprow && x.Layer == emptyLocations[i].Layer && x.Column == emptyLocations[i].Column);
                        if (sencondDepthLocationShen != null && sencondDepthLocationShen.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -242,13 +242,18 @@
                            {
                                locationCaches.Add(new LocationCache { DateTime = DateTime.Now, LocationCode = emptyLocations[i].LocationCode });
                                return emptyLocations[i];
                            }else if (emptyLocations[i].RoadwayNo=="5" && emptyLocations[i].LocationStatus == LocationStatusEnum.Free.ObjToInt())
                            {
                                locationCaches.Add(new LocationCache { DateTime = DateTime.Now, LocationCode = emptyLocations[i].LocationCode });
                                return emptyLocations[i];
                            }
                        }
                    }
                    else
                    {
                        //查询2深货位对应的1深货位是否为空
                        int emprow = emptyLocations[i].Row == 4 ? 3 : 2;
                        //int emprow = emptyLocations[i].Row == 4 ? 3 : 2;
                        int emprow = judgmentRow(emptyLocations[i].RoadwayNo, emptyLocations[i].Row);

                        Dt_LocationInfo? sencondDepthLocationQian = emptyLocations.FirstOrDefault(x => x.Row == emprow && x.Layer == emptyLocations[i].Layer && x.Column == emptyLocations[i].Column);
                        if (sencondDepthLocationQian != null && sencondDepthLocationQian.LocationStatus == LocationStatusEnum.Free.ObjToInt())
@@ -262,6 +267,38 @@
            }
        }

        private int judgmentRow(string RoadwayNo, int locrow)
        {
            if (RoadwayNo == "1" || RoadwayNo == "3")
            {
                if(locrow==1 || locrow == 4)
                {
                    return locrow == 1 ? 2 : 3;
                }
                else
                {
                    return locrow == 2 ? 1 : 4;
                }
               
            }
            else if (RoadwayNo == "2" || RoadwayNo == "4")
            {
                if (locrow == 5 || locrow == 8)
                {
                    return locrow == 5 ? 6 : 7;
                }
                else
                {
                    return locrow == 6 ? 5 : 8;
                }
                    
            }
            else
            {
                return 0;
            }
        }

        public class LocationCache
        {
            public string LocationCode { get; set; }