fix: 修复移库任务号重复问题，优化策略优先处理正常任务，避免任务堵塞

xiazhengtongxue

2026-04-07 b0b5deb5825684bca5b3fa7c2ab59f60ce0e799f

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

@@ -22,6 +22,7 @@
using WIDESEA_Core.Seed;
using WIDESEA_Core.Utilities;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;

@@ -160,43 +161,77 @@
        }


        public string AccessingTunnel(int WarehouseId, int LocationType)
        public string AccessingTunnel(int WarehouseId, int LocationType, List<RoadwayTaskCount> roadwayTaskCounts)
        {
            List<Dt_LocationInfo> locationData = BaseDal.QueryData(x => x.WarehouseId == WarehouseId);
            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.EnableStatus== (int)EnableStatusEnum.Normal).GroupBy(x => x.RoadwayNo)
            .Select(g => new

            // å°† roadwayTaskCounts è½¬æ¢ä¸ºå­—典，便于快速查找
            var taskCountDict = roadwayTaskCounts?.ToDictionary(x => x.Roadway, x => x.TaskCount) ?? new Dictionary<string, int>();

            var roadwayGroups = locationData.Where(x => x.LocationType == LocationType && x.LocationStatus == (int)LocationStatusEnum.Free && x.EnableStatus == (int)EnableStatusEnum.Normal)
                .GroupBy(x => x.RoadwayNo)
                .Select(g => new
                {
                    RoadwayNo = g.Key,
                    FreeCount = g.Count(),
                    TaskCount = taskCountDict.ContainsKey(g.Key) ? taskCountDict[g.Key] : 0,
                    AvailableCount = g.Count() - (taskCountDict.ContainsKey(g.Key) ? taskCountDict[g.Key] : 0)
                })
                .Where(g => g.AvailableCount > 0)
                .ToList();

            int minRequired = 3;

            if (WarehouseId == (int)WarehouseEnum.YMYL)
            {
                RoadwayNo = g.Key,
                LocationCount = g.Count(),
            }).OrderByDescending(g => g.LocationCount).ToList();
                if (LocationType == 2) minRequired = 2;

            int minRequired = 15;
            if(WarehouseId== (int)WarehouseEnum.YMYL)
            {
                if (LocationType == 2) minRequired = 6;
                // è¿™é‡Œé€‰æ‹©å··é“1或者2，先找任务最少的，如果一样，选择库存在多的
                var targetRoadways = roadwayGroups
                    .Where(g => (g.RoadwayNo == "1" || g.RoadwayNo == "2") && g.AvailableCount >= minRequired)
                    .OrderBy(g => g.TaskCount)           // å…ˆæŒ‰ä»»åŠ¡æ•°å‡åºï¼ˆä»»åŠ¡å°‘的优先）
                    .ThenByDescending(g => g.FreeCount)  // ä»»åŠ¡ç›¸åŒæ—¶æŒ‰ç©ºé—²æ•°é™åºï¼ˆåº“存多的优先）
                    .ToList();

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

                var selectedRoadway = targetRoadways.FirstOrDefault();
                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);
                // è¿™é‡Œé€‰æ‹©å··é“3或者4或者5，先找任务最少的，如果一样，选择库存在多的
                var targetRoadways = roadwayGroups
                    .Where(g => (g.RoadwayNo == "3" || g.RoadwayNo == "4" || g.RoadwayNo == "5") && g.AvailableCount >= minRequired)
                    .OrderBy(g => g.TaskCount)           // å…ˆæŒ‰ä»»åŠ¡æ•°å‡åºï¼ˆä»»åŠ¡å°‘的优先）
                    .ThenByDescending(g => g.FreeCount)  // ä»»åŠ¡ç›¸åŒæ—¶æŒ‰ç©ºé—²æ•°é™åºï¼ˆåº“存多的优先）
                    .ToList();

                var selectedRoadway = targetRoadways.FirstOrDefault();
                if (selectedRoadway == null)
                {
                    // å¦‚果没有满足最低要求的，尝试选择巷道5（只要有可用库位就行）
                    selectedRoadway = roadwayGroups
                        .Where(g => g.RoadwayNo == "5" && g.AvailableCount > 0)
                        .FirstOrDefault();
                }
                if(selectedRoadway != null) return selectedRoadway.RoadwayNo;

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

            return "0";
        }



        public Dt_LocationInfo? ShallowGetLocation(string roadway, int Locationtype,int row ,int Layer, int Column)
        {
            return BaseDal.QueryData(x => x.RoadwayNo == roadway && x.LocationType == Locationtype && x.Row==row && x.Layer== Layer && x.Column== Column).FirstOrDefault();
        }

        public Dt_LocationInfo? FindStorageLocation(string LocationCode)
        {
            return BaseDal.QueryData(x => x.LocationCode == LocationCode).FirstOrDefault();
        }


@@ -267,7 +302,7 @@
            }
        }

        private int judgmentRow(string RoadwayNo, int locrow)
        public int judgmentRow(string RoadwayNo, int locrow)
        {
            if (RoadwayNo == "1" || RoadwayNo == "3")
            {
@@ -305,5 +340,154 @@

            public DateTime DateTime { get; set; }
        }



        public WebResponseContent GetArea()
        {
            // WarehouseId分组，然后是RoadwayNo
            var result = BaseDal.QueryData()
                .GroupBy(x => x.WarehouseId)
                .Select(g => new {
                    WarehouseId = g.Key,
                    RoadwayNo = g.Select(x => x.RoadwayNo).Distinct().ToList()
                })
                .ToList();
            return WebResponseContent.Instance.OK("成功", result);
        }

        public WebResponseContent GetLocationStatus(int WarehouseId, string RoadwayNo)
        {
            // æ ¼å¼{层,{这一层的列数据}}
            var locations = BaseDal.QueryData(x => x.WarehouseId == WarehouseId && x.RoadwayNo == RoadwayNo)
                .Select(x => new
                {
                    x.RoadwayNo,
                    x.LocationCode,
                    x.WarehouseId,
                    x.Row,
                    x.Column,
                    x.Layer,
                    x.Depth,
                    x.LocationType,
                    x.LocationStatus,
                    x.EnableStatus
                })
                .ToList();

            // å¦‚果没有找到数据，返回空列表而不是null
            if (locations == null || !locations.Any())
            {
                return WebResponseContent.Instance.OK("未找到对应巷道的货位数据", new List<object>());
            }

            // ä¿®æ”¹ä¸ºå±‚下面放所有列的信息
            var result = locations
                .GroupBy(x => x.Layer)  // æŒ‰å±‚分组
                .Select(layerGroup => new
                {
                    layer = layerGroup.Key,
                    columns = layerGroup.GroupBy(x => x.Column)  // æ¯å±‚中按列分组
                                       .Select(columnGroup => new
                                       {
                                           column = columnGroup.Key,
                                           depths = columnGroup.Select(d => new
                                           {
                                               row = d.Row,
                                               LocationCode = d.LocationCode,
                                               depth = d.Depth,
                                               locationType = d.LocationType,
                                               locationStatus = d.LocationStatus,
                                               enableStatus = d.EnableStatus
                                           }).ToList()
                                       }).ToList()
                }).ToList();

            return WebResponseContent.Instance.OK("成功", result);
        }
        // ç»§ç»­åˆ†ï¼ŒWarehouseId =1，有两个不同的货物，LocationType =1和2
        public WebResponseContent GetWarehouseCapacity()
        {
            // æŸ¥è¯¢æ‰€æœ‰ä»“库的货位数据，包含货位类型
            var allLocations = BaseDal.QueryData()
                .Select(x => new
                {
                    x.WarehouseId,
                    x.LocationStatus,
                    x.LocationType  // æ·»åŠ è´§ä½ç±»åž‹
                })
                .ToList();

            // å¦‚果没有数据，返回空列表
            if (allLocations == null || !allLocations.Any())
            {
                return WebResponseContent.Instance.OK("未找到任何货位数据", new List<object>());
            }

            // æŒ‰ä»“库和货位类型分组统计
            var result = allLocations
                .GroupBy(x => new { x.WarehouseId, x.LocationType })
                .Select(g => new
                {
                    WarehouseId = g.Key.WarehouseId,
                    LocationType = g.Key.LocationType,
                    TotalLocations = g.Count(),
                    FreeLocations = g.Count(x => x.LocationStatus == 0),
                    UsedLocations = g.Count(x => x.LocationStatus == 1),
                    OccupancyRate = (int)Math.Round((double)g.Count(x => x.LocationStatus == 1) / g.Count() * 100),
                    RemainingCapacityPercentage = (int)Math.Round((double)g.Count(x => x.LocationStatus == 0) / g.Count() * 100)
                })
                .OrderBy(x => x.WarehouseId)
                .ThenBy(x => x.LocationType)
                .ToList();

            return WebResponseContent.Instance.OK("成功", result);
        }

        /// <summary>
        /// ä¸€é”®å¯ç”¨å··é“所有货位
        /// </summary>
        /// <param name="warehouseId">仓库ID</param>
        /// <param name="roadwayNo">巷道编号</param>
        /// <returns></returns>
        public WebResponseContent EnableAllLocationsInRoadway(string roadwayNo)
        {
            if (string.IsNullOrEmpty(roadwayNo))
                return WebResponseContent.Instance.Error("巷道编号不能为空");

            var locations = Repository.QueryData(x =>
                x.RoadwayNo == roadwayNo &&
                x.EnableStatus != EnableStatusEnum.Normal.ObjToInt());

            if (locations == null || locations.Count == 0)
                return WebResponseContent.Instance.OK("该巷道没有需要启用的货位");

            locations.ForEach(x => x.EnableStatus = EnableStatusEnum.Normal.ObjToInt());
            Repository.UpdateData(locations);

            return WebResponseContent.Instance.OK($"成功启用巷道[{roadwayNo}]的{locations.Count}个货位");
        }

        /// <summary>
        /// ä¸€é”®ç¦ç”¨å··é“所有货位
        /// </summary>
        /// <param name="warehouseId">仓库ID</param>
        /// <param name="roadwayNo">巷道编号</param>
        /// <returns></returns>
        public WebResponseContent DisableAllLocationsInRoadway(string roadwayNo)
        {
            if (string.IsNullOrEmpty(roadwayNo))
                return WebResponseContent.Instance.Error("巷道编号不能为空");
            var locations = Repository.QueryData(x =>
                x.RoadwayNo == roadwayNo &&
                x.EnableStatus != EnableStatusEnum.Disable.ObjToInt());
            if (locations == null || locations.Count == 0)
                return WebResponseContent.Instance.OK("该巷道没有需要禁用的货位");
            // æ£€æŸ¥è´§ä½æ˜¯å¦æœ‰åº“å­˜
            var locationIds = locations.Select(x => x.Id).ToList();
            locations.ForEach(x => x.EnableStatus = EnableStatusEnum.Disable.ObjToInt());
            Repository.UpdateData(locations);
            return WebResponseContent.Instance.OK($"成功禁用巷道[{roadwayNo}]的{locations.Count}个货位");
        }
    }
}