提交

pan

2025-12-04 db215dc033392d843cec846f0a8f9dbff2578c6a

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_Outbound.cs

@@ -2,10 +2,12 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_BasicService;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
@@ -17,6 +19,9 @@
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Stock;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.Check;
using WIDESEA_Model.Models.Outbound;

namespace WIDESEA_TaskInfoService
{
@@ -27,95 +32,83 @@
        /// </summary>
        /// <param name="inTask"></param>
        /// <returns></returns>
        public async Task<WebResponseContent> PalletOutboundTask(string endStation, string palletCode = "")
        public async Task<WebResponseContent> PalletOutboundTask(int num, int locationType)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_StockInfo stockInfo;
                if (string.IsNullOrEmpty(palletCode))
                {
                    stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt() && x.StockStatus == StockStatusEmun.入库完成.ObjToInt() && !string.IsNullOrWhiteSpace(x.LocationCode)).First();
                }
                else
                {
                    stockInfo = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt() && x.PalletCode == palletCode && x.StockStatus == StockStatusEmun.入库完成.ObjToInt()).First();
                }
                var stockInfos = _stockRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletType == PalletTypeEnum.Empty.ObjToInt() && x.StockStatus == StockStatusEmun.入库完成.ObjToInt()).WhereIF(locationType != 0, x => x.LocationType == locationType).Take(num).ToList();

                if (stockInfo == null)
                if (stockInfos.Count() == 0)
                {
                    return WebResponseContent.Instance.Error("未找到空托盘库存");
                }
                Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                if (locationInfo == null)
                foreach (var stockInfo in stockInfos)
                {
                    return WebResponseContent.Instance.Error("未找到空托盘库存对应的货位信息");
                }

                Dt_Task task = new Dt_Task()
                {
                    CurrentAddress = stockInfo.LocationCode,
                    Grade = 0,
                    NextAddress = endStation,
                    PalletCode = stockInfo.PalletCode,
                    Roadway = locationInfo.RoadwayNo,
                    SourceAddress = stockInfo.LocationCode,
                    TargetAddress = endStation,
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    TaskType = TaskTypeEnum.OutEmpty.ObjToInt(),
                    WarehouseId = stockInfo.WarehouseId,
                    PalletType = stockInfo.PalletType

                };
                int beforeStatus = locationInfo.LocationStatus;
                _unitOfWorkManage.BeginTran();
                stockInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();

                int taskId = BaseDal.AddData(task);
                task.TaskId = taskId;

                _stockService.StockInfoService.UpdateData(stockInfo);

                _locationInfoService.UpdateData(locationInfo);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);

                _unitOfWorkManage.CommitTran();

                TaskModel esstask = new TaskModel()
                {
                    taskType = "carry",
                    taskGroupCode = "",
                    groupPriority = 0,
                    tasks = new List<TasksType>
                    Dt_LocationInfo locationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                    if (locationInfo == null)
                    {
                            new()
                            {
                                taskCode=task.TaskNum.ToString(),
                                taskPriority=0,
                                taskDescribe=new TaskDescribeType{
                                containerCode=stockInfo.PalletCode,
                                containerType= "CT_KUBOT_STANDARD",
                                fromLocationCode=stockInfo.LocationCode??"",
                                toStationCode="",
                                toLocationCode=endStation,
                                deadline=0,storageTag=""
                                }
                            }
                        return WebResponseContent.Instance.Error("未找到空托盘库存对应的货位信息");
                    }
                };
                var result = await _eSSApiService.CreateTaskAsync(esstask);

                _logger.LogInformation("创建任务PalletOutboundTask è¿”回:  " + result);
                if (result)
                {
                    return WebResponseContent.Instance.OK(200);
                }
                else
                {
                    return WebResponseContent.Instance.Error("下发机器人任务失败！");
                }
                    Dt_Task task = new Dt_Task()
                    {
                        CurrentAddress = stockInfo.LocationCode,
                        Grade = 0,
                        NextAddress = "1-2",
                        PalletCode = stockInfo.PalletCode,
                        Roadway = locationInfo.RoadwayNo,
                        SourceAddress = stockInfo.LocationCode,
                        TargetAddress = "1-2",
                        TaskStatus = TaskStatusEnum.New.ObjToInt(),
                        TaskType = TaskTypeEnum.OutEmpty.ObjToInt(),
                        WarehouseId = stockInfo.WarehouseId,
                        PalletType = stockInfo.PalletType

                    };
                    int beforeStatus = locationInfo.LocationStatus;
                    _unitOfWorkManage.BeginTran();
                    stockInfo.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                    locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();

                    int taskId = BaseDal.AddData(task);
                    task.TaskId = taskId;

                    _stockService.StockInfoService.UpdateData(stockInfo);

                    _locationInfoService.UpdateData(locationInfo);

                    _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), "", task.TaskNum);

                    _unitOfWorkManage.CommitTran();

                    TaskModel esstask = new TaskModel()
                    {
                        taskType = "carry",
                        taskGroupCode = "",
                        groupPriority = 0,
                        tasks = new List<TasksType>
                        {
                                new()
                                {
                                    taskCode=task.TaskNum.ToString(),
                                    taskPriority=0,
                                    taskDescribe=new TaskDescribeType{
                                    containerCode=stockInfo.PalletCode,
                                    containerType= "CT_KUBOT_STANDARD",
                                    fromLocationCode=stockInfo.LocationCode??"",
                                    toStationCode="",
                                    toLocationCode="1-2",
                                    deadline=0,storageTag=""
                                    }
                                }
                        }
                    };
                    var result = await _eSSApiService.CreateTaskAsync(esstask);

                    _logger.LogInformation("创建任务PalletOutboundTask è¿”回:  " + result);
                }
                return content.OK("空托出库成功!");
            }
            catch (Exception ex)
            {
@@ -140,52 +133,115 @@
            {
                throw new Exception("未找到出库单明细信息");
            }
            if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
            //if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.New.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
            //{
            //    throw new Exception("所选出库单明细存在出库中或已完成");
            //}

            if (outboundOrderDetails.FirstOrDefault(x => x.OrderDetailStatus > OrderDetailStatusEnum.Outbound.ObjToInt() && x.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt()) != null)
            {
                throw new Exception("所选出库单明细存在出库中或已完成");
                throw new Exception("所选出库单明细存在已完成状态，无法重新分配");
            }

            List<Dt_StockInfo>? stockInfos = null;
            List<Dt_OutboundOrderDetail>? orderDetails = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;

            (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
            if (result.Item1 != null && result.Item1.Count > 0)
            CleanupPreviousInvalidLocks(outboundOrderDetails);
            // å¼€å¯äº‹åŠ¡ï¼Œä½¿ç”¨æ•°æ®åº“行级锁
            using (var transaction = _outboundOrderDetailService.Db.Ado.UseTran())
            {
                Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
                TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                try
                {
                    (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                    (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
                    (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                    _ => TaskTypeEnum.Outbound
                };
                tasks = GetTasks(result.Item1, typeEnum, outStation);
                tasks.ForEach(x =>
                {
                    x.OrderNo = outboundOrder.OrderNo;
                });
                result.Item2.ForEach(x =>
                {
                    x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                });
                result.Item3.ForEach(x =>
                {
                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                });
                    // ä½¿ç”¨æ‚²è§‚锁锁定订单明细
                    var lockedOrderDetails = new List<Dt_OutboundOrderDetail>();
                    foreach (var key in keys)
                    {
                        var detail = _outboundOrderDetailService.Db.Ado.SqlQuerySingle<Dt_OutboundOrderDetail>(
                            "SELECT * FROM Dt_OutboundOrderDetail WITH (UPDLOCK, ROWLOCK) WHERE Id = @Id",
                            new { Id = key });

                stockInfos = result.Item1;
                orderDetails = result.Item2;
                outStockLockInfos = result.Item3;
                locationInfos = result.Item4;
                        if (detail != null)
                        {
                            lockedOrderDetails.Add(detail);
                        }
                    }

                    if (!lockedOrderDetails.Any())
                    {
                        throw new Exception("未找到出库单明细信息");
                    }
                    (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetails);
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetails.FirstOrDefault().OrderId);
                        TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                        {
                            (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                            (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
                            (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                            _ => TaskTypeEnum.Outbound
                        };
                        tasks = GetTasks(result.Item1, typeEnum, outStation);
                        tasks.ForEach(x =>
                        {
                            x.OrderNo = outboundOrder.OrderNo;
                        });
                        result.Item2.ForEach(x =>
                        {
                            x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                        });
                        result.Item3.ForEach(x =>
                        {
                            x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                        });

                        stockInfos = result.Item1;
                        orderDetails = result.Item2;
                        outStockLockInfos = result.Item3;
                        locationInfos = result.Item4;
                        transaction.CommitTran();
                    }
                    else
                    {
                        transaction.RollbackTran();
                        throw new Exception("无库存");
                    }
                }
                catch (Exception)
                {
                    transaction.RollbackTran();
                    throw;
                }
                return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
            }
            else
            {
                throw new Exception("无库存");
            }    
            return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
        }
        /// <summary>
        /// æ¸…理之前的无效锁定记录
        /// </summary>
        private void CleanupPreviousInvalidLocks(List<Dt_OutboundOrderDetail> orderDetails)
        {
            var orderIds = orderDetails.Select(x => x.OrderId).Distinct().ToList();
            var orderNos = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                .Where(x => orderIds.Contains(x.Id))
                .Select(x => x.OrderNo)
                .ToList();

            // æ¸…理状态为"已释放"或"回库中"的旧锁定记录
            foreach (var orderNo in orderNos)
            {
                _outStockLockInfoService.Db.Updateable<Dt_OutStockLockInfo>()
                     .SetColumns(x => new Dt_OutStockLockInfo
                     {
                         Status = (int)OutLockStockStatusEnum.已释放
                     })
                     .Where(x => x.OrderNo == orderNo &&
                                (x.Status == (int)OutLockStockStatusEnum.回库中 ||
                                 x.Status == (int)OutLockStockStatusEnum.已释放))
                     .ExecuteCommand();
            }
        }

        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务后数据更新到数据库
@@ -206,7 +262,7 @@
                if (stockInfos != null && stockInfos.Count > 0 && outboundOrderDetails != null && outboundOrderDetails.Count > 0 && outStockLockInfos != null && outStockLockInfos.Count > 0 && locationInfos != null && locationInfos.Count > 0)
                {
                    stockInfos.ForEach(x =>
                    {                        
                    {
                        x.StockStatus = StockStatusEmun.出库锁定.ObjToInt();
                    });
                    outboundOrderDetails.ForEach(x =>
@@ -217,6 +273,10 @@
                    if (outboundOrder.OrderStatus != OutOrderStatusEnum.出库中.ObjToInt())
                    {
                        _outboundOrderService.Repository.UpdateData(outboundOrder);
                    }
                    else
                    {
                        outboundOrder.OrderStatus = OutOrderStatusEnum.出库中.ObjToInt();
                    }
                    outboundOrder.Operator = App.User.UserName;
                    _outboundOrderService.Repository.UpdateData(outboundOrder);
@@ -239,6 +299,12 @@
                    {
                        _outboundOrderService.Repository.UpdateData(outboundOrder);
                    }
                    else
                    {
                        outboundOrder.OrderStatus = OutOrderStatusEnum.出库中.ObjToInt();
                    }
                    outboundOrder.Operator = App.User.UserName;
                    _outboundOrderService.Repository.UpdateData(outboundOrder);
                    _outboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                }
                _unitOfWorkManage.CommitTran();
@@ -383,6 +449,65 @@
            return tasks;
        }

        #region å†…存锁管理器
        private static readonly ConcurrentDictionary<string, SemaphoreSlim> _normalmaterialLocks =
            new ConcurrentDictionary<string, SemaphoreSlim>();
        private static readonly ConcurrentDictionary<string, DateTime> _normallockLastUsed =
            new ConcurrentDictionary<string, DateTime>();
        private static readonly object _normalcleanupLock = new object();
        private static DateTime _normallastCleanupTime = DateTime.MinValue;

        /// <summary>
        /// èŽ·å–物料级内存锁
        /// </summary>
        private SemaphoreSlim GetNormalMaterialSemaphore(string materialCode, string batchNo, string supplyCode)
        {
            // åˆ›å»ºé”é”®ï¼šç‰©æ–™+批次+供应商
            string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";

            // æ¸…理长时间不用的锁（每小时清理一次）
            var now = DateTime.Now;
            if ((now - _normallastCleanupTime).TotalHours >= 1)
            {
                lock (_normalcleanupLock)
                {
                    if ((now - _normallastCleanupTime).TotalHours >= 1)
                    {
                        var keysToRemove = _normallockLastUsed
                            .Where(kvp => (now - kvp.Value).TotalHours > 2)
                            .Select(kvp => kvp.Key)
                            .ToList();

                        foreach (var key in keysToRemove)
                        {
                            if (_normalmaterialLocks.TryRemove(key, out var _semaphore))
                            {
                                _semaphore.Dispose();
                            }
                            _normallockLastUsed.TryRemove(key, out _);
                        }

                        _normallastCleanupTime = now;
                    }
                }
            }

            // èŽ·å–或创建信号量
            var semaphore = _normalmaterialLocks.GetOrAdd(lockKey, _ => new SemaphoreSlim(1, 1));
            _normallockLastUsed[lockKey] = now;

            return semaphore;
        }

        /// <summary>
        /// æ›´æ–°å†…存锁最后使用时间
        /// </summary>
        private void UpdateNormalMaterialLockUsedTime(string materialCode, string batchNo, string supplyCode)
        {
            string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
            _normallockLastUsed[lockKey] = DateTime.Now;
        }
        #endregion
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
@@ -398,31 +523,90 @@
                List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();

                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys, outStation);
                if (result.Item2 != null && result.Item2.Count > 0)
                // å…ˆèŽ·å–所有订单明细，确定需要锁定的物料
                var orderDetails = _outboundOrderDetailService.Repository.QueryData(x => keys.Contains(x.Id));
                if (orderDetails == null || orderDetails.Count == 0)
                {
                    stockInfos.AddRange(result.Item2);
                }
                if (result.Item3 != null && result.Item3.Count > 0)
                {
                    outboundOrderDetails.AddRange(result.Item3);
                }
                if (result.Item4 != null && result.Item4.Count > 0)
                {
                    outStockLockInfos.AddRange(result.Item4);
                }
                if (result.Item5 != null && result.Item5.Count > 0)
                {
                    locationInfos.AddRange(result.Item5);
                }
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    tasks.AddRange(result.Item1);
                    return WebResponseContent.Instance.Error("未找到出库单明细信息");
                }

                WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
                return content;
                // èŽ·å–所有需要锁定的物料分组
                var materialGroups = orderDetails
                    .GroupBy(x => new { x.MaterielCode, x.BatchNo, x.SupplyCode })
                    .Select(g => new
                    {
                        g.Key.MaterielCode,
                        g.Key.BatchNo,
                        g.Key.SupplyCode,
                        Count = g.Count()
                    })
                    .ToList();

                // æŒ‰é¡ºåºèŽ·å–所有物料的内存锁（按物料代码排序以避免死锁）
                var semaphores = new List<SemaphoreSlim>();
                var acquiredLocks = new List<(string MaterialCode, string BatchNo, string SupplyCode)>();

                try
                {
                    foreach (var group in materialGroups.OrderBy(g => g.MaterielCode).ThenBy(g => g.BatchNo))
                    {
                        var semaphore = GetMaterialSemaphore(group.MaterielCode, group.BatchNo, group.SupplyCode);

                        // ç­‰å¾…获取锁，最多等待30秒
                        bool lockAcquired = await semaphore.WaitAsync(TimeSpan.FromSeconds(30));

                        if (!lockAcquired)
                        {
                            // å¦‚果获取锁失败，释放已获取的所有锁
                            foreach (var acquiredSemaphore in semaphores)
                            {
                                acquiredSemaphore.Release();
                            }
                            return WebResponseContent.Instance.Error($"物料[{group.MaterielCode}]批次[{group.BatchNo}]分配繁忙，请稍后重试");
                        }

                        semaphores.Add(semaphore);
                        acquiredLocks.Add((group.MaterielCode, group.BatchNo, group.SupplyCode));
                    }

                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(keys, outStation);
                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
                    }
                    if (result.Item3 != null && result.Item3.Count > 0)
                    {
                        outboundOrderDetails.AddRange(result.Item3);
                    }
                    if (result.Item4 != null && result.Item4.Count > 0)
                    {
                        outStockLockInfos.AddRange(result.Item4);
                    }
                    if (result.Item5 != null && result.Item5.Count > 0)
                    {
                        locationInfos.AddRange(result.Item5);
                    }
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks.AddRange(result.Item1);
                    }

                    WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
                    return content;
                }
                finally
                {
                    // é‡Šæ”¾æ‰€æœ‰å†…存锁并更新使用时间
                    foreach (var semaphore in semaphores)
                    {
                        semaphore.Release();
                    }

                    foreach (var lockInfo in acquiredLocks)
                    {
                        UpdateMaterialLockUsedTime(lockInfo.MaterialCode, lockInfo.BatchNo, lockInfo.SupplyCode);
                    }
                }
            }
            catch (Exception ex)
            {
@@ -431,20 +615,70 @@
            }
        }

        /// <summary>
        /// æ™ºä»“调智仓
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <param name="station"></param>
        /// <returns></returns>
        public async Task<WebResponseContent> GenerateAllocatOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews, string station = null)
        {
            try
            {
                var allocorder = _allocateOrderRepository.Db.Queryable<Dt_AllocateOrder>().Includes(x => x.Details).Where(x => x.Details.Any(o => o.Id == orderDetailId)).First();
                //var allocorder = _allocateOrderDetailRepository.Db.Queryable<Dt_AllocateOrderDetail>()
                //               .LeftJoin<Dt_AllocateOrder>((detail, order) => detail.OrderId == order.Id)
                //               .Where((detail, order) => order.Id == orderDetailId)
                //               .Select((detail, order) => order)
                //               .First();
                if (allocorder == null)
                {
                    return WebResponseContent.Instance.Error("找不到单据");
                }
                var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).First(x => x.OrderNo == allocorder.OrderNo);
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error("找不到出库单据");
                }

                var orderdetail = outboundOrder.Details.Where(outItem => allocorder.Details.Any(allocItem => allocItem.MaterielCode == outItem.MaterielCode && allocItem.LineNo == outItem.lineNo
                 && allocItem.BarcodeQty == outItem.BarcodeQty && allocItem.WarehouseCode == outItem.WarehouseCode && allocItem.BarcodeUnit == outItem.BarcodeUnit)).First();
                if (orderdetail == null)
                {
                    return WebResponseContent.Instance.Error("找不到出库明细单据");
                }

                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews, station);

                WebResponseContent content = await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);

                return content;
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        /// <summary>
        /// ç”Ÿæˆå‡ºåº“任务
        /// </summary>
        /// <param name="orderDetailId"></param>
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        public async Task<WebResponseContent> GenerateOutboundTask(int orderDetailId, List<StockSelectViewDTO> stockSelectViews, string station = null)
        {
            try
            {
                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(orderDetailId, stockSelectViews);
                var orderNo = _reCheckOrderRepository.Db.Queryable<Dt_ReCheckOrder>().First(x => x.Id == orderDetailId)?.OrderNo;
                var outboundOrder = _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().Includes(x => x.Details).First(x => x.UpperOrderNo == orderNo);
                if (outboundOrder == null)
                {
                    return WebResponseContent.Instance.Error("找不到单据");
                }
                (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = OutboundTaskDataHandle(outboundOrder.Details.First().Id, stockSelectViews, station);

                WebResponseContent content = GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);
                WebResponseContent content = await GenerateOutboundTaskDataUpdate(result.Item1, result.Item2, result.Item3, result.Item4, result.Item5);

                return content;
            }
@@ -461,7 +695,7 @@
        /// <param name="stockSelectViews"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews)
        public (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) OutboundTaskDataHandle(int orderDetailId, List<StockSelectViewDTO> stockSelectViews, string station = null)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();
            Dt_OutboundOrderDetail outboundOrderDetail = _outboundOrderDetailService.Repository.QueryFirst(x => x.Id == orderDetailId);
@@ -471,10 +705,10 @@
                throw new Exception("未找到出库单明细信息");
            }

            if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
            {
                throw new Exception("选择数量超出单据数量");
            }
            //if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
            //{
            //    throw new Exception("选择数量超出单据数量");
            //}
            List<Dt_StockInfo>? stockInfos = null;
            Dt_OutboundOrderDetail? orderDetail = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
@@ -484,15 +718,15 @@
                (List<Dt_StockInfo>, Dt_OutboundOrderDetail, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) result = _outboundOrderDetailService.AssignStockOutbound(outboundOrderDetail, stockSelectViews);
                if (result.Item1 != null && result.Item1.Count > 0)
                {
                    Dt_OutboundOrder outboundOrder = _outboundOrderService .Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
                    Dt_OutboundOrder outboundOrder = _outboundOrderService.Repository.QueryFirst(x => x.Id == outboundOrderDetail.OrderId);
                    TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                    {
                        (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                        (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
                        (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                        _ => new TaskTypeEnum()
                        _ => TaskTypeEnum.Outbound
                    };
                    tasks = GetTasks(result.Item1, typeEnum);
                    tasks = GetTasks(result.Item1, typeEnum, station);
                    result.Item2.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                    result.Item3.ForEach(x =>
                    {
@@ -531,7 +765,7 @@
        /// <param name="outStockLockInfos"></param>
        /// <param name="locationInfos"></param>
        /// <returns></returns>
        public WebResponseContent GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
        public async Task<WebResponseContent> GenerateOutboundTaskDataUpdate(List<Dt_Task> tasks, List<Dt_StockInfo>? stockInfos = null, List<Dt_OutboundOrderDetail>? outboundOrderDetails = null, List<Dt_OutStockLockInfo>? outStockLockInfos = null, List<Dt_LocationInfo>? locationInfos = null)
        {
            try
            {
@@ -576,7 +810,46 @@
                }
                _unitOfWorkManage.CommitTran();
                //PushTasksToWCS(tasks);
                return WebResponseContent.Instance.OK();
                TaskModel esstask = new TaskModel()
                {
                    taskType = "carry",
                    taskGroupCode = "",
                    groupPriority = 0,
                    tasks = new List<TasksType>()
                };

                foreach (var task in tasks)
                {
                    esstask.
                       tasks.Add(new TasksType
                       {
                           taskCode = task.TaskNum.ToString(),
                           taskPriority = 0,
                           taskDescribe = new TaskDescribeType
                           {
                               containerCode = task.PalletCode,
                               containerType = "CT_KUBOT_STANDARD",
                               fromLocationCode = task.SourceAddress ?? "",
                               toStationCode = "",
                               toLocationCode = task.TargetAddress,
                               deadline = 0,
                               storageTag = ""
                           }
                       }
                   );
                }
                var result = await _eSSApiService.CreateTaskAsync(esstask);

                _logger.LogInformation("创建任务PalletOutboundTask è¿”回:  " + result);
                if (result)
                {
                    return WebResponseContent.Instance.OK();
                }
                else
                {
                    return WebResponseContent.Instance.Error("下发机器人任务失败！");
                }

            }
            catch (Exception ex)
            {
@@ -586,5 +859,283 @@

        }


        #region åˆ†æ‰¹åˆ†é…åº“å­˜
        #region å†…存锁管理器
        private static readonly ConcurrentDictionary<string, SemaphoreSlim> _materialLocks =
            new ConcurrentDictionary<string, SemaphoreSlim>();
        private static readonly ConcurrentDictionary<string, DateTime> _lockLastUsed =
            new ConcurrentDictionary<string, DateTime>();
        private static readonly object _cleanupLock = new object();
        private static DateTime _lastCleanupTime = DateTime.MinValue;

        /// <summary>
        /// èŽ·å–物料级内存锁
        /// </summary>
        private SemaphoreSlim GetMaterialSemaphore(string materialCode, string batchNo, string supplyCode)
        {
            // åˆ›å»ºé”é”®ï¼šç‰©æ–™+批次+供应商
            string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";

            // æ¸…理长时间不用的锁（每小时清理一次）
            var now = DateTime.Now;
            if ((now - _lastCleanupTime).TotalHours >= 1)
            {
                lock (_cleanupLock)
                {
                    if ((now - _lastCleanupTime).TotalHours >= 1)
                    {
                        var keysToRemove = _lockLastUsed
                            .Where(kvp => (now - kvp.Value).TotalHours > 2)
                            .Select(kvp => kvp.Key)
                            .ToList();

                        foreach (var key in keysToRemove)
                        {
                            if (_materialLocks.TryRemove(key, out var _semaphore))
                            {
                                _semaphore.Dispose();
                            }
                            _lockLastUsed.TryRemove(key, out _);
                        }

                        _lastCleanupTime = now;
                    }
                }
            }

            // èŽ·å–或创建信号量
            var semaphore = _materialLocks.GetOrAdd(lockKey, _ => new SemaphoreSlim(1, 1));
            _lockLastUsed[lockKey] = now;

            return semaphore;
        }

        /// <summary>
        /// é‡Šæ”¾å†…存锁并更新最后使用时间
        /// </summary>
        private void UpdateMaterialLockUsedTime(string materialCode, string batchNo, string supplyCode)
        {
            string lockKey = $"MaterialLock_{materialCode}_{batchNo}_{supplyCode}";
            _lockLastUsed[lockKey] = DateTime.Now;
        }
        #endregion
        /// <summary>
        /// åˆ†æ‰¹åˆ†é…åº“å­˜
        /// </summary>
        public async Task<WebResponseContent> GenerateOutboundBatchTasksAsync(int orderDetailId, decimal batchQuantity, string outStation)
        {
            try
            {
                // å…ˆèŽ·å–订单明细信息，确定物料
                var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                    .FirstAsync(x => x.Id == orderDetailId);

                if (orderDetail == null)
                    return WebResponseContent.Instance.Error("未找到订单明细信息");

                // èŽ·å–物料级内存锁
                var semaphore = GetMaterialSemaphore(orderDetailId + orderDetail.MaterielCode, orderDetail.BatchNo, orderDetail.SupplyCode);

                // ç­‰å¾…获取内存锁，最多等待30秒
                bool memoryLockAcquired = await semaphore.WaitAsync(TimeSpan.FromSeconds(30));

                if (!memoryLockAcquired)
                    return WebResponseContent.Instance.Error("系统繁忙，请稍后重试");

                try
                {
                    List<Dt_Task> tasks = new List<Dt_Task>();
                    List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
                    List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                    List<Dt_OutStockLockInfo> outStockLockInfos = new List<Dt_OutStockLockInfo>();
                    List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();

                    (List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?) result = await BatchAllocateStockDataHandle(orderDetailId, batchQuantity, outStation);

                    if (result.Item2 != null && result.Item2.Count > 0)
                    {
                        stockInfos.AddRange(result.Item2);
                    }
                    if (result.Item3 != null && result.Item3.Count > 0)
                    {
                        outboundOrderDetails.AddRange(result.Item3);
                    }
                    if (result.Item4 != null && result.Item4.Count > 0)
                    {
                        outStockLockInfos.AddRange(result.Item4);
                    }
                    if (result.Item5 != null && result.Item5.Count > 0)
                    {
                        locationInfos.AddRange(result.Item5);
                    }
                    if (result.Item1 != null && result.Item1.Count > 0)
                    {
                        tasks.AddRange(result.Item1);
                    }

                    WebResponseContent content = await GenerateOutboundTaskDataUpdateAsync(tasks, stockInfos, outboundOrderDetails, outStockLockInfos, locationInfos);
                    return content;
                }
                finally
                {
                    // é‡Šæ”¾å†…存锁
                    semaphore.Release();
                    UpdateMaterialLockUsedTime(orderDetail.MaterielCode, orderDetail.BatchNo, orderDetail.SupplyCode);
                }
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                _logger.LogError($"分批分配库存失败 -  OrderDetailId: {orderDetailId}, Quantity: {batchQuantity}, Error: {ex.Message}");
                return WebResponseContent.Instance.Error($"分批分配失败：{ex.Message}");
            }
        }

        /// <summary>
        /// åˆ†æ‰¹åˆ†é…åº“存数据处理
        /// </summary>
        public async Task<(List<Dt_Task>, List<Dt_StockInfo>?, List<Dt_OutboundOrderDetail>?, List<Dt_OutStockLockInfo>?, List<Dt_LocationInfo>?)>
            BatchAllocateStockDataHandle(int orderDetailId, decimal batchQuantity, string outStation)
        {
            List<Dt_Task> tasks = new List<Dt_Task>();

            // èŽ·å–订单明细
            var outboundOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().With("UPDLOCK, ROWLOCK")
                .FirstAsync(x => x.Id == orderDetailId);

            if (outboundOrderDetail == null)
            {
                throw new Exception("未找到出库单明细信息");
            }
            var outboundOrder = await _outboundOrderService.Db.Queryable<Dt_OutboundOrder>().FirstAsync(x => x.Id == outboundOrderDetail.OrderId);
            if (outboundOrder == null)
            {
                throw new Exception("未找到出库单信息");
            }
            // éªŒè¯è®¢å•æ˜Žç»†çŠ¶æ€
            if (outboundOrderDetail.OrderDetailStatus > OrderDetailStatusEnum.Outbound.ObjToInt() &&
                outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.AssignOverPartial.ObjToInt())
            {
                throw new Exception("所选出库单明细存在出库中或已完成");
            }

            // éªŒè¯åˆ†é…æ•°é‡
            decimal allocatedQty = outboundOrderDetail.AllocatedQuantity;
            decimal overOutQty = outboundOrderDetail.OverOutQuantity;
            decimal needOutQty = outboundOrderDetail.NeedOutQuantity;
            decimal availableQty = needOutQty - allocatedQty - overOutQty;

            if (availableQty <= 0)
                throw new Exception("无可分配数量");

            if (batchQuantity > availableQty)
                throw new Exception($"分配数量不能超过可分配数量{availableQty}");

            List<Dt_StockInfo>? stockInfos = null;
            List<Dt_OutboundOrderDetail>? orderDetails = null;
            List<Dt_OutStockLockInfo>? outStockLockInfos = null;
            List<Dt_LocationInfo>? locationInfos = null;

            // ç”Ÿæˆæ‰¹æ¬¡å·
            string batchNo = await GenerateBatchNo();

            // åˆ†é…åº“å­˜
            (List<Dt_StockInfo>, List<Dt_OutboundOrderDetail>, List<Dt_OutStockLockInfo>, List<Dt_LocationInfo>) allocateResult =
                await _outboundOrderDetailService.AssignStockForBatch(outboundOrderDetail, batchQuantity, batchNo);

            if (allocateResult.Item1 != null && allocateResult.Item1.Count > 0)
            {
                // åˆ›å»ºåˆ†æ‰¹è®°å½•
                await CreateBatchRecord(outboundOrder.OrderNo, orderDetailId, batchQuantity, batchNo);

                TaskTypeEnum typeEnum = outboundOrder.OrderType switch
                {
                    (int)OutOrderTypeEnum.Issue => TaskTypeEnum.Outbound,
                    (int)OutOrderTypeEnum.Allocate => TaskTypeEnum.OutAllocate,
                    (int)OutOrderTypeEnum.Quality => TaskTypeEnum.OutQuality,
                    _ => TaskTypeEnum.Outbound
                };

                tasks = GetTasks(allocateResult.Item1, typeEnum, outStation);
                tasks.ForEach(x =>
                {
                    x.OrderNo = outboundOrder.OrderNo;
                });

                allocateResult.Item2.ForEach(x =>
                {
                    x.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                });

                allocateResult.Item3.ForEach(x =>
                {
                    x.Status = OutLockStockStatusEnum.出库中.ObjToInt();
                });

                stockInfos = allocateResult.Item1;
                orderDetails = allocateResult.Item2;
                outStockLockInfos = allocateResult.Item3;
                locationInfos = allocateResult.Item4;
            }
            else
            {
                throw new Exception("无库存");
            }

            return (tasks, stockInfos, orderDetails, outStockLockInfos, locationInfos);
        }





        /// <summary>
        /// æ›´æ–°è®¢å•æ˜Žç»†çŠ¶æ€
        /// </summary>
        private void UpdateOrderDetailStatus(List<Dt_OutboundOrderDetail> details, decimal allocatedQuantity, decimal needQuantity)
        {
            foreach (var detail in details)
            {
                // æ ¹æ®åˆ†é…æƒ…况更新状态
                if (allocatedQuantity >= needQuantity)
                {
                    detail.OrderDetailStatus = OrderDetailStatusEnum.Outbound.ObjToInt();
                }
                else
                {
                    detail.OrderDetailStatus = OrderDetailStatusEnum.AssignOverPartial.ObjToInt();
                }
            }
        }



        private async Task<string> GenerateBatchNo()
        {
            var batchNo = UniqueValueGenerator.Generate();

            return $"Out{batchNo} ";
        }

        private async Task<Dt_OutboundBatch> CreateBatchRecord(string orderNo, int orderDetailId, decimal batchQuantity, string batchNo)
        {
            var batchRecord = new Dt_OutboundBatch
            {
                BatchNo = batchNo,
                OrderNo = orderNo,
                OrderDetailId = orderDetailId,
                BatchQuantity = batchQuantity,
                BatchStatus = (int)BatchStatusEnum.分配中,
                Operator = App.User.UserName
            };

            await _OutboundBatchRepository.Db.Insertable(batchRecord).ExecuteCommandAsync();
            return batchRecord;
        }

        #endregion


    }
}