feat: 支持多出库口轮询选择

wanshenmean

2026-03-09 963aa00ec6b120d05dc702129b176c327213653b

 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -24,6 +24,7 @@
        private readonly ILocationInfoService _locationInfoService;
        private readonly HttpClientHelper _httpClientHelper;
        private readonly IConfiguration _configuration;
        private readonly RoundRobinService _roundRobinService;

        public IRepository<Dt_Task> Repository => BaseDal;

@@ -42,13 +43,15 @@
            IStockInfoService stockInfoService,
            ILocationInfoService locationInfoService,
            HttpClientHelper httpClientHelper,
            IConfiguration configuration) : base(BaseDal)
            IConfiguration configuration,
            RoundRobinService roundRobinService) : base(BaseDal)
        {
            _mapper = mapper;
            _stockInfoService = stockInfoService;
            _locationInfoService = locationInfoService;
            _httpClientHelper = httpClientHelper;
            _configuration = configuration;
            _roundRobinService = roundRobinService;
        }

        #region WCS逻辑处理
@@ -380,20 +383,37 @@
        }

        /// <summary>
        /// 根据巷道确定目标地址
        /// 根据巷道确定目标地址（支持多出库口轮询）
        /// </summary>
        private string DetermineTargetAddress(string roadway, Dictionary<string, string> addressMap)
        private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
        {
            if (string.IsNullOrWhiteSpace(roadway))
                return "10080"; // 默认地址
                return "10080";

            // 查找匹配的巷道前缀
            string matchedPrefix = null;
            foreach (var kvp in addressMap)
            {
                if (roadway.Contains(kvp.Key))
                    return kvp.Value;
                {
                    matchedPrefix = kvp.Key;
                    break;
                }
            }

            return "10080"; // 默认地址
            if (matchedPrefix == null)
                return "10080";

            var addresses = addressMap[matchedPrefix];
            if (addresses == null || addresses.Count == 0)
                return "10080";

            // 单个地址，直接返回
            if (addresses.Count == 1)
                return addresses[0];

            // 多个地址，使用轮询服务
            return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
        }

        /// <summary>
@@ -405,7 +425,7 @@
            {
                // 1. 查询到期库存
                var expiredStocks = await _stockInfoService.Repository
                    .QueryAsync(s => s.OutboundDate <= DateTime.Now
                    .QueryDataAsync(s => s.OutboundDate <= DateTime.Now
                        && s.StockStatus == StockStatusEmun.入库完成.GetHashCode());

                if (expiredStocks == null || !expiredStocks.Any())
@@ -413,13 +433,29 @@
                    return WebResponseContent.Instance.OK("无到期库存需要处理");
                }

                // 加载位置详情
                foreach (var stock in expiredStocks)
                // 批量加载位置详情（优化 N+1 查询问题）
                var locationIds = expiredStocks
                    .Where(s => s.LocationId > 0)
                    .Select(s => s.LocationId)
                    .Distinct()
                    .Cast<object>()
                    .ToList();

                if (locationIds.Any())
                {
                    if (stock.LocationId > 0)
                    var locations = await _locationInfoService.Repository
                        .QureyDataByIdsAsync(locationIds);

                    // 创建位置字典以便快速查找
                    var locationDict = locations.ToDictionary(l => l.Id, l => l);

                    // 为每个库存关联位置详情
                    foreach (var stock in expiredStocks)
                    {
                        stock.LocationDetails = await _locationInfoService.Repository
                            .GetFirstAsync(s => s.Id == stock.LocationId);
                        if (stock.LocationId > 0 && locationDict.ContainsKey(stock.LocationId))
                        {
                            stock.LocationDetails = locationDict[stock.LocationId];
                        }
                    }
                }

@@ -436,11 +472,11 @@

                // 2. 检查已存在的任务
                var palletCodes = expiredStocks.Select(s => s.PalletCode).ToList();
                var existingTasks = await Repository.QueryAsync(t =>
                var existingTasks = await Repository.QueryDataAsync(t =>
                    palletCodes.Contains(t.PalletCode)
                    && (t.TaskStatus == TaskStatusEnum.New.GetHashCode()
                        || t.TaskStatus == TaskStatusEnum.Executing.GetHashCode()
                        || t.TaskInStatus == TaskInStatusEnum.InNew.GetHashCode()));
                        || t.TaskStatus == TaskStatusEnum.SC_Executing.GetHashCode()
                        || t.TaskStatus == TaskInStatusEnum.InNew.GetHashCode()));

                var processedPallets = existingTasks.Select(t => t.PalletCode).ToHashSet();

@@ -481,7 +517,7 @@
                        TaskType = TaskTypeEnum.Outbound.GetHashCode(),
                        TaskStatus = TaskStatusEnum.New.GetHashCode(),
                        Grade = 1,
                        TaskNum = await Repository.GetTaskNo(),
                        TaskNum = 0,  // 使用 0 让数据库自动生成任务号
                        Creater = "system_auto"
                    };
                    taskList.Add(task);
@@ -494,14 +530,14 @@
                }

                // 6. 通知 WCS（异步，不影响主流程）
                _ = Task.Run(async () =>
                _ = Task.Run(() =>
                {
                    foreach (var task in taskList)
                    {
                        try
                        {
                            var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
                            await _httpClientHelper.Post<WebResponseContent>(
                            _httpClientHelper.Post<WebResponseContent>(
                                "http://logistics-service/api/logistics/notifyoutbound",
                                JsonSerializer.Serialize(wmstaskDto));
                        }