feat(任务服务): 根据库存Remark确定目标地址并移除MES出站调用

wanshenmean

5 天以前 1fb400ef4e1169146296681e58185097d479e48f

 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -19,6 +19,7 @@
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -37,6 +38,7 @@
        private readonly ITask_HtyService _task_HtyService;
        private readonly IStockInfo_HtyService _stockInfo_HtyService;
        private readonly IUnitOfWorkManage _unitOfWorkManage;
        private readonly IRecordService _recordService;

        public IRepository<Dt_Task> Repository => BaseDal;

@@ -60,7 +62,8 @@
            IMesService mesService,
            ITask_HtyService task_HtyService,
            IStockInfo_HtyService stockInfo_HtyService,
            IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
            IUnitOfWorkManage unitOfWorkManage,
            IRecordService recordService) : base(BaseDal)
        {
            _mapper = mapper;
            _stockInfoService = stockInfoService;
@@ -72,6 +75,7 @@
            _task_HtyService = task_HtyService;
            _stockInfo_HtyService = stockInfo_HtyService;
            _unitOfWorkManage = unitOfWorkManage;
            _recordService = recordService;
        }

        /// <summary>
@@ -166,5 +170,25 @@
            return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
        }

        /// <summary>
        /// 根据库存 Remark 确定目标地址（GW_1→[11001,11010]轮询，GW_2→CWSC1，CW_1→22001）。
        /// </summary>
        private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
        {
            // 根据 Remark 确定目标地址
            if (!string.IsNullOrWhiteSpace(remark))
            {
                return remark switch
                {
                    "GW_1" => _roundRobinService.GetNextAddress("GW_1", new List<string> { "11001", "11010" }),
                    "GW_2" => "CWSC1",
                    "CW_1" => "22001",
                    _ => DetermineTargetAddress(roadway, addressMap)
                };
            }

            // Remark 为空时，回退到巷道配置
            return DetermineTargetAddress(roadway, addressMap);
        }
    }
}
}