提交

pan

5 天以前 7d3d385f0bdcf40b0c42d14ab526df318e04a433

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

@@ -1,6 +1,5 @@
using Microsoft.Extensions.Logging;
using SqlSugar;
using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -15,12 +14,14 @@
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Outbound;
using WIDESEA_IAllocateService;
using WIDESEA_IBasicService;
using WIDESEA_IOutboundService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
using WIDESEA_Model.Models.Outbound;
@@ -49,6 +50,7 @@
        private readonly IDailySequenceService _dailySequenceService;
        private readonly IAllocateService _allocateService;
        private readonly IRepository<Dt_OutboundBatch> _outboundBatchRepository;
        private readonly ITask_HtyService _task_HtyService;
        private readonly ILogger<OutboundPickingService> _logger;

        private Dictionary<string, string> stations = new Dictionary<string, string>
@@ -68,7 +70,7 @@
        public OutboundBatchPickingService(IRepository<Dt_PickingRecord> BaseDal, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, IStockService stockService,
            IOutStockLockInfoService outStockLockInfoService, IStockInfoDetailService stockInfoDetailService, ILocationInfoService locationInfoService,
            IOutboundOrderDetailService outboundOrderDetailService, ISplitPackageService splitPackageService, IOutboundOrderService outboundOrderService,
            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository) : base(BaseDal)
            IRepository<Dt_Task> taskRepository, IESSApiService eSSApiService, ILogger<OutboundPickingService> logger, IInvokeMESService invokeMESService, IDailySequenceService dailySequenceService, IAllocateService allocateService, IRepository<Dt_OutboundBatch> outboundBatchRepository, ITask_HtyService task_HtyService) : base(BaseDal)
        {
            _unitOfWorkManage = unitOfWorkManage;
            _stockInfoService = stockInfoService;
@@ -86,6 +88,7 @@
            _dailySequenceService = dailySequenceService;
            _allocateService = allocateService;
            _outboundBatchRepository = outboundBatchRepository;
            _task_HtyService = task_HtyService;
        }

        // <summary>
@@ -246,27 +249,48 @@

        #region åˆ†æ‰¹åˆ†æ‹£


        /// <summary>
        /// åˆ†æ‰¹åˆ†æ‹£ç¡®è®¤
        /// åˆ†æ‰¹åˆ†æ‹£ç¡®è®¤ - ä¿®æ­£ç‰ˆï¼ˆåŒ…含拆包后验证）
        /// </summary>
        public async Task<WebResponseContent> ConfirmBatchPicking(string orderNo, string palletCode, string barcode)
        {
            try
            {
                _logger.LogInformation($"【分拣开始】订单: {orderNo}, æ‰˜ç›˜: {palletCode}, æ¡ç : {barcode}");

                _unitOfWorkManage.BeginTran();

                // éªŒè¯åˆ†æ‹£è¯·æ±‚
                var validationResult = await ValidatePickingRequest(orderNo, palletCode, barcode);
                if (!validationResult.IsValid)
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
                }

                var (lockInfo, orderDetail, stockDetail, batch) = validationResult.Data;

                _logger.LogInformation($"验证通过 - é”å®šID: {lockInfo.Id}, åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}, å·²æ‹£é€‰: {lockInfo.PickedQty}");
                _logger.LogInformation($"库存信息 - æ¡ç : {stockDetail.Barcode}, åº“存数量: {stockDetail.StockQuantity}, å‡ºåº“数量: {stockDetail.OutboundQuantity}");


                decimal originalStockQtyBeforeSplit = stockDetail.StockQuantity;
                decimal originalOutboundQtyBeforeSplit = stockDetail.OutboundQuantity;

                // è®°å½•æ‹†åŒ…前的关键数据（用于后续验证）
                decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
                decimal originalLockQty = orderDetail.LockQuantity;
                decimal originalStockQty = stockDetail.StockQuantity;
                decimal originalOutboundQty = stockDetail.OutboundQuantity;

                // æ£€æŸ¥æ˜¯å¦éœ€è¦è‡ªåŠ¨æ‹†åŒ…
                var autoSplitResult = await CheckAndAutoSplitIfNeeded(lockInfo, stockDetail, palletCode);
                if (autoSplitResult != null)
                {
                    // å¦‚果执行了自动拆包，重新获取最新的锁定信息和库存信息
                    _logger.LogInformation($"执行了自动拆包，重新获取数据");

                    // é‡æ–°èŽ·å–最新的锁定信息和库存信息
                    var refreshedValidation = await ValidatePickingRequest(orderNo, palletCode, barcode);
                    if (!refreshedValidation.IsValid)
                    {
@@ -275,40 +299,56 @@
                    }

                    (lockInfo, orderDetail, stockDetail, batch) = refreshedValidation.Data;
                                

                    // è°ƒç”¨è‡ªåŠ¨æ‹†åŒ…后验证 
                    decimal splitQuantity =  autoSplitResult.FirstOrDefault()?.quantityTotal.ObjToDecimal()??0 ;
                    bool autoSplitValid = await ValidateAfterAutoSplit(lockInfo, orderDetail, stockDetail, splitQuantity,originalStockQtyBeforeSplit);

                    var actualPickedQty = lockInfo.AssignQuantity;
                    var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty);
                    if (!autoSplitValid)
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error("自动拆包后数据验证失败，请检查系统日志");
                    }

                    // æ›´æ–°æ‰¹æ¬¡å’Œè®¢å•æ•°æ®
                    await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo);

                    // è®°å½•æ‹£é€‰åŽ†å²
                    await RecordPickingHistory(pickingResult, orderNo, palletCode);

                    _unitOfWorkManage.CommitTran();

                    return WebResponseContent.Instance.OK("自动拆包并分拣成功", autoSplitResult);
                    _logger.LogInformation($"自动拆包验证通过，继续执行分拣");
                }

                // æ­£å¸¸åˆ†æ‹£æµç¨‹ï¼ˆä¸éœ€è¦è‡ªåŠ¨æ‹†åŒ…）
                var normalPickedQty = lockInfo.AssignQuantity;
                var normalPickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, normalPickedQty);
                // è®¡ç®—实际拣选数量
                decimal actualPickedQty = lockInfo.AssignQuantity - lockInfo.PickedQty;

                if (actualPickedQty <= 0)
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error("该条码已拣选完成，无需重复拣选");
                }

                _logger.LogInformation($"开始拣选 - æ•°é‡: {actualPickedQty}");

                // æ‰§è¡Œåˆ†æ‹£é€»è¾‘
                var pickingResult = await ExecutePickingLogic(lockInfo, orderDetail, stockDetail, actualPickedQty);

                // æ›´æ–°æ‰¹æ¬¡å’Œè®¢å•æ•°æ®
                await UpdateBatchAndOrderData(batch, orderDetail, normalPickedQty, orderNo);
                await UpdateBatchAndOrderData(batch, orderDetail, actualPickedQty, orderNo);

                // è®°å½•æ‹£é€‰åŽ†å²
                await RecordPickingHistory(normalPickingResult, orderNo, palletCode);
                //记录拣选历史
                await RecordPickingHistory(pickingResult, orderNo, palletCode);

                // æ‹£é€‰åŽéªŒè¯
                await ValidateAfterPicking(orderNo, palletCode, barcode, actualPickedQty);

                _unitOfWorkManage.CommitTran();

                return WebResponseContent.Instance.OK("分拣成功", new
                {
                    PickedQuantity = normalPickedQty,
                    PickedQuantity = actualPickedQty,
                    Barcode = barcode,
                    MaterialCode = lockInfo.MaterielCode,
                    AutoSplitted = false
                    AutoSplitted = autoSplitResult != null,
                    RemainingStock = stockDetail.StockQuantity,
                    CurrentOutbound = stockDetail.OutboundQuantity,
                    // å¦‚果是自动拆包，返回相关信息
                    UnallocatedCreated = autoSplitResult != null ? "是" : "否"
                });
            }
            catch (Exception ex)
@@ -318,6 +358,258 @@
                return WebResponseContent.Instance.Error($"分拣失败：{ex.Message}");
            }
        }


        /// <summary>
        /// è‡ªåŠ¨æ‹†åŒ…后验证数据一致性
        /// </summary>
        private async Task<bool> ValidateAfterAutoSplit(Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail,
            Dt_StockInfoDetail originalStockDetail, decimal splitQuantity, decimal originalStockQtyBeforeSplit)
        {
            try
            {
                _logger.LogInformation($"开始自动拆包后验证 - åŽŸæ¡ç : {originalStockDetail.Barcode}, æ‹†åŒ…数量: {splitQuantity}");
                _logger.LogInformation($"拆包前原库存数量: {originalStockQtyBeforeSplit}, åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");

                bool allValid = true;
                List<string> validationErrors = new List<string>();

                // é‡æ–°èŽ·å–最新的数据（拆包后的当前状态）
                var refreshedOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                    .FirstAsync(x => x.Id == orderDetail.Id);

                var refreshedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .FirstAsync(x => x.Id == lockInfo.Id);

                var refreshedStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Id == originalStockDetail.Id);

                // éªŒè¯åŽŸåº“存明细数据
                decimal expectedOriginalStockQty = lockInfo.AssignQuantity;

                _logger.LogInformation($"库存验证基准:");
                _logger.LogInformation($"  æ‹†åŒ…前原库存: {originalStockQtyBeforeSplit}");
                _logger.LogInformation($"  åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");
                _logger.LogInformation($"  æ‹†åŒ…数量: {splitQuantity}");
                _logger.LogInformation($"  æœŸæœ›åŽŸåº“å­˜: {expectedOriginalStockQty}");
                _logger.LogInformation($"  å®žé™…原库存: {refreshedStockDetail.StockQuantity}");

                // å…è®¸å°‘量误差的验证
                if (Math.Abs(refreshedStockDetail.StockQuantity - expectedOriginalStockQty) > 0.01m)
                {
                    // é¢å¤–检查：如果原库存数量不合理，可能是数据问题
                    if (refreshedStockDetail.StockQuantity < 0)
                    {
                        string error = $"原库存数量异常（负数）！实际: {refreshedStockDetail.StockQuantity}";
                        validationErrors.Add(error);
                        allValid = false;
                        _logger.LogError(error);
                    }
                    else if (refreshedStockDetail.StockQuantity > originalStockQtyBeforeSplit)
                    {
                        string error = $"原库存数量异常（大于拆包前）！拆包前: {originalStockQtyBeforeSplit}, å½“前: {refreshedStockDetail.StockQuantity}";
                        validationErrors.Add(error);
                        allValid = false;
                        _logger.LogError(error);
                    }
                    else
                    {
                        // å¯èƒ½æ˜¯åˆç†çš„误差，记录警告但不标记为失败
                        _logger.LogWarning($"原库存数量与期望值有差异，期望: {expectedOriginalStockQty}, å®žé™…: {refreshedStockDetail.StockQuantity}");
                    }
                }

                // éªŒè¯åŽŸåº“存的出库数量是否保持不变
                if (Math.Abs(refreshedStockDetail.OutboundQuantity - originalStockDetail.OutboundQuantity) > 0.01m)
                {
                    string error = $"原库存出库数量不应变化！拆包前: {originalStockDetail.OutboundQuantity}, æ‹†åŒ…后: {refreshedStockDetail.OutboundQuantity}";
                    validationErrors.Add(error);
                    allValid = false;
                    _logger.LogError(error);
                }

                // éªŒè¯æ–°åº“存明细（拆包产生的）
                // æŸ¥æ‰¾æ–°æ¡ç ï¼ˆé€šè¿‡æ‹†åŒ…记录）
                var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
                    .Where(x => x.OutStockLockInfoId == lockInfo.Id &&
                               !x.IsReverted &&
                               x.IsAutoSplit == true)
                    .OrderByDescending(x => x.SplitTime)
                    .ToListAsync();

                if (splitRecords.Any())
                {
                    var latestSplit = splitRecords.First();
                    if (!string.IsNullOrEmpty(latestSplit.NewBarcode))
                    {
                        var newStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                            .FirstAsync(x => x.Barcode == latestSplit.NewBarcode && x.StockId == originalStockDetail.StockId);

                        if (newStockDetail != null)
                        {
                            // æ–°åº“存的期望值 = æ‹†åŒ…数量
                            decimal expectedNewStockQty = splitQuantity;

                            _logger.LogInformation($"新库存验证:");
                            _logger.LogInformation($"  æ–°æ¡ç : {newStockDetail.Barcode}");
                            _logger.LogInformation($"  æœŸæœ›æ•°é‡: {expectedNewStockQty}");
                            _logger.LogInformation($"  å®žé™…数量: {newStockDetail.StockQuantity}");
                            _logger.LogInformation($"  å‡ºåº“数量: {newStockDetail.OutboundQuantity} (应为0)");

                            if (Math.Abs(newStockDetail.StockQuantity - expectedNewStockQty) > 0.01m)
                            {
                                string error = $"新库存数量不正确！期望: {expectedNewStockQty}, å®žé™…: {newStockDetail.StockQuantity}";
                                validationErrors.Add(error);
                                allValid = false;
                                _logger.LogError(error);
                            }

                            // æ–°åº“存出库数量应为0
                            if (Math.Abs(newStockDetail.OutboundQuantity - 0) > 0.01m)
                            {
                                string error = $"新库存出库数量不为0！实际: {newStockDetail.OutboundQuantity}";
                                validationErrors.Add(error);
                                allValid = false;
                                _logger.LogError(error);
                            }
                        }
                    }
                }

                // 4. éªŒè¯æœªåˆ†é…é”å®šè®°å½•
                var unallocatedLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.ParentLockId == lockInfo.Id &&
                               x.IsUnallocated == 1 &&
                               x.OrderDetailId == 0)
                    .ToListAsync();

                if (!unallocatedLocks.Any())
                {
                    string error = $"未找到自动拆包创建的未分配锁定记录";
                    validationErrors.Add(error);
                    allValid = false;
                    _logger.LogError(error);
                }

                // éªŒè¯è®¢å•æ˜Žç»†æ•°æ®æœªæ”¹å˜
                if (Math.Abs(refreshedOrderDetail.AllocatedQuantity - orderDetail.AllocatedQuantity) > 0.01m)
                {
                    string error = $"订单明细分配数量异常变化！拆包前: {orderDetail.AllocatedQuantity}, æ‹†åŒ…后: {refreshedOrderDetail.AllocatedQuantity}";
                    validationErrors.Add(error);
                    allValid = false;
                    _logger.LogError(error);
                }

                // éªŒè¯åŽŸé”å®šè®°å½•æ•°æ®æœªæ”¹å˜ï¼ˆåˆ†é…æ•°é‡ä¸å˜ï¼‰
                if (Math.Abs(refreshedLockInfo.AssignQuantity - lockInfo.AssignQuantity) > 0.01m)
                {
                    string error = $"锁定记录分配数量异常变化！拆包前: {lockInfo.AssignQuantity}, æ‹†åŒ…后: {refreshedLockInfo.AssignQuantity}";
                    validationErrors.Add(error);
                    allValid = false;
                    _logger.LogError(error);
                }

                // æ–°å¢žã€‘验证总库存守恒
                // æ‹†åŒ…前总库存 = åŽŸåº“存数量
                // æ‹†åŒ…后总库存 = åŽŸåº“存现有数量 + æ–°åº“存数量
                decimal totalStockAfterSplit = refreshedStockDetail.StockQuantity;
                if (splitRecords.Any() && !string.IsNullOrEmpty(splitRecords.First().NewBarcode))
                {
                    var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                        .FirstAsync(x => x.Barcode == splitRecords.First().NewBarcode);
                    if (newStock != null)
                    {
                        totalStockAfterSplit += newStock.StockQuantity;
                    }
                }

                _logger.LogInformation($"库存守恒验证:");
                _logger.LogInformation($"  æ‹†åŒ…前总库存: {originalStockQtyBeforeSplit}");
                _logger.LogInformation($"  æ‹†åŒ…后总库存: {totalStockAfterSplit}");
                _logger.LogInformation($"  å·®å¼‚: {originalStockQtyBeforeSplit - totalStockAfterSplit}");

                // å…è®¸å¾ˆå°çš„浮点数误差
                if (Math.Abs(originalStockQtyBeforeSplit - totalStockAfterSplit) > 0.02m)
                {
                    string error = $"库存不守恒！拆包前: {originalStockQtyBeforeSplit}, æ‹†åŒ…后总库存: {totalStockAfterSplit}";
                    validationErrors.Add(error);
                    allValid = false;
                    _logger.LogError(error);
                }

                // æ±‡æ€»éªŒè¯ç»“æžœ
                if (allValid)
                {
                    _logger.LogInformation($"✅ è‡ªåŠ¨æ‹†åŒ…后验证全部通过");
                }
                else
                {
                    string errorSummary = $"自动拆包后验证失败，发现{validationErrors.Count}个问题：" +
                                         string.Join("; ", validationErrors.Take(3));
                    _logger.LogError(errorSummary);

                    // è®°å½•è¯¦ç»†é—®é¢˜åˆ°æ—¥å¿—
                    for (int i = 0; i < validationErrors.Count; i++)
                    {
                        _logger.LogError($"问题{i + 1}: {validationErrors[i]}");
                    }
                }

                return allValid;
            }
            catch (Exception ex)
            {
                _logger.LogError($"自动拆包后验证异常: {ex.Message}");
                return false;
            }
        }


        /// <summary>
        /// æ‹£é€‰åŽéªŒè¯
        /// </summary>
        private async Task ValidateAfterPicking(string orderNo, string palletCode, string barcode, decimal pickedQty)
        {
            try
            {
                _logger.LogInformation($"开始拣选后验证");

                // éªŒè¯åº“存明细
                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Barcode == barcode);

                // æŸ¥æ‰¾è¯¥æ¡ç çš„所有拣选记录
                var pickingRecords = await Db.Queryable<Dt_PickingRecord>()
                    .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled)
                    .ToListAsync();

                decimal totalPickedFromRecords = pickingRecords.Sum(x => x.PickQuantity);

                _logger.LogInformation($"拣选验证 - æ¡ç : {barcode}");
                _logger.LogInformation($"  åº“存出库数量: {stockDetail.OutboundQuantity}");
                _logger.LogInformation($"  æ‹£é€‰è®°å½•æ€»å’Œ: {totalPickedFromRecords}");

                if (Math.Abs(stockDetail.OutboundQuantity - totalPickedFromRecords) > 0.01m)
                {
                    _logger.LogError($"拣选数据不一致！库存出库数量({stockDetail.OutboundQuantity}) â‰  æ‹£é€‰è®°å½•æ€»å’Œ({totalPickedFromRecords})");

                    // è‡ªåŠ¨ä¿®å¤ï¼šä»¥æ‹£é€‰è®°å½•æ€»å’Œä¸ºå‡†
                    decimal originalOutbound = stockDetail.OutboundQuantity;
                    stockDetail.OutboundQuantity = totalPickedFromRecords;
                    await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                    _logger.LogWarning($"已自动修复出库数量: {originalOutbound} -> {totalPickedFromRecords}");
                }

                _logger.LogInformation($"拣选后验证完成");
            }
            catch (Exception ex)
            {
                _logger.LogError($"拣选后验证失败: {ex.Message}");
            }
        }


        /// <summary>
        /// å–消分拣
        /// </summary>
@@ -366,77 +658,84 @@


        #region å–走空箱逻辑



        /// <summary>
        /// éªŒè¯ç©ºç®±å–走条件
        /// </summary>
        private async Task<ValidationResult<List<Dt_OutStockLockInfo>>> ValidateEmptyPalletRemoval(string orderNo, string palletCode)
        {
            // èŽ·å–托盘的所有锁定记录
            var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                .ToListAsync();

            if (!lockInfos.Any())
                return ValidationResult<List<Dt_OutStockLockInfo>>.Error("该托盘没有锁定记录");

            // æ£€æŸ¥æ˜¯å¦æœ‰æœªå®Œæˆçš„锁定记录
            var unfinishedLocks = lockInfos.Where(x =>
                x.Status == (int)OutLockStockStatusEnum.出库中 ||
                x.Status == (int)OutLockStockStatusEnum.回库中).ToList();

            if (unfinishedLocks.Any())
            {
                var unfinishedCount = unfinishedLocks.Count;
                var unfinishedQty = unfinishedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
                return ValidationResult<List<Dt_OutStockLockInfo>>.Error(
                    $"托盘还有{unfinishedCount}条未完成记录，剩余数量{unfinishedQty}，不能取走空箱");
            }

            // èŽ·å–已完成的锁定记录
            var completedLocks = lockInfos.Where(x =>
                x.Status == (int)OutLockStockStatusEnum.拣选完成).ToList();

            if (!completedLocks.Any())
                return ValidationResult<List<Dt_OutStockLockInfo>>.Error("该托盘没有已完成拣选的记录");

            return ValidationResult<List<Dt_OutStockLockInfo>>.Success(completedLocks);
        }

        /// <summary>
        /// æ¸…理已完成的锁定记录
        /// </summary>
        private async Task CleanupCompletedLocks(List<Dt_OutStockLockInfo> completedLocks)
        {
            foreach (var lockInfo in completedLocks)
            {
                // æ ‡è®°é”å®šè®°å½•ä¸ºå·²å–èµ°
                lockInfo.Status = (int)OutLockStockStatusEnum.已取走;
                lockInfo.Operator = App.User.UserName;
                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

                // æ¸…理对应的库存记录状态
                await CleanupStockInfo(lockInfo);
            }
        }

        /// <summary>
        /// æ¸…理库存信息
         /// <summary>
        /// æ¸…理库存信息 - å®Œæ•´ä¿®æ­£ç‰ˆ
        /// ç¡®ä¿OutboundQuantity正确清零
        /// </summary>
        private async Task CleanupStockInfo(Dt_OutStockLockInfo lockInfo)
        {
            var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

            if (stockDetail != null && stockDetail.Status == (int)StockStatusEmun.出库完成)
            try
            {
                stockDetail.Status = (int)StockStatusEmun.已清理;
                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
                _logger.LogInformation($"清理库存信息 - é”å®šID: {lockInfo.Id}, æ¡ç : {lockInfo.CurrentBarcode}");

                // æŸ¥æ‰¾é”å®šçš„库存明细
                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

                if (stockDetail != null)
                {
                    // è®°å½•æ¸…理前的状态
                    decimal originalStockQty = stockDetail.StockQuantity;
                    decimal originalOutboundQty = stockDetail.OutboundQuantity;
                    int originalStatus = stockDetail.Status;

                    _logger.LogInformation($"清理前状态 - åº“å­˜: {originalStockQty}, å‡ºåº“: {originalOutboundQty}, çŠ¶æ€: {GetStockStatusName(originalStatus)}");

                    // ã€é‡è¦ã€‘检查库存数量是否应该为0
                    if (lockInfo.Status == (int)OutLockStockStatusEnum.拣选完成)
                    {
                        if (stockDetail.StockQuantity > 0)
                        {
                            _logger.LogWarning($"拣选完成但库存不为0 - æ¡ç : {stockDetail.Barcode}, åº“å­˜: {stockDetail.StockQuantity}");
                        }
                    }

                    // æ¸…理库存和出库数量
                    stockDetail.StockQuantity = 0;
                    stockDetail.OutboundQuantity = 0; 
                    stockDetail.Status = (int)StockStatusEmun.已清理;

                    await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                    _logger.LogInformation($"清理库存明细完成");
                    _logger.LogInformation($"  åº“存数量: {originalStockQty} -> 0");
                    _logger.LogInformation($"  å‡ºåº“数量: {originalOutboundQty} -> 0");
                    _logger.LogInformation($"  çŠ¶æ€: {GetStockStatusName(originalStatus)} -> å·²æ¸…理");
                }
                else
                {
                    _logger.LogWarning($"未找到条码对应的库存明细: {lockInfo.CurrentBarcode}");
                }

                // æ¸…理该托盘上的所有库存（避免遗漏）
                var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == lockInfo.StockId && x.StockQuantity > 0)
                    .ToListAsync();

                if (allStockDetails.Any())
                {
                    _logger.LogInformation($"清理托盘上其他库存 - å…± {allStockDetails.Count} æ¡è®°å½•");

                    foreach (var stock in allStockDetails)
                    {
                        decimal originalQty = stock.StockQuantity;
                        decimal originalOutbound = stock.OutboundQuantity;

                        stock.StockQuantity = 0;
                        stock.OutboundQuantity = 0;  
                        stock.Status = (int)StockStatusEmun.已清理;

                        await _stockInfoDetailService.Db.Updateable(stock).ExecuteCommandAsync();
                        _logger.LogInformation($"清理遗漏库存 - æ¡ç : {stock.Barcode}, åº“å­˜: {originalQty}->0, å‡ºåº“: {originalOutbound}->0");
                    }
                }
            }
            catch (Exception ex)
            {
                _logger.LogError($"清理库存信息失败 - é”å®šID: {lockInfo.Id}, æ¡ç : {lockInfo.CurrentBarcode}, Error: {ex.Message}");
                // ä¸æŠ›å‡ºå¼‚常，继续处理其他记录
            }
        }


        /// <summary>
        /// æ›´æ–°è®¢å•çŠ¶æ€
@@ -472,17 +771,17 @@
        /// </summary>
        private async Task RecordEmptyPalletRemoval(string orderNo, string palletCode, List<Dt_OutStockLockInfo> completedLocks)
        {
            var removalRecord = new Dt_EmptyPalletRemoval
            {
                OrderNo = orderNo,
                PalletCode = palletCode,
                RemovalTime = DateTime.Now,
                Operator = App.User.UserName,
                CompletedItemsCount = completedLocks.Count,
                TotalPickedQuantity = completedLocks.Sum(x => x.PickedQty)
            };
            //var removalRecord = new Dt_EmptyPalletRemoval
            //{
            //    OrderNo = orderNo,
            //    PalletCode = palletCode,
            //    RemovalTime = DateTime.Now,
            //    Operator = App.User.UserName,
            //    CompletedItemsCount = completedLocks.Count,
            //    TotalPickedQuantity = completedLocks.Sum(x => x.PickedQty)
            //};

            await Db.Insertable(removalRecord).ExecuteCommandAsync();
            //await Db.Insertable(removalRecord).ExecuteCommandAsync();
        }

        #endregion
@@ -513,8 +812,7 @@
            }
        };
        }
      
    


        #region æ‰‹åŠ¨æ‹†åŒ…   

@@ -597,21 +895,21 @@

            _logger.LogInformation($"找到库存信息 - åº“存数量: {stockDetail.StockQuantity}, å‡ºåº“数量: {stockDetail.OutboundQuantity}");

            // é‡è¦ä¿®å¤ï¼šéªŒè¯æ‹†åŒ…数量不能大于库存数量
            // éªŒè¯æ‹†åŒ…数量不能大于库存数量
            if (stockDetail.StockQuantity < splitQuantity)
            {
                _logger.LogWarning($"拆包数量大于库存数量 - æ‹†åŒ…数量: {splitQuantity}, åº“存数量: {stockDetail.StockQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于库存数量，当前库存：{stockDetail.StockQuantity}");
            }

            // é‡è¦ä¿®å¤ï¼šéªŒè¯æ‹†åŒ…数量不能大于锁定信息的分配数量
            // éªŒè¯æ‹†åŒ…数量不能大于锁定信息的分配数量
            if (lockInfo.AssignQuantity < splitQuantity)
            {
                _logger.LogWarning($"拆包数量大于分配数量 - æ‹†åŒ…数量: {splitQuantity}, åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于分配数量，当前分配数量：{lockInfo.AssignQuantity}");
            }

            // é‡è¦ä¿®å¤ï¼šéªŒè¯æ‹†åŒ…数量不能大于锁定信息的未拣选数量
            // éªŒè¯æ‹†åŒ…数量不能大于锁定信息的未拣选数量
            decimal remainingToPick = lockInfo.AssignQuantity - lockInfo.PickedQty;
            if (remainingToPick < splitQuantity)
            {
@@ -619,21 +917,20 @@
                return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包数量不能大于未拣选数量，当前未拣选：{remainingToPick}");
            }

            // é‡è¦ä¿®å¤ï¼šéªŒè¯æ‹†åŒ…后原锁定信息的分配数量不会为负数
            // éªŒè¯æ‹†åŒ…后原锁定信息的分配数量不会为负数
            if (lockInfo.AssignQuantity - splitQuantity < 0)
            {
                _logger.LogWarning($"拆包后分配数量为负数 - å½“前分配数量: {lockInfo.AssignQuantity}, æ‹†åŒ…数量: {splitQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_StockInfoDetail)>.Error($"拆包后分配数量不能为负数");
            }

            // é‡è¦ä¿®å¤ï¼šéªŒè¯è®¢å•æ˜Žç»†çš„分配数量是否足够
            // éªŒè¯è®¢å•æ˜Žç»†çš„分配数量是否足够
            // æ³¨æ„ï¼šæ‰‹åŠ¨æ‹†åŒ…不会改变订单明细的分配数量，因为总分配数量不变
            // åªæ˜¯ä»Žä¸€ä¸ªé”å®šä¿¡æ¯è½¬ç§»åˆ°å¦ä¸€ä¸ªé”å®šä¿¡æ¯
            decimal totalLockAssignQuantity = await GetTotalLockAssignQuantity(orderDetail.Id);
            if (orderDetail.AllocatedQuantity != totalLockAssignQuantity)
            {
                _logger.LogWarning($"订单明细分配数量与锁定信息不一致 - è®¢å•æ˜Žç»†åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡: {totalLockAssignQuantity}");
                // è¿™é‡Œä¸ç›´æŽ¥è¿”回错误，因为拆包操作本身不会导致不一致，只是记录警告
            }

            _logger.LogInformation($"拆包验证通过 - åŽŸæ¡ç : {originalBarcode}, æ‹†åŒ…数量: {splitQuantity}");
@@ -653,129 +950,197 @@
            return lockInfos.Sum(x => x.AssignQuantity);
        }



        /// <summary>
        /// æ‰§è¡Œæ‰‹åŠ¨æ‹†åŒ…逻辑 - å¢žå¼ºåˆ†é…æ•°é‡æŽ§åˆ¶
        /// æ‰§è¡Œæ‰‹åŠ¨æ‹†åŒ…逻辑 - ä¿®å¤ç‰ˆæœ¬
        /// </summary>
        private async Task<List<SplitResult>> ExecuteManualSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
            decimal splitQuantity, string palletCode)
        {
            _logger.LogInformation($"开始执行手动拆包逻辑 - åŽŸæ¡ç : {stockDetail.Barcode}, æ‹†åŒ…数量: {splitQuantity}");

            // é‡è¦ä¿®å¤ï¼šèŽ·å–订单明细并验证分配数量
            try
            {
                // éªŒè¯åº“存数量是否足够
                decimal availableStock = stockDetail.StockQuantity;
                if (availableStock < splitQuantity)
                {
                    throw new InvalidOperationException($"库存不足，当前库存: {availableStock}, éœ€è¦æ‹†åŒ…: {splitQuantity}");
                }

                // éªŒè¯æ‹†åŒ…数量不能等于或大于原锁定信息分配数量
                if (splitQuantity >= lockInfo.AssignQuantity)
                {
                    throw new InvalidOperationException($"拆包数量不能等于或大于原锁定信息分配数量，拆包数量: {splitQuantity}, åŽŸåˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");
                }

                // è®¡ç®—剩余数量
                decimal remainQty = lockInfo.AssignQuantity - splitQuantity;

                // éªŒè¯å‰©ä½™æ•°é‡æ˜¯å¦åˆç†
                if (remainQty <= 0)
                {
                    throw new InvalidOperationException($"拆包后剩余数量必须大于0，当前剩余: {remainQty}");
                }

                _logger.LogInformation($"拆包计算 - åŽŸåˆ†é…æ•°é‡: {lockInfo.AssignQuantity}, æ‹†åŒ…数量: {splitQuantity}, å‰©ä½™æ•°é‡: {remainQty}");
                _logger.LogInformation($"原库存信息 - åº“存数量: {stockDetail.StockQuantity}, å‡ºåº“数量: {stockDetail.OutboundQuantity}");

                // ç”Ÿæˆæ–°æ¡ç 
                string newBarcode = await GenerateNewBarcode();
                _logger.LogInformation($"生成新条码: {newBarcode}");

                // è®°å½•æ‹†åŒ…前的关键数据
                decimal originalLockAssignQty = lockInfo.AssignQuantity;
                decimal originalLockOrderQty = lockInfo.OrderQuantity;
                decimal originalStockQty = stockDetail.StockQuantity;
                decimal originalOutboundQty = stockDetail.OutboundQuantity;

                // ä¿®å¤ï¼šè®¡ç®—新库存明细的正确数量
                // æ–°æ¡ç åº”该只有拆包数量，而不是2倍
                decimal newStockQuantity = splitQuantity;
                decimal originalRemainingStockQuantity = originalStockQty - splitQuantity;

                _logger.LogInformation($"数量分配 - æ–°æ¡ç æ•°é‡: {newStockQuantity}, åŽŸæ¡ç å‰©ä½™æ•°é‡: {originalRemainingStockQuantity}");

                // åˆ›å»ºæ–°åº“存明细 - ä¿®å¤æ•°é‡é—®é¢˜
                var newStockDetail = new Dt_StockInfoDetail
                {
                    StockId = stockDetail.StockId,
                    MaterielCode = stockDetail.MaterielCode,
                    OrderNo = stockDetail.OrderNo,
                    BatchNo = stockDetail.BatchNo,
                    StockQuantity = newStockQuantity,  // ä¿®å¤ï¼šä½¿ç”¨æ­£ç¡®çš„拆包数量
                    OutboundQuantity = 0,  // æ–°æ¡ç åˆå§‹å‡ºåº“数量为0
                    Barcode = newBarcode,
                    Status = (int)StockStatusEmun.出库锁定,
                    SupplyCode = stockDetail.SupplyCode,
                    Unit = stockDetail.Unit,
                    BarcodeQty = stockDetail.BarcodeQty,
                    BarcodeUnit = stockDetail.BarcodeUnit,
                    BusinessType = stockDetail.BusinessType,
                    InboundOrderRowNo = stockDetail.InboundOrderRowNo,
                };

                await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
                _logger.LogInformation($"创建新库存明细成功 - æ¡ç : {newBarcode}, åº“存数量: {newStockQuantity}");

                // æ›´æ–°åŽŸåº“存明细 
                stockDetail.StockQuantity = originalRemainingStockQuantity;

                // ç¡®ä¿ä¸ä¼šä¸ºè´Ÿæ•°
                if (stockDetail.StockQuantity < 0)
                {
                    _logger.LogWarning($"原库存数量出现负数，重置为0");
                    stockDetail.StockQuantity = 0;
                }             

                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
                _logger.LogInformation($"更新原库存明细 - æ¡ç : {stockDetail.Barcode}, " +
                                     $"库存数量: {originalStockQty} -> {stockDetail.StockQuantity}, " +
                                     $"出库数量: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");

                // åˆ›å»ºæ–°é”å®šä¿¡æ¯
                var newLockInfo = new Dt_OutStockLockInfo
                {
                    OrderNo = lockInfo.OrderNo,
                    OrderDetailId = lockInfo.OrderDetailId,
                    OutboundBatchNo = lockInfo.OutboundBatchNo,
                    MaterielCode = lockInfo.MaterielCode,
                    MaterielName = lockInfo.MaterielName,
                    StockId = lockInfo.StockId,
                    OrderQuantity = splitQuantity,
                    AssignQuantity = splitQuantity,
                    PickedQty = 0,
                    LocationCode = lockInfo.LocationCode,
                    PalletCode = lockInfo.PalletCode,
                    TaskNum = lockInfo.TaskNum,
                    Status = (int)OutLockStockStatusEnum.出库中,
                    Unit = lockInfo.Unit,
                    SupplyCode = lockInfo.SupplyCode,
                    OrderType = lockInfo.OrderType,
                    CurrentBarcode = newBarcode,
                    IsSplitted = 1,
                    ParentLockId = lockInfo.Id,
                    Operator = App.User.UserName,
                    FactoryArea = lockInfo.FactoryArea,
                    lineNo = lockInfo.lineNo,
                    WarehouseCode = lockInfo.WarehouseCode,
                    BarcodeQty = lockInfo.BarcodeQty,
                    BarcodeUnit = lockInfo.BarcodeUnit,
                };

                await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
                _logger.LogInformation($"创建新锁定信息成功 - æ¡ç : {newBarcode}, åˆ†é…æ•°é‡: {splitQuantity}");

                // æ›´æ–°åŽŸé”å®šä¿¡æ¯
                lockInfo.AssignQuantity = remainQty;
                lockInfo.OrderQuantity = remainQty;

                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
                _logger.LogInformation($"更新原锁定信息 - åˆ†é…æ•°é‡: {originalLockAssignQty} -> {lockInfo.AssignQuantity}, " +
                                     $"订单数量: {originalLockOrderQty} -> {lockInfo.OrderQuantity}");

                // éªŒè¯æ‹†åŒ…后数据一致性
                await ValidateDataConsistencyAfterSplit(lockInfo.OrderDetailId, originalLockAssignQty, originalLockOrderQty);

                // è®°å½•æ‹†åŒ…历史
                await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, false, originalStockQty);

                // åˆ›å»ºæ‹†åŒ…结果列表
                var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);

                _logger.LogInformation($"手动拆包逻辑执行完成 - åŽŸæ¡ç : {stockDetail.Barcode}, æ–°æ¡ç : {newBarcode}, æ‹†åŒ…数量: {splitQuantity}");

                return splitResults;
            }
            catch (Exception ex)
            {
                _logger.LogError($"手动拆包逻辑执行失败 - åŽŸæ¡ç : {stockDetail.Barcode}, æ‹†åŒ…数量: {splitQuantity}, Error: {ex.Message}");
                throw;
            }
        }

      /// <summary>
        /// éªŒè¯æ‹†åŒ…后数据一致性
        /// </summary>
        private async Task ValidateDataConsistencyAfterSplit(long orderDetailId, decimal expectedAllocatedQty, decimal expectedLockQty)
        {
            // é‡æ–°èŽ·å–订单明细数据
            var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                .FirstAsync(x => x.Id == lockInfo.OrderDetailId);
                .FirstAsync(x => x.Id == orderDetailId);

            if (orderDetail == null)
                throw new InvalidOperationException("未找到订单明细");
                return;

            // éªŒè¯æ‹†åŒ…数量不会导致分配数量为负数
            if (lockInfo.AssignQuantity < splitQuantity)
            // è®¡ç®—所有锁定信息的总分配数量
            var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(x => x.OrderDetailId == orderDetailId)
                .ToListAsync();

            decimal totalLockAssignQty = allLocks.Sum(x => x.AssignQuantity);

            _logger.LogInformation($"数据一致性验证 - è®¢å•æ˜Žç»†åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡: {totalLockAssignQty}");

            // å¦‚果数据不一致，记录警告
            if (Math.Abs(orderDetail.AllocatedQuantity - totalLockAssignQty) > 0.01m)
            {
                throw new InvalidOperationException($"拆包数量超过锁定信息分配数量，拆包数量: {splitQuantity}, åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");
                _logger.LogWarning($"数据不一致 - è®¢å•æ˜Žç»†åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡: {totalLockAssignQty}");
            }

            // ç”Ÿæˆæ–°æ¡ç 
            string newBarcode = await GenerateNewBarcode();

            // è®°å½•æ‹†åŒ…前的分配数量
            decimal originalAssignQtyBefore = lockInfo.AssignQuantity;
            decimal originalOrderQtyBefore = lockInfo.OrderQuantity;
            decimal remainQty = originalAssignQtyBefore - splitQuantity;
            if (remainQty < 0)
            // éªŒè¯åˆ†é…æ•°é‡æ²¡æœ‰å¼‚常变化
            if (Math.Abs(orderDetail.AllocatedQuantity - expectedAllocatedQty) > 0.01m)
            {
                throw new InvalidOperationException($"拆包后剩余数量为负数，原分配数量: {originalAssignQtyBefore}, æ‹†åŒ…数量: {splitQuantity}");
                _logger.LogWarning($"分配数量异常变化 - æœŸæœ›: {expectedAllocatedQty}, å®žé™…: {orderDetail.AllocatedQuantity}");
            }
            //  åˆ›å»ºæ–°åº“存明细
            var newStockDetail = new Dt_StockInfoDetail
            {
                StockId = stockDetail.StockId,
                MaterielCode = stockDetail.MaterielCode,
                OrderNo = stockDetail.OrderNo,
                BatchNo = stockDetail.BatchNo,
                StockQuantity = splitQuantity,
                OutboundQuantity = 0,
                Barcode = newBarcode,
                Status = (int)StockStatusEmun.出库锁定,
                SupplyCode = stockDetail.SupplyCode,
                Unit = stockDetail.Unit,
                BarcodeQty = stockDetail.BarcodeQty,
                BarcodeUnit = stockDetail.BarcodeUnit,
                BusinessType = stockDetail.BusinessType,
                InboundOrderRowNo = stockDetail.InboundOrderRowNo,
            };
            await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
            _logger.LogInformation($"创建新库存明细 - æ¡ç : {newBarcode}, åº“存数量: {splitQuantity}");

            //  æ›´æ–°åŽŸåº“存明细
            decimal originalStockQtyBefore = stockDetail.StockQuantity;
            stockDetail.StockQuantity -= splitQuantity;
            if (stockDetail.StockQuantity < 0)
            if (Math.Abs(orderDetail.LockQuantity - expectedLockQty) > 0.01m)
            {
                stockDetail.StockQuantity = 0;
                _logger.LogWarning($"原库存数量出现负数，重置为0");
                _logger.LogWarning($"锁定数量异常变化 - æœŸæœ›: {expectedLockQty}, å®žé™…: {orderDetail.LockQuantity}");
            }
            await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
            _logger.LogInformation($"更新原库存明细 - åº“存数量从 {originalStockQtyBefore} å‡å°‘到 {stockDetail.StockQuantity}");

            //   åˆ›å»ºæ–°é”å®šä¿¡æ¯
            var newLockInfo = new Dt_OutStockLockInfo
            {
                OrderNo = lockInfo.OrderNo,
                OrderDetailId = lockInfo.OrderDetailId,
                OutboundBatchNo = lockInfo.OutboundBatchNo,
                MaterielCode = lockInfo.MaterielCode,
                MaterielName = lockInfo.MaterielName,
                StockId = lockInfo.StockId,
                OrderQuantity = splitQuantity,
                AssignQuantity = splitQuantity,
                PickedQty = 0,
                LocationCode = lockInfo.LocationCode,
                PalletCode = lockInfo.PalletCode,
                TaskNum = lockInfo.TaskNum,
                Status = (int)OutLockStockStatusEnum.出库中,
                Unit = lockInfo.Unit,
                SupplyCode = lockInfo.SupplyCode,
                OrderType = lockInfo.OrderType,
                CurrentBarcode = newBarcode,
                IsSplitted = 1,
                ParentLockId = lockInfo.Id,
                Operator = App.User.UserName,
                FactoryArea = lockInfo.FactoryArea,
                lineNo = lockInfo.lineNo,
                WarehouseCode = lockInfo.WarehouseCode,
                BarcodeQty = lockInfo.BarcodeQty,
                BarcodeUnit = lockInfo.BarcodeUnit,
            };

            await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
            _logger.LogInformation($"创建新锁定信息 - æ¡ç : {newBarcode}, åˆ†é…æ•°é‡: {splitQuantity}");

            //  æ›´æ–°åŽŸé”å®šä¿¡æ¯
            lockInfo.AssignQuantity = remainQty;
            lockInfo.OrderQuantity = remainQty;

            _logger.LogInformation($"更新原锁定信息 - åˆ†é…æ•°é‡ä»Ž {originalAssignQtyBefore} å‡å°‘到 {lockInfo.AssignQuantity}");
            _logger.LogInformation($"更新原锁定信息 - è®¢å•æ•°é‡ä»Ž {originalOrderQtyBefore} å‡å°‘到 {lockInfo.OrderQuantity}");

            await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

          
            _logger.LogInformation($"订单明细分配数量保持不变 - å·²åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}");

            //   è®°å½•æ‹†åŒ…历史
            await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, false);

            //  åˆ›å»ºæ‹†åŒ…结果列表
            var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);

            _logger.LogInformation($"手动拆包逻辑执行完成");

            return splitResults;
        }
 
        #endregion



        #region å–消拆包 

@@ -788,18 +1153,18 @@
            {
                _unitOfWorkManage.BeginTran();

                // 1. æŸ¥æ‰¾æ‹†åŒ…记录并验证
                // æŸ¥æ‰¾æ‹†åŒ…记录并验证
                var validationResult = await ValidateCancelSplitRequest(orderNo, palletCode, newBarcode);
                if (!validationResult.IsValid)
                    return WebResponseContent.Instance.Error(validationResult.ErrorMessage);

                var (splitRecord, newLockInfo, newStockDetail) = validationResult.Data;

                // 2. æŸ¥æ‰¾åŽŸå§‹é”å®šä¿¡æ¯
                // æŸ¥æ‰¾åŽŸå§‹é”å®šä¿¡æ¯
                var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .FirstAsync(x => x.Id == splitRecord.OutStockLockInfoId);

                // 3. æ£€æŸ¥è¯¥æ¡ç æ˜¯å¦è¢«å†æ¬¡æ‹†åŒ…
                //  æ£€æŸ¥è¯¥æ¡ç æ˜¯å¦è¢«å†æ¬¡æ‹†åŒ…
                var childSplitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
                    .Where(x => x.OriginalBarcode == newBarcode && !x.IsReverted)
                    .ToListAsync();
@@ -809,7 +1174,7 @@
                    return WebResponseContent.Instance.Error("该条码已被再次拆包，请先取消后续的拆包操作");
                }

                // 4. æ‰§è¡Œå–消拆包逻辑
                //  æ‰§è¡Œå–消拆包逻辑
                await ExecuteCancelSplitLogic(splitRecord, originalLockInfo, newLockInfo, newStockDetail);

                _unitOfWorkManage.CommitTran();
@@ -833,25 +1198,113 @@
        {
            _logger.LogInformation($"开始执行取消拆包逻辑 - åŽŸæ¡ç : {splitRecord.OriginalBarcode}, æ–°æ¡ç : {splitRecord.NewBarcode}, æ‹†åŒ…数量: {splitRecord.SplitQty}");

            // æ¢å¤åŽŸé”å®šä¿¡æ¯
            decimal originalAssignQtyBefore = originalLockInfo.AssignQuantity;
            decimal originalOrderQtyBefore = originalLockInfo.OrderQuantity;
            try
            {
                // æ ¹æ®æ‹†åŒ…类型调用不同的处理方法
                if (splitRecord.IsAutoSplit)
                {
                    await HandleAutoSplitCancel(splitRecord, originalLockInfo, newLockInfo, newStockDetail);
                }
                else
                {
                    await HandleManualSplitCancel(splitRecord, originalLockInfo, newLockInfo, newStockDetail);
                }

 
                // éªŒè¯å–消拆包后数据一致性
                await ValidateDataConsistencyAfterCancelSplit(originalLockInfo.OrderDetailId,
                    originalLockInfo.AssignQuantity, originalLockInfo.OrderQuantity,
                    splitRecord.IsAutoSplit, splitRecord.SplitQty);

                // æ£€æŸ¥å¹¶æ›´æ–°æ‰¹æ¬¡å’Œè®¢å•çŠ¶æ€
                await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo);
                await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo);

                _logger.LogInformation($"取消拆包逻辑执行完成");
            }
            catch (Exception ex)
            {
                _logger.LogError($"取消拆包逻辑执行失败: {ex.Message}");
                throw;
            }
        }

        /// <summary>
        /// å¤„理自动拆包取消
        /// </summary>
        private async Task HandleAutoSplitCancel(Dt_SplitPackageRecord splitRecord,
            Dt_OutStockLockInfo originalLockInfo, Dt_OutStockLockInfo newLockInfo,
            Dt_StockInfoDetail newStockDetail)
        {
            _logger.LogInformation($"处理自动拆包取消 - åŽŸæ¡ç : {splitRecord.OriginalBarcode}, æ–°æ¡ç : {splitRecord.NewBarcode}");

            // èŽ·å–订单明细
            var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                .FirstAsync(x => x.Id == originalLockInfo.OrderDetailId);

            if (orderDetail == null)
                throw new InvalidOperationException("未找到订单明细");

            //  æ¢å¤è®¢å•æ˜Žç»†çš„分配数量
            decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
            decimal originalLockQty = orderDetail.LockQuantity;

            orderDetail.AllocatedQuantity -= splitRecord.SplitQty;
            orderDetail.LockQuantity -= splitRecord.SplitQty;

            // è¾¹ç•Œæ£€æŸ¥
            if (orderDetail.AllocatedQuantity < 0) orderDetail.AllocatedQuantity = 0;
            if (orderDetail.LockQuantity < 0) orderDetail.LockQuantity = 0;

            await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
            _logger.LogInformation($"自动拆包取消恢复订单明细 - åˆ†é…æ•°é‡: {originalAllocatedQty} -> {orderDetail.AllocatedQuantity}");

            //  æ¢å¤åŽŸåº“å­˜
            var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == splitRecord.StockId);

            if (originalStock != null)
            {
                decimal originalStockQty = originalStock.StockQuantity;
                originalStock.StockQuantity += splitRecord.SplitQty;

                // å¦‚果原库存状态是出库完成，恢复为出库锁定
                if (originalStock.Status == (int)StockStatusEmun.出库完成)
                {
                    originalStock.Status = (int)StockStatusEmun.出库锁定;
                }

                await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync();
                _logger.LogInformation($"自动拆包取消恢复原库存 - æ¡ç : {originalStock.Barcode}, æ•°é‡: {originalStockQty} -> {originalStock.StockQuantity}");
            }

            // åˆ é™¤æ–°é”å®šä¿¡æ¯å’Œåº“存明细
            await DeleteNewSplitRecords(newLockInfo, newStockDetail);
        }

        /// <summary>
        /// å¤„理手动拆包取消
        /// </summary>
        private async Task HandleManualSplitCancel(Dt_SplitPackageRecord splitRecord,
            Dt_OutStockLockInfo originalLockInfo, Dt_OutStockLockInfo newLockInfo,
            Dt_StockInfoDetail newStockDetail)
        {
            _logger.LogInformation($"处理手动拆包取消 - åŽŸæ¡ç : {splitRecord.OriginalBarcode}, æ–°æ¡ç : {splitRecord.NewBarcode}");

            //  æ¢å¤åŽŸé”å®šä¿¡æ¯çš„分配数量
            decimal originalAssignQty = originalLockInfo.AssignQuantity;
            decimal originalOrderQty = originalLockInfo.OrderQuantity;

            originalLockInfo.AssignQuantity += splitRecord.SplitQty;
            originalLockInfo.OrderQuantity += splitRecord.SplitQty;

            _logger.LogInformation($"恢复原锁定信息 - åˆ†é…æ•°é‡ä»Ž {originalAssignQtyBefore} å¢žåŠ åˆ° {originalLockInfo.AssignQuantity}");
            _logger.LogInformation($"恢复原锁定信息 - è®¢å•æ•°é‡ä»Ž {originalOrderQtyBefore} å¢žåŠ åˆ° {originalLockInfo.OrderQuantity}");

            // å¦‚果原锁定信息的状态是拣选完成，需要重新设置为出库中
            // æ¢å¤çŠ¶æ€
            if (originalLockInfo.Status == (int)OutLockStockStatusEnum.拣选完成)
            {
                originalLockInfo.Status = (int)OutLockStockStatusEnum.出库中;
                _logger.LogInformation($"原锁定信息状态从拣选完成恢复为出库中");
            }

            await _outStockLockInfoService.Db.Updateable(originalLockInfo).ExecuteCommandAsync();
            _logger.LogInformation($"手动拆包取消恢复原锁定信息 - åˆ†é…æ•°é‡: {originalAssignQty} -> {originalLockInfo.AssignQuantity}");

            // æ¢å¤åŽŸåº“存明细
            var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
@@ -859,50 +1312,128 @@

            if (originalStock != null)
            {
                decimal originalStockQtyBefore = originalStock.StockQuantity;
                decimal originalStockQty = originalStock.StockQuantity;
                originalStock.StockQuantity += splitRecord.SplitQty;

                _logger.LogInformation($"恢复原库存明细 - åº“存数量从 {originalStockQtyBefore} å¢žåŠ åˆ° {originalStock.StockQuantity}");

                // å¦‚果原库存状态是出库完成，需要重新设置为出库锁定
                // æ¢å¤åº“存状态
                if (originalStock.Status == (int)StockStatusEmun.出库完成)
                {
                    originalStock.Status = (int)StockStatusEmun.出库锁定;
                    _logger.LogInformation($"原库存状态从出库完成恢复为出库锁定");
                }

                await _stockInfoDetailService.Db.Updateable(originalStock).ExecuteCommandAsync();
                _logger.LogInformation($"手动拆包取消恢复原库存 - æ¡ç : {originalStock.Barcode}, æ•°é‡: {originalStockQty} -> {originalStock.StockQuantity}");
            }

            // åˆ é™¤æ–°é”å®šä¿¡æ¯å’Œåº“存明细
            await DeleteNewSplitRecords(newLockInfo, newStockDetail);
        }

        /// <summary>
        /// åˆ é™¤æ–°æ‹†åŒ…记录相关的数据
        /// </summary>
        private async Task DeleteNewSplitRecords(Dt_OutStockLockInfo newLockInfo, Dt_StockInfoDetail newStockDetail)
        {
            // åˆ é™¤æ–°é”å®šä¿¡æ¯
            if (newLockInfo != null)
            {
                // åˆ é™¤æ–°é”å®šä¿¡æ¯
                _logger.LogInformation($"删除新锁定信息 - æ¡ç : {newLockInfo?.CurrentBarcode}, åˆ†é…æ•°é‡: {newLockInfo?.AssignQuantity}");
                _logger.LogInformation($"删除新锁定信息 - æ¡ç : {newLockInfo.CurrentBarcode}, åˆ†é…æ•°é‡: {newLockInfo.AssignQuantity}");
                await _outStockLockInfoService.Db.Deleteable<Dt_OutStockLockInfo>()
                    .Where(x => x.Id == newLockInfo.Id)
                    .ExecuteCommandAsync();

                //  åˆ é™¤æ–°åº“存明细
                _logger.LogInformation($"删除新库存明细 - æ¡ç : {newStockDetail.Barcode}, åº“存数量: {newStockDetail.StockQuantity}");
                await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
                    .Where(x => x.Barcode == newLockInfo.CurrentBarcode)
                    .ExecuteCommandAsync();
            }

            // æ ‡è®°æ‹†åŒ…记录为已撤销
            splitRecord.IsReverted = true;
            splitRecord.RevertTime = DateTime.Now;
            splitRecord.RevertOperator = App.User.UserName;
            await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync();
            _logger.LogInformation($"标记拆包记录为已撤销");

            // æ£€æŸ¥å¹¶æ›´æ–°æ‰¹æ¬¡å’Œè®¢å•çŠ¶æ€
            await CheckAndUpdateBatchStatus(originalLockInfo.BatchNo);
            await CheckAndUpdateOrderStatus(originalLockInfo.OrderNo);

            _logger.LogInformation($"取消拆包逻辑执行完成");
            // åˆ é™¤æ–°åº“存明细
            if (newStockDetail != null)
            {
                _logger.LogInformation($"删除新库存明细 - æ¡ç : {newStockDetail.Barcode}, åº“存数量: {newStockDetail.StockQuantity}");
                await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
                    .Where(x => x.Barcode == newStockDetail.Barcode)
                    .ExecuteCommandAsync();
            }
        }

        /// <summary>
        /// éªŒè¯å–消拆包后数据一致性 - æœ€æ–°ç‰ˆæœ¬
        /// </summary>
        private async Task ValidateDataConsistencyAfterCancelSplit(long orderDetailId, decimal originalAllocatedQty, decimal originalLockQty, bool isAutoSplit, decimal splitQuantity)
        {
            // é‡æ–°èŽ·å–订单明细数据
            var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                .FirstAsync(x => x.Id == orderDetailId);

            if (orderDetail == null)
                return;

            // è®¡ç®—所有锁定信息的总分配数量
            var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(x => x.OrderDetailId == orderDetailId)
                .ToListAsync();

            decimal totalLockAssignQty = allLocks.Sum(x => x.AssignQuantity);

            _logger.LogInformation($"取消拆包后数据一致性验证 - è®¢å•æ˜Žç»†åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡: {totalLockAssignQty}");

            // æ ¹æ®æ‹†åŒ…类型计算期望值
            decimal expectedAllocatedQty;
            decimal expectedLockQty;

            if (isAutoSplit)
            {
                // è‡ªåŠ¨æ‹†åŒ…取消：分配数量应该减少拆包数量
                expectedAllocatedQty = originalAllocatedQty - splitQuantity;
                expectedLockQty = originalLockQty - splitQuantity;

                _logger.LogInformation($"取消自动拆包期望值 - åˆ†é…æ•°é‡: {expectedAllocatedQty}, é”å®šæ•°é‡: {expectedLockQty}");
            }
            else
            {
                // æ‰‹åŠ¨æ‹†åŒ…取消：分配数量应该保持不变
                expectedAllocatedQty = originalAllocatedQty;
                expectedLockQty = originalLockQty;

                _logger.LogInformation($"取消手动拆包期望值 - åˆ†é…æ•°é‡: {expectedAllocatedQty}, é”å®šæ•°é‡: {expectedLockQty}");
            }

            // è¾¹ç•Œæ£€æŸ¥ï¼šç¡®ä¿æœŸæœ›å€¼ä¸ä¸ºè´Ÿæ•°
            if (expectedAllocatedQty < 0)
            {
                _logger.LogWarning($"期望分配数量为负数，重置为0。计算值: {expectedAllocatedQty}");
                expectedAllocatedQty = 0;
            }

            if (expectedLockQty < 0)
            {
                _logger.LogWarning($"期望锁定数量为负数，重置为0。计算值: {expectedLockQty}");
                expectedLockQty = 0;
            }

            // éªŒè¯åˆ†é…æ•°é‡
            if (Math.Abs(orderDetail.AllocatedQuantity - expectedAllocatedQty) > 0.01m)
            {
                _logger.LogWarning($"取消拆包后分配数量异常 - æœŸæœ›: {expectedAllocatedQty}, å®žé™…: {orderDetail.AllocatedQuantity}");
            }

            // éªŒè¯é”å®šæ•°é‡
            if (Math.Abs(orderDetail.LockQuantity - expectedLockQty) > 0.01m)
            {
                _logger.LogWarning($"取消拆包后锁定数量异常 - æœŸæœ›: {expectedLockQty}, å®žé™…: {orderDetail.LockQuantity}");
            }

            // éªŒè¯è®¢å•æ˜Žç»†åˆ†é…æ•°é‡ä¸Žé”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡çš„一致性
            if (Math.Abs(orderDetail.AllocatedQuantity - totalLockAssignQty) > 0.01m)
            {
                _logger.LogWarning($"取消拆包后数据不一致 - è®¢å•æ˜Žç»†åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šä¿¡æ¯æ€»åˆ†é…æ•°é‡: {totalLockAssignQty}");
            }

            // è®°å½•è¯¦ç»†çš„一致性报告
            _logger.LogInformation($"取消拆包数据一致性报告 - " +
                                  $"订单明细分配数量: {orderDetail.AllocatedQuantity}, " +
                                  $"订单明细锁定数量: {orderDetail.LockQuantity}, " +
                                  $"锁定信息总分配数量: {totalLockAssignQty}, " +
                                  $"拆包类型: {(isAutoSplit ? "自动" : "手动")}, " +
                                  $"拆包数量: {splitQuantity}");
        }
        /// <summary>
        /// éªŒè¯å–消拆包请求 
        /// </summary>
@@ -935,7 +1466,7 @@

            _logger.LogInformation($"找到新锁定信息 - çŠ¶æ€: {newLockInfo.Status}, å·²æ‹£é€‰: {newLockInfo.PickedQty}, åˆ†é…æ•°é‡: {newLockInfo.AssignQuantity}");

            // é‡è¦ä¿®å¤ï¼šæ£€æŸ¥æ–°æ¡ç æ˜¯å¦å·²è¢«åˆ†æ‹£
            // æ£€æŸ¥æ–°æ¡ç æ˜¯å¦å·²è¢«åˆ†æ‹£
            var newBarcodePickingRecords = await Db.Queryable<Dt_PickingRecord>()
                .Where(x => x.Barcode == newBarcode && x.OrderNo == orderNo && !x.IsCancelled)
                .ToListAsync();
@@ -948,7 +1479,7 @@
                    $"新条码已被分拣（已拣选数量：{totalPickedQty}），请先取消分拣，然后再取消拆包");
            }

            // é‡è¦ä¿®å¤ï¼šæ£€æŸ¥åŽŸæ¡ç æ˜¯å¦å·²è¢«åˆ†æ‹£
            // æ£€æŸ¥åŽŸæ¡ç æ˜¯å¦å·²è¢«åˆ†æ‹£
            var originalBarcodePickingRecords = await Db.Queryable<Dt_PickingRecord>()
                .Where(x => x.Barcode == splitRecord.OriginalBarcode && x.OrderNo == orderNo && !x.IsCancelled)
                .ToListAsync();
@@ -1000,7 +1531,7 @@
            {
                _unitOfWorkManage.BeginTran();

                // 1. æŸ¥æ‰¾æ‰€æœ‰ç›¸å…³çš„拆包记录（形成拆包链）
                // æŸ¥æ‰¾æ‰€æœ‰ç›¸å…³çš„拆包记录（形成拆包链）
                var splitChain = await GetSplitPackageChain(orderNo, startBarcode);

                if (!splitChain.Any())
@@ -1008,11 +1539,11 @@

                _logger.LogInformation($"找到拆包链，共 {splitChain.Count} æ¡è®°å½•");

                // 2. æ”¶é›†æ‹†åŒ…链中涉及的所有条码（包括原条码和新条码）
                // æ”¶é›†æ‹†åŒ…链中涉及的所有条码（包括原条码和新条码）
                var allBarcodesInChain = new List<string> { startBarcode };
                allBarcodesInChain.AddRange(splitChain.Select(x => x.NewBarcode));

                // 3. æ£€æŸ¥æ‹†åŒ…链中是否有已被分拣的条码
                // æ£€æŸ¥æ‹†åŒ…链中是否有已被分拣的条码
                var pickedBarcodesInfo = await GetPickedBarcodesInfo(orderNo, allBarcodesInChain);

                if (pickedBarcodesInfo.Any())
@@ -1022,7 +1553,7 @@
                        $"以下条码已被分拣，请先取消分拣：{pickedBarcodes}");
                }

                // 4. æŒ‰æ‹†åŒ…顺序倒序取消（从最新的开始取消）
                // æŒ‰æ‹†åŒ…顺序倒序取消（从最新的开始取消）
                var reversedChain = splitChain.OrderByDescending(x => x.SplitTime).ToList();

                foreach (var splitRecord in reversedChain)
@@ -1043,106 +1574,7 @@
            }
        }

        /// <summary>
        /// èŽ·å–条码的拆包和拣选状态
        /// </summary>
        public async Task<WebResponseContent> GetBarcodeSplitAndPickStatus(string orderNo, string barcode)
        {
            try
            {
                // 1. èŽ·å–拆包信息
                var splitChain = await GetSplitPackageChain(orderNo, barcode);
                var isOriginalBarcode = !splitChain.Any(x => x.NewBarcode == barcode);

                // 2. èŽ·å–拣选信息
                var pickingRecords = await Db.Queryable<Dt_PickingRecord>()
                    .Where(x => x.Barcode == barcode && x.OrderNo == orderNo && !x.IsCancelled)
                    .ToListAsync();

                var totalPickedQty = pickingRecords.Sum(x => x.PickQuantity);

                // 3. èŽ·å–锁定信息
                var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.CurrentBarcode == barcode && x.OrderNo == orderNo)
                    .FirstAsync();

                // 4. èŽ·å–库存信息
                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.Barcode == barcode)
                    .FirstAsync();

                var statusInfo = new BarcodeStatusInfoDto
                {
                    Barcode = barcode,
                    OrderNo = orderNo,
                    IsOriginalBarcode = isOriginalBarcode,
                    SplitChainCount = splitChain.Count,
                    HasBeenPicked = pickingRecords.Any(),
                    TotalPickedQuantity = totalPickedQty,
                    PickRecordCount = pickingRecords.Count,
                    LockInfoStatus = lockInfo?.Status ?? 0,
                    LockInfoPickedQty = lockInfo?.PickedQty ?? 0,
                    LockInfoAssignQty = lockInfo?.AssignQuantity ?? 0,
                    StockQuantity = stockDetail?.StockQuantity ?? 0,
                    StockStatus = stockDetail?.Status ?? 0,
                    CanCancelSplit = !pickingRecords.Any(), // æœªè¢«åˆ†æ‹£æ‰èƒ½å–消拆包
                    NeedCancelPickFirst = pickingRecords.Any() // éœ€è¦å…ˆå–消分拣
                };

                // 5. èŽ·å–操作建议
                statusInfo.OperationSuggestions = GetOperationSuggestions(statusInfo);

                return WebResponseContent.Instance.OK("获取状态成功", statusInfo);
            }
            catch (Exception ex)
            {
                _logger.LogError($"获取条码状态失败 - OrderNo: {orderNo}, Barcode: {barcode}, Error: {ex.Message}");
                return WebResponseContent.Instance.Error("获取条码状态失败");
            }
        }
        /// <summary>
        /// èŽ·å–操作建议
        /// </summary>
        private List<string> GetOperationSuggestions(BarcodeStatusInfoDto statusInfo)
        {
            var suggestions = new List<string>();

            if (statusInfo.HasBeenPicked)
            {
                suggestions.Add($"该条码已被分拣（数量：{statusInfo.TotalPickedQuantity}），如需取消拆包，请先取消分拣");

                if (statusInfo.IsOriginalBarcode)
                {
                    suggestions.Add("这是原条码，取消分拣后将恢复为可分拣状态");
                }
                else
                {
                    suggestions.Add("这是拆包生成的新条码，取消分拣后才能取消拆包");
                }
            }
            else
            {
                if (statusInfo.IsOriginalBarcode && statusInfo.SplitChainCount > 0)
                {
                    suggestions.Add("这是原条码，可以取消拆包链");
                }
                else if (!statusInfo.IsOriginalBarcode)
                {
                    suggestions.Add("这是拆包生成的新条码，可以单独取消拆包");
                }
            }

            if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.拣选完成)
            {
                suggestions.Add("锁定状态：拣选完成");
            }
            else if (statusInfo.LockInfoStatus == (int)OutLockStockStatusEnum.出库中)
            {
                suggestions.Add("锁定状态：出库中");
            }

            return suggestions;
        }
        
        /// <summary>
        /// èŽ·å–已被分拣的条码信息
        /// </summary>
@@ -1366,7 +1798,904 @@

        #endregion

         #region ç»Ÿä¸€å›žåº“逻辑
        #region ç»Ÿä¸€å›žåº“逻辑
             
        /// <summary>
        /// ç»Ÿä¸€å›žåº“方法
        /// </summary>
        public async Task<WebResponseContent> ExecutePalletReturn(string orderNo, string palletCode, string returnReason = "分批回库")
        {
            ReturnTaskInfo returnTaskInfo = null;
            try
            {
                _logger.LogInformation($"【增强回库开始】订单: {orderNo}, æ‰˜ç›˜: {palletCode}");

                _unitOfWorkManage.BeginTran();

                //  åŸºç¡€éªŒè¯
                if (string.IsNullOrEmpty(orderNo) || string.IsNullOrEmpty(palletCode))
                    return WebResponseContent.Instance.Error("订单号和托盘码不能为空");

                // èŽ·å–库存信息
                var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>().FirstAsync(x => x.PalletCode == palletCode);

                if (stockInfo == null)
                    return WebResponseContent.Instance.Error($"未找到托盘 {palletCode} å¯¹åº”的库存信息");

                int stockId = stockInfo.Id;

                //  æ‰§è¡Œå›žåº“前数据验证
                var validationResult = await ValidateDataBeforeReturn(orderNo, palletCode, stockId);
                if (!validationResult.IsValid)
                {
                    _logger.LogWarning($"回库前数据验证失败: {validationResult.ErrorMessage}");                 
                }

                // åˆ†æžæ‰˜ç›˜çŠ¶æ€
                var statusAnalysis = await AnalyzePalletStatusForReturn(orderNo, palletCode, stockInfo.Id);

                if (!statusAnalysis.HasItemsToReturn)
                {
                    try
                    {
                        _logger.LogInformation($"【无回库物品】处理空托盘");
                        var result = await HandleEmptyPalletReturn(orderNo, palletCode, stockInfo);
                        _unitOfWorkManage.CommitTran();

                        // åœ¨äº‹åŠ¡æäº¤åŽå¤„理ESS命令
                        if (result.Status && result.Data is ReturnTaskInfo taskInfo)
                        {
                            await ProcessESSAfterTransaction(palletCode, taskInfo);
                        }
                        return result;
                    }
                    catch (Exception ex)
                    {
                        _unitOfWorkManage.RollbackTran();
                        _logger.LogError($"空箱回库ExecutePalletReturn失败: {ex.Message}");
                        return WebResponseContent.Instance.Error($"空箱回库ExecutePalletReturn失败：{ex.Message}");
                    }
                }

                _logger.LogInformation($"【开始回库】总回库数量: {statusAnalysis.TotalReturnQty}, æ¡ç æ•°: {statusAnalysis.AllBarcodes.Count}");

                //  æ‰§è¡Œå›žåº“操作
                try
                {
                    await ExecuteEnhancedReturnOperations(statusAnalysis);
                }
                catch (Exception ex)
                {
                    _logger.LogError($"主回库方法失败: {ex.Message}");
                    // å°è¯•ç®€åŒ–方法
                    await ExecuteSimpleReturnDataOperations(statusAnalysis);
                }

                //  æ›´æ–°è®¢å•çŠ¶æ€
                await UpdateOrderStatusAfterReturn(orderNo);
                            
                //  åˆ›å»ºå›žåº“任务
                try
                {
                    // åˆ›å»ºå›žåº“任务，但不发送ESS命令
                    returnTaskInfo = await CreateReturnTaskWithoutESS(orderNo, palletCode, stockInfo);

                }
                catch (Exception taskEx)
                {
                    _logger.LogError($"回库任务CreateReturnTaskWithoutESS创建失败: {taskEx.Message}");
                    // ä»»åŠ¡åˆ›å»ºå¤±è´¥ä¸å½±å“æ•°æ®å›žåº“
                }
                _unitOfWorkManage.CommitTran();

                // åœ¨äº‹åŠ¡æäº¤åŽå¤„理ESS命令
                if (returnTaskInfo != null && returnTaskInfo.ShouldSendESS)
                {
                    await ProcessESSAfterTransaction(palletCode, returnTaskInfo);
                }
                //  å›žåº“后验证
                await ValidateDataAfterReturn(orderNo, palletCode, stockId);

                return WebResponseContent.Instance.OK($"回库成功，回库数量：{statusAnalysis.TotalReturnQty}", new
                {
                    ReturnQuantity = statusAnalysis.TotalReturnQty,
                    ReturnBarcodes = statusAnalysis.AllBarcodes,
                    Reason = returnReason,
                    PalletCode = palletCode,
                    OrderNo = orderNo
                });
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                _logger.LogError($"ExecutePalletReturn å›žåº“失败: {ex.Message}");
                return WebResponseContent.Instance.Error($"ExecutePalletReturn å›žåº“失败：{ex.Message}");
            }
        }

        /// <summary>
        /// äº‹åŠ¡æäº¤åŽå¤„理ESS命令 - ç‹¬ç«‹æ–¹æ³•ï¼Œé¿å…äº‹åŠ¡é”
        /// </summary>
        private async Task ProcessESSAfterTransaction(string palletCode, ReturnTaskInfo taskInfo)
        {
            try
            {
                _logger.LogInformation($"开始处理ESS命令 - æ‰˜ç›˜: {palletCode}");

                if (taskInfo == null || !taskInfo.ShouldSendESS || taskInfo.ReturnTask == null)
                {
                    _logger.LogWarning($"无需发送ESS命令或任务信息不完整");
                    return;
                }

                // å‘送ESS命令
                await SendESSCommands(palletCode, taskInfo.OriginalTaskTargetAddress, taskInfo.ReturnTask);

                _logger.LogInformation($"ESS命令处理完成 - æ‰˜ç›˜: {palletCode}, ä»»åŠ¡å·: {taskInfo.ReturnTask.TaskNum}");
            }
            catch (Exception ex)
            {
                _logger.LogError($"处理ESS命令失败 - æ‰˜ç›˜: {palletCode}, Error: {ex.Message}");
                // è¿™é‡Œä¸æŠ›å‡ºå¼‚常，因为数据回库已经成功，ESS命令发送失败可以稍后重试
            }
        }
        /// <summary>
        /// åˆ›å»ºå›žåº“任务（不发送ESS命令）- ç”¨äºŽäº‹åŠ¡å†…处理
        /// </summary>
        private async Task<ReturnTaskInfo> CreateReturnTaskWithoutESS(string orderNo, string palletCode, Dt_StockInfo stockInfo)
        {
            try
            {
                // èŽ·å–当前任务信息
                var currentTask = await _taskRepository.Db.Queryable<Dt_Task>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .FirstAsync();

                if (currentTask == null)
                {
                    _logger.LogWarning($"未找到当前任务 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");
                    return null;
                }

                // åˆ†é…æ–°è´§ä½
                var newLocation = _locationInfoService.AssignLocation(stockInfo.LocationType);

                var returnTask = new Dt_Task()
                {
                    CurrentAddress = stations[currentTask.TargetAddress],
                    Grade = 0,
                    PalletCode = palletCode,
                    NextAddress = "",
                    OrderNo = orderNo,
                    Roadway = newLocation.RoadwayNo,
                    SourceAddress = stations[currentTask.TargetAddress],
                    TargetAddress = newLocation.LocationCode,
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    TaskType = TaskTypeEnum.InPick.ObjToInt(),
                    PalletType = stockInfo.PalletType,
                    WarehouseId = currentTask.WarehouseId
                };

                try
                {
                    await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();

                    _logger.LogInformation($"创建回库任务成功: {returnTask.TaskNum}, è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");

                    // åˆ é™¤åŽŸå§‹å‡ºåº“任务
                    _logger.LogInformation($"开始删除历史任务: {orderNo}, {currentTask.TaskNum}");
                    var result = _task_HtyService.DeleteAndMoveIntoHty(currentTask, OperateTypeEnum.人工删除);
                    await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();

                    if (!result)
                    {
                        await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
                    }
                    _logger.LogInformation($"删除历史任务完成: {currentTask.TaskNum}, å½±å“è¡Œæ•°: {result}");

                    // è¿”回任务信息，但不发送ESS命令
                    return new ReturnTaskInfo
                    {
                        ShouldSendESS = true,
                        PalletCode = palletCode,
                        OriginalTaskTargetAddress = currentTask.TargetAddress,
                        ReturnTask = returnTask
                    };
                }
                catch (Exception ex)
                {
                    _logger.LogError($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, Error: {ex.Message}");
                    throw new Exception($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}", ex);
                }
            }
            catch (Exception ex)
            {
                _logger.LogError($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, Error: {ex.Message}");
                return null;
            }
        }
        /// <summary>
        /// å¢žå¼ºçš„回库前数据验证
        /// </summary>
        private async Task<ValidationResult<bool>> ValidateDataBeforeReturn(string orderNo, string palletCode, int stockId)
        {
            var errors = new List<string>();

            try
            {
                //  éªŒè¯åº“存数据
                var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == stockId)
                    .ToListAsync();

                // æ£€æŸ¥åº“存数量是否为负数
                var negativeStocks = stockDetails.Where(x => x.StockQuantity < 0).ToList();
                if (negativeStocks.Any())
                {
                    errors.Add($"发现负数库存: {string.Join(", ", negativeStocks.Select(x => $"{x.Barcode}:{x.StockQuantity}"))}");
                }

                //  éªŒè¯é”å®šè®°å½•
                var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .ToListAsync();

                // æ£€æŸ¥å·²æ‹£é€‰æ•°é‡æ˜¯å¦å¤§äºŽåˆ†é…æ•°é‡
                var invalidLocks = lockInfos.Where(x => x.PickedQty > x.AssignQuantity).ToList();
                if (invalidLocks.Any())
                {
                    errors.Add($"发现已拣选数量大于分配数量的锁定记录");
                }

                //  éªŒè¯æ‹†åŒ…记录
                var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .ToListAsync();

                // æ£€æŸ¥å¾ªçŽ¯æ‹†åŒ…
                var barcodeMap = new Dictionary<string, string>();
                foreach (var record in splitRecords.Where(x => !x.IsReverted))
                {
                    if (!barcodeMap.ContainsKey(record.OriginalBarcode))
                        barcodeMap[record.OriginalBarcode] = record.NewBarcode;
                }

                // æ£€æŸ¥å¾ªçŽ¯å¼•ç”¨
                foreach (var record in splitRecords)
                {
                    var current = record.OriginalBarcode;
                    var visited = new HashSet<string>();

                    while (barcodeMap.ContainsKey(current))
                    {
                        if (visited.Contains(current))
                        {
                            errors.Add($"发现循环拆包引用: {record.OriginalBarcode}");
                            break;
                        }
                        visited.Add(current);
                        current = barcodeMap[current];
                    }
                }

                if (errors.Any())
                {
                    return ValidationResult<bool>.Error($"回库前数据验证发现问题: {string.Join("; ", errors)}");
                }

                return ValidationResult<bool>.Success(true);
            }
            catch (Exception ex)
            {
                _logger.LogError($"数据验证失败: {ex.Message}");
                return ValidationResult<bool>.Error($"数据验证异常: {ex.Message}");
            }
        }

        // <summary>
        /// æ‰§è¡Œå¢žå¼ºçš„回库操作 - ä¿®æ­£ç‰ˆï¼ˆé¿å…é‡å¤å¤„理）
        /// </summary>
        private async Task ExecuteEnhancedReturnOperations(PalletStatusAnalysis statusAnalysis)
        {
            _logger.LogInformation($"【开始执行回库操作】订单: {statusAnalysis.OrderNo}, æ‰˜ç›˜: {statusAnalysis.PalletCode}");

            // ä½¿ç”¨æœ¬åœ°å·²å¤„理集合，避免重复
            var locallyProcessedBarcodes = new HashSet<string>();
            decimal totalProcessedQty = 0;

            // å¤„理已分配的锁定记录
            if (statusAnalysis.HasRemainingLocks)
            {
                _logger.LogInformation($"处理已分配锁定记录 - {statusAnalysis.RemainingLocks.Count} æ¡");
                foreach (var lockInfo in statusAnalysis.RemainingLocks)
                {
                    if (string.IsNullOrEmpty(lockInfo.CurrentBarcode) ||
                        locallyProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
                    {
                        _logger.LogInformation($"跳过已处理条码的锁定记录: {lockInfo.CurrentBarcode}");
                        continue;
                    }

                    decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
                    if (returnQty > 0)
                    {
                        // ã€ä¿®å¤ã€‘传递 isUnallocated = false
                        await ProcessSingleBarcodeReturn(lockInfo.CurrentBarcode, statusAnalysis.StockId, returnQty, false);
                        locallyProcessedBarcodes.Add(lockInfo.CurrentBarcode);
                        totalProcessedQty += returnQty;
                        _logger.LogInformation($"已处理锁定记录 - æ¡ç : {lockInfo.CurrentBarcode}, æ•°é‡: {returnQty}");
                    }
                }
            }

            //  å¤„理未分配的锁定记录
            if (statusAnalysis.HasUnallocatedLocks)
            {
                _logger.LogInformation($"处理未分配锁定记录 - {statusAnalysis.UnallocatedLocks.Count} æ¡");
                foreach (var lockInfo in statusAnalysis.UnallocatedLocks)
                {
                    if (string.IsNullOrEmpty(lockInfo.CurrentBarcode) ||
                        locallyProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
                    {
                        _logger.LogInformation($"跳过已处理条码的未分配锁定: {lockInfo.CurrentBarcode}");
                        continue;
                    }

                    decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;
                    if (returnQty > 0)
                    {
                        // ã€ä¿®å¤ã€‘使用专门的未分配锁定处理方法
                        await ProcessUnallocatedLockReturn(lockInfo, returnQty);
                        locallyProcessedBarcodes.Add(lockInfo.CurrentBarcode);
                        totalProcessedQty += returnQty;
                        _logger.LogInformation($"已处理未分配锁定 - æ¡ç : {lockInfo.CurrentBarcode}, æ•°é‡: {returnQty}");
                    }
                }
            }

            // å¤„理未分配的库存货物
            if (statusAnalysis.HasPalletStockGoods)
            {
                _logger.LogInformation($"处理未分配库存货物 - {statusAnalysis.PalletStockGoods.Count} ä¸ª");
                foreach (var stockDetail in statusAnalysis.PalletStockGoods)
                {
                    if (string.IsNullOrEmpty(stockDetail.Barcode) ||
                        locallyProcessedBarcodes.Contains(stockDetail.Barcode))
                    {
                        _logger.LogInformation($"跳过已处理条码的库存: {stockDetail.Barcode}");
                        continue;
                    }

                    decimal returnQty = stockDetail.StockQuantity;
                    if (returnQty > 0)
                    {
                        await ProcessUnallocatedStockReturn(stockDetail);
                        locallyProcessedBarcodes.Add(stockDetail.Barcode);
                        totalProcessedQty += returnQty;
                        _logger.LogInformation($"已处理未分配库存 - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {returnQty}");
                    }
                }
            }

            // å¤„理拆包记录 - åªå¤„理未被其他逻辑覆盖的条码
            if (statusAnalysis.HasSplitRecords && statusAnalysis.SplitReturnQty > 0)
            {
                _logger.LogInformation($"处理拆包记录相关库存 - æ–°å¢žæ•°é‡: {statusAnalysis.SplitReturnQty}");

                // åªå¤„理在SplitRecords中但不在已处理集合中的条码
                var splitBarcodes = statusAnalysis.SplitRecords
                    .SelectMany(r => new[] { r.OriginalBarcode, r.NewBarcode })
                    .Where(b => !string.IsNullOrEmpty(b))
                    .Distinct()
                    .ToList();

                foreach (var barcode in splitBarcodes)
                {
                    if (locallyProcessedBarcodes.Contains(barcode))
                    {
                        _logger.LogInformation($"跳过已处理的拆包条码: {barcode}");
                        continue;
                    }

                    var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                        .FirstAsync(x => x.Barcode == barcode && x.StockId == statusAnalysis.StockId);

                    if (stockDetail != null && stockDetail.StockQuantity > 0)
                    {
                        decimal returnQty = stockDetail.StockQuantity;
                        await ProcessSingleBarcodeReturn(barcode, statusAnalysis.StockId, returnQty);
                        locallyProcessedBarcodes.Add(barcode);
                        totalProcessedQty += returnQty;
                        _logger.LogInformation($"处理拆包条码 - {barcode}, æ•°é‡: {returnQty}");
                    }
                }
            }

            _logger.LogInformation($"【回库操作完成】总处理数量: {totalProcessedQty}, å¤„理条码数: {locallyProcessedBarcodes.Count}");

            // éªŒè¯å¤„理数量与预期一致
            if (Math.Abs(totalProcessedQty - statusAnalysis.TotalReturnQty) > 0.01m)
            {
                _logger.LogWarning($"处理数量({totalProcessedQty})与预期({statusAnalysis.TotalReturnQty})不一致，但继续执行");
            }
        }


        /// <summary>
        /// å¤„理单个条码回库（通用方法）- åŒºåˆ†å·²åˆ†é…å’Œæœªåˆ†é…
        /// </summary>
        private async Task ProcessSingleBarcodeReturn(string barcode, int stockId, decimal returnQty, bool isUnallocated = false)
        {
            try
            {
                _logger.LogInformation($"处理单个条码回库 - {barcode}, æ•°é‡: {returnQty}, æ˜¯å¦æœªåˆ†é…: {isUnallocated}");

                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Barcode == barcode && x.StockId == stockId);

                if (stockDetail == null)
                {
                    _logger.LogWarning($"未找到库存明细: {barcode}");
                    return;
                }

                decimal originalStockQty = stockDetail.StockQuantity;
                decimal originalOutboundQty = stockDetail.OutboundQuantity;
                int originalStatus = stockDetail.Status;

                _logger.LogInformation($"回库前状态 - åº“å­˜: {originalStockQty}, å‡ºåº“: {originalOutboundQty}, çŠ¶æ€: {GetStockStatusName(originalStatus)}");

                // æ ¹æ®æ˜¯å¦æœªåˆ†é…å†³å®šå¤„理逻辑
                if (isUnallocated)
                {
                    // æœªåˆ†é…é”å®šï¼šåªæ¢å¤çŠ¶æ€ï¼Œä¸æ”¹å˜åº“存数量
                    // å‡ºåº“数量应为0
                    if (stockDetail.OutboundQuantity > 0)
                    {
                        _logger.LogWarning($"未分配锁定的库存出库数量不为0，重置为0 - æ¡ç : {stockDetail.Barcode}, å½“前出库: {stockDetail.OutboundQuantity}");
                        stockDetail.OutboundQuantity = 0;
                    }

                    // åº“存数量保持不变
                    _logger.LogInformation($"未分配锁定回库 - åº“存数量保持不变: {stockDetail.StockQuantity}");
                }
                else
                {
                    // å·²åˆ†é…é”å®šï¼šæ¢å¤åº“存数量
                    stockDetail.StockQuantity += returnQty;

                    // å‡å°‘出库数量（如果出库数量大于0）
                    if (stockDetail.OutboundQuantity >= returnQty)
                    {
                        stockDetail.OutboundQuantity -= returnQty;
                    }
                    else
                    {
                        // å¦‚果出库数量小于回库数量，说明数据异常，出库数量清零
                        _logger.LogWarning($"出库数量({stockDetail.OutboundQuantity})小于回库数量({returnQty})，清零");
                        stockDetail.OutboundQuantity = 0;
                    }

                    _logger.LogInformation($"已分配锁定回库 - åº“存数量增加: {originalStockQty} -> {stockDetail.StockQuantity}");
                }

                // æ›´æ–°çŠ¶æ€
                stockDetail.Status = (int)StockStatusEmun.入库完成;

                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                _logger.LogInformation($"条码回库完成 - {barcode}: åº“å­˜ {originalStockQty}->{stockDetail.StockQuantity}, å‡ºåº“ {originalOutboundQty}->{stockDetail.OutboundQuantity}");
            }
            catch (Exception ex)
            {
                _logger.LogError($"处理条码回库失败 - {barcode}: {ex.Message}");
                throw;
            }
        }
        /// <summary>
        /// å¤„理未分配锁定记录回库 - ä¿®å¤ç‰ˆæœ¬
        /// æœªåˆ†é…é”å®šè®°å½•ï¼šåªæ¢å¤çŠ¶æ€ï¼Œä¸å¢žåŠ åº“存数量
        /// </summary>
        private async Task ProcessUnallocatedLockReturn(Dt_OutStockLockInfo lockInfo, decimal returnQty)
        {
            _logger.LogInformation($"处理未分配锁定回库 - é”å®šID: {lockInfo.Id}, æ¡ç : {lockInfo.CurrentBarcode}, æ•°é‡: {returnQty}");

            try
            {
                // éªŒè¯é”å®šè®°å½•çŠ¶æ€
                if (lockInfo.Status != (int)OutLockStockStatusEnum.出库中 &&
                    lockInfo.Status != (int)OutLockStockStatusEnum.回库中)
                {
                    _logger.LogWarning($"锁定记录状态不是出库中或回库中，跳过处理 - çŠ¶æ€: {lockInfo.Status}");
                    return;
                }

                // èŽ·å–库存明细
                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

                if (stockDetail == null)
                {
                    _logger.LogError($"未找到库存明细 - æ¡ç : {lockInfo.CurrentBarcode}, StockId: {lockInfo.StockId}");
                    throw new InvalidOperationException($"库存明细不存在: {lockInfo.CurrentBarcode}");
                }

                // è®°å½•åŽŸå§‹çŠ¶æ€
                decimal originalStockQty = stockDetail.StockQuantity;
                decimal originalOutboundQty = stockDetail.OutboundQuantity;
                int originalStatus = stockDetail.Status;

                _logger.LogInformation($"未分配锁定回库前状态:");
                _logger.LogInformation($"  åº“å­˜ - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {originalStockQty}, å‡ºåº“: {originalOutboundQty}, çŠ¶æ€: {GetStockStatusName(originalStatus)}");

                // å¯¹äºŽæœªåˆ†é…é”å®šè®°å½•ï¼Œåº“存数量不应改变！
                // å› ä¸ºåº“存本来就存在，只是状态被锁定
                // stockDetail.StockQuantity ä¿æŒä¸å˜

                // å‡ºåº“数量应为0（未分配锁定不应该有出库）
                if (stockDetail.OutboundQuantity > 0)
                {
                    _logger.LogWarning($"未分配锁定的库存出库数量不为0，重置为0 - æ¡ç : {stockDetail.Barcode}, å½“前出库: {stockDetail.OutboundQuantity}");
                    stockDetail.OutboundQuantity = 0;
                }

                // æ›´æ–°åº“存状态为入库完成（恢复为可用状态）
                stockDetail.Status = (int)StockStatusEmun.入库完成;

                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                _logger.LogInformation($"更新未分配库存状态 - æ¡ç : {stockDetail.Barcode}");
                _logger.LogInformation($"  åº“存数量: {originalStockQty} -> {stockDetail.StockQuantity} (保持不变)");
                _logger.LogInformation($"  å‡ºåº“数量: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");
                _logger.LogInformation($"  çŠ¶æ€: {GetStockStatusName(originalStatus)} -> {GetStockStatusName(stockDetail.Status)}");

                // æ›´æ–°é”å®šè®°å½•çŠ¶æ€ä¸ºå·²å›žåº“
                lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
                lockInfo.Operator = App.User.UserName;

                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

                _logger.LogInformation($"更新未分配锁定状态 - é”å®šID: {lockInfo.Id}, çŠ¶æ€: å‡ºåº“中 -> å·²å›žåº“");
            }
            catch (Exception ex)
            {
                _logger.LogError($"处理未分配锁定回库失败 - é”å®šID: {lockInfo.Id}, Error: {ex.Message}");
                throw new InvalidOperationException($"处理未分配锁定回库失败: {ex.Message}", ex);
            }
        }

        /// <summary>
        /// å¤„理未分配库存回库
        /// </summary>
        private async Task ProcessUnallocatedStockReturn(Dt_StockInfoDetail stockDetail)
        {
            _logger.LogInformation($"处理未分配库存回库 - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {stockDetail.StockQuantity}");

            // ç›´æŽ¥æ›´æ–°åº“存状态
            stockDetail.Status = (int)StockStatusEmun.入库完成;
            await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
        }


        /// <summary>
        /// å›žåº“后数据验证 - å¢žå¼ºç‰ˆ
        /// </summary>
        private async Task ValidateDataAfterReturn(string orderNo, string palletCode, int stockId)
        {
            try
            {
                _logger.LogInformation($"开始回库后数据验证");

                //  éªŒè¯åº“存状态和数量
                var stockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == stockId)
                    .ToListAsync();

                decimal totalStock = stockDetails.Sum(x => x.StockQuantity);

                // éªŒè¯åº“存数量是否合理
                var unreasonableStocks = stockDetails.Where(x => x.StockQuantity < 0).ToList();
                if (unreasonableStocks.Any())
                {
                    _logger.LogError($"发现负数库存数量！条码: {string.Join(", ", unreasonableStocks.Select(x => x.Barcode))}");
                }

                //  éªŒè¯é”å®šè®°å½•çŠ¶æ€
                var lockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .ToListAsync();

                var notReturnedLocks = lockInfos.Where(x =>
                    x.Status != (int)OutLockStockStatusEnum.已回库 &&
                    x.Status != (int)OutLockStockStatusEnum.已取走 &&
                    x.Status != (int)OutLockStockStatusEnum.拣选完成).ToList();

                if (notReturnedLocks.Any())
                {
                    _logger.LogWarning($"回库后仍有未回库状态的锁定记录: {notReturnedLocks.Count}条");
                    foreach (var lockInfo in notReturnedLocks)
                    {
                        _logger.LogWarning($"未回库锁定 - ID: {lockInfo.Id}, çŠ¶æ€: {GetLockStatusName(lockInfo.Status)}, æ¡ç : {lockInfo.CurrentBarcode}");
                    }
                }

                // æ•°æ®ä¸€è‡´æ€§éªŒè¯
                decimal totalExpectedReturnQty = lockInfos
                    .Where(x => x.Status == (int)OutLockStockStatusEnum.已回库)
                    .Sum(x => x.AssignQuantity - x.PickedQty);

                _logger.LogInformation($"回库验证汇总:");
                _logger.LogInformation($"  å›žåº“后库存总量: {totalStock}");
                _logger.LogInformation($"  å·²å›žåº“锁定记录数量: {lockInfos.Count(x => x.Status == (int)OutLockStockStatusEnum.已回库)}");
                _logger.LogInformation($"  æ€»å›žåº“数量（锁定记录计算）: {totalExpectedReturnQty}");

                // éªŒè¯åº“存数量与锁定记录的一致性
                foreach (var lockInfo in lockInfos.Where(x => !string.IsNullOrEmpty(x.CurrentBarcode)))
                {
                    var stock = stockDetails.FirstOrDefault(x => x.Barcode == lockInfo.CurrentBarcode);
                    if (stock != null)
                    {
                        // å¦‚果锁定记录是已回库状态，对应的库存应该是入库完成状态
                        if (lockInfo.Status == (int)OutLockStockStatusEnum.已回库 &&
                            stock.Status != (int)StockStatusEmun.入库完成)
                        {
                            _logger.LogWarning($"锁定记录已回库但库存状态不正确 - æ¡ç : {lockInfo.CurrentBarcode}, åº“存状态: {GetStockStatusName(stock.Status)}");
                        }
                    }
                }

                _logger.LogInformation($"回库后数据验证完成");
            }
            catch (Exception ex)
            {
                _logger.LogError($"回库后验证失败: {ex.Message}");
            }
        }

    
        private string GetLockStatusName(int status)
        {
            return status switch
            {
                1 => "出库中",
                2 => "拣选完成",
                3 => "已回库",
                4 => "已取走",
                _ => $"未知({status})"
            };
        }

        /// <summary>
        /// ç®€åŒ–回库数据操作（当主方法失败时使用）
        /// </summary>
        private async Task ExecuteSimpleReturnDataOperations(PalletStatusAnalysis statusAnalysis)
        {
            _logger.LogInformation($"【简化回库】开始执行简化回库操作");

            try
            {
                // èŽ·å–该托盘的所有条码（包括所有状态的库存）
                var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == statusAnalysis.StockId)
                    .ToListAsync();

                _logger.LogInformation($"找到 {allStockDetails.Count} ä¸ªåº“存明细记录");

                foreach (var stockDetail in allStockDetails)
                {
                    // è®°å½•åŽŸå§‹çŠ¶æ€
                    int originalStatus = stockDetail.Status;
                    decimal originalStockQty = stockDetail.StockQuantity;

                    // å°†æ‰€æœ‰å‡ºåº“相关的状态恢复为入库完成
                    if (stockDetail.Status == (int)StockStatusEmun.出库锁定 ||
                        //stockDetail.Status == (int)StockStatusEmun.出库中 ||
                        stockDetail.Status == (int)StockStatusEmun.出库完成)
                    {
                        // å¦‚果是出库完成状态且库存为0，可能需要特殊处理
                        if (stockDetail.Status == (int)StockStatusEmun.出库完成 && stockDetail.StockQuantity == 0)
                        {
                            _logger.LogInformation($"跳过已出库完成的零库存条码: {stockDetail.Barcode}");
                            continue;
                        }

                        stockDetail.Status = (int)StockStatusEmun.入库完成;

                        // å¦‚果是出库锁定状态但库存为0，重置库存为1（避免零库存问题）
                        if (stockDetail.Status == (int)StockStatusEmun.出库锁定 && stockDetail.StockQuantity == 0)
                        {
                            // æŸ¥æ‰¾æ˜¯å¦æœ‰å¯¹åº”的锁定记录来确定应该恢复的数量
                            var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                                .Where(x => x.CurrentBarcode == stockDetail.Barcode &&
                                           x.StockId == stockDetail.StockId)
                                .FirstAsync();

                            if (lockInfo != null)
                            {
                                stockDetail.StockQuantity = lockInfo.AssignQuantity - lockInfo.PickedQty;
                                _logger.LogInformation($"恢复零库存条码的数量 - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {stockDetail.StockQuantity}");
                            }
                        }

                        await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
                        _logger.LogInformation($"简化回库 - æ¡ç : {stockDetail.Barcode}, çŠ¶æ€: {GetStockStatusName(originalStatus)} -> å…¥åº“完成, æ•°é‡: {originalStockQty} -> {stockDetail.StockQuantity}");
                    }
                }

                // æ›´æ–°æ‰€æœ‰é”å®šè®°å½•ä¸ºå·²å›žåº“
                var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.OrderNo == statusAnalysis.OrderNo &&
                               x.PalletCode == statusAnalysis.PalletCode &&
                               (x.Status == (int)OutLockStockStatusEnum.出库中 ||
                                x.Status == (int)OutLockStockStatusEnum.拣选完成))
                    .ToListAsync();

                foreach (var lockInfo in allLocks)
                {
                    lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
                    lockInfo.Operator = App.User.UserName;

                    await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
                    _logger.LogInformation($"简化回库 - é”å®šè®°å½•: {lockInfo.Id}, çŠ¶æ€: å·²å›žåº“");
                }

                _logger.LogInformation($"【简化回库】完成 - å¤„理 {allStockDetails.Count} ä¸ªæ¡ç , {allLocks.Count} æ¡é”å®šè®°å½•");
            }
            catch (Exception ex)
            {
                _logger.LogError($"简化回库失败: {ex.Message}");
                throw;
            }
        }

        /// <summary>
        /// èŽ·å–库存状态名称
        /// </summary>
        private string GetStockStatusName(int status)
        {
            return status switch
            {
                1 => "入库确认",
                2 => "入库完成",
                3 => "出库锁定",
                4 => "出库中",
                5 => "出库完成",
                6 => "已清理",
                _ => $"未知({status})"
            };
        }


        /// <summary>
        /// åˆ›å»ºå›žåº“任务
        /// </summary>
        private async Task CreateReturnTask(string orderNo, string palletCode, Dt_StockInfo stockInfo)
        {
            // èŽ·å–当前任务信息
            var currentTask = await _taskRepository.Db.Queryable<Dt_Task>()
                .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                .FirstAsync();

            if (currentTask != null)
            {
                // åˆ†é…æ–°è´§ä½
                var newLocation = _locationInfoService.AssignLocation(stockInfo.LocationType);

                var returnTask = new Dt_Task()
                {
                    CurrentAddress = stations[currentTask.TargetAddress],
                    Grade = 0,
                    PalletCode = palletCode,
                    NextAddress = "",
                    OrderNo = orderNo,
                    Roadway = newLocation.RoadwayNo,
                    SourceAddress = stations[currentTask.TargetAddress],
                    TargetAddress = newLocation.LocationCode,
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    TaskType = TaskTypeEnum.InPick.ObjToInt(),
                    PalletType = stockInfo.PalletType,
                    WarehouseId = currentTask.WarehouseId
                };
                var targetAddress = currentTask.TargetAddress;

                try
                {
                    await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();

                    _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {currentTask.TaskNum}");
                    // åˆ é™¤åŽŸå§‹å‡ºåº“任务
                    //_taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);
                    var result = _task_HtyService.DeleteAndMoveIntoHty(currentTask, OperateTypeEnum.人工删除);
                    await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();

                    if (!result)
                    {
                        await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
                    }
                    _logger.LogInformation($"CreateReturnTaskAndHandleESS  åˆ†æ‰¹åˆ é™¤åŽ†å²ä»»åŠ¡: {orderNo} ï¼Œ {currentTask.TaskNum},影响行  {result}");

                }
                catch (Exception ex)
                {
                    _logger.LogInformation($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");
                    throw new Exception($"创建回库任务失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");

                }
                // å‘送ESS命令
                await SendESSCommands(palletCode, targetAddress, returnTask);

                _logger.LogInformation($"创建回库任务成功 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");
            }
        }

        /// <summary>
        /// æ›´æ–°å›žåº“后的订单状态
        /// </summary>
        private async Task UpdateOrderStatusAfterReturn(string orderNo)
        {
            // æ£€æŸ¥è®¢å•æ˜¯å¦è¿˜æœ‰æœªå®Œæˆçš„锁定记录
            var activeLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(x => x.OrderNo == orderNo &&
                           (x.Status == (int)OutLockStockStatusEnum.出库中 ||
                            x.Status == (int)OutLockStockStatusEnum.回库中))
                .ToListAsync();

            if (!activeLocks.Any())
            {
                // æ‰€æœ‰é”å®šè®°å½•éƒ½å·²å®Œæˆæˆ–已回库，更新订单状态
                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                    .SetColumns(x => new Dt_OutboundOrder
                    {
                        OrderStatus = (int)OutOrderStatusEnum.出库完成,
                    })
                    .Where(x => x.OrderNo == orderNo)
                    .ExecuteCommandAsync();

                _logger.LogInformation($"更新订单状态为出库完成 - è®¢å•: {orderNo}");
            }
        }

        /// <summary>
        /// å¤„理空托盘回库
        /// </summary>
        private async Task<WebResponseContent> HandleEmptyPalletReturn(string orderNo, string palletCode, Dt_StockInfo stockInfo)
        {
            _logger.LogInformation($"处理空托盘回库 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");

            try
            {
                // æ¸…理零库存数据
                await CleanupZeroStockData(stockInfo.Id);

                // èŽ·å–当前任务
                var currentTask = await GetCurrentTask(orderNo, palletCode);
                if (currentTask == null)
                {
                    return WebResponseContent.Instance.Error("未找到当前任务");
                }
                // åˆ›å»ºç©ºæ‰˜ç›˜åº“存记录
                var emptyStockInfo = new Dt_StockInfo()
                {
                    PalletType = PalletTypeEnum.Empty.ObjToInt(),
                    StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                    PalletCode = palletCode,
                    LocationType = stockInfo.LocationType
                };
                emptyStockInfo.Details = new List<Dt_StockInfoDetail>();
                _stockInfoService.AddMaterielGroup(emptyStockInfo);

                // åˆ›å»ºå›žåº“任务（不发送ESS命令）
                var returnTaskInfo = await CreateEmptyPalletReturnTask(orderNo, palletCode, emptyStockInfo, currentTask);

                return WebResponseContent.Instance.OK("空托盘回库成功", returnTaskInfo);
            }
            catch (Exception ex)
            {
                _logger.LogError($"空托盘回库失败 HandleEmptyPalletReturn: {ex.Message}");
                return WebResponseContent.Instance.Error($"空托盘回库失败 HandleEmptyPalletReturn: {ex.Message}");
            }
        }

        private async Task<Dt_Task> GetCurrentTask(string orderNo, string palletCode)
        {
            // å…ˆå°è¯•é€šè¿‡è®¢å•å·å’Œæ‰˜ç›˜å·æŸ¥æ‰¾ä»»åŠ¡
@@ -1384,227 +2713,175 @@

            return task;
        }
        private async Task<PalletStatusAnalysis> AnalyzePalletStatus(string orderNo, string palletCode, int stockId)

        // <summary>
        /// åˆ›å»ºç©ºæ‰˜ç›˜å›žåº“任务（不发送ESS命令）
        /// </summary>
        private async Task<ReturnTaskInfo> CreateEmptyPalletReturnTask(string orderNo, string palletCode, Dt_StockInfo emptyStockInfo, Dt_Task currentTask)
        {
            try
            {
                // åˆ†é…æ–°è´§ä½
                var newLocation = _locationInfoService.AssignLocation(emptyStockInfo.LocationType);

                var returnTask = new Dt_Task()
                {
                    CurrentAddress = stations[currentTask.TargetAddress],
                    Grade = 0,
                    PalletCode = palletCode,
                    NextAddress = "",
                    OrderNo = orderNo,
                    Roadway = newLocation.RoadwayNo,
                    SourceAddress = stations[currentTask.TargetAddress],
                    TargetAddress = newLocation.LocationCode,
                    TaskStatus = TaskStatusEnum.New.ObjToInt(),
                    TaskType = TaskTypeEnum.InEmpty.ObjToInt(),
                    PalletType = PalletTypeEnum.Empty.ObjToInt(),
                    WarehouseId = currentTask.WarehouseId
                };

                await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();

                _logger.LogInformation($"创建空托盘回库任务成功: {returnTask.TaskNum}");

                // åˆ é™¤åŽŸå§‹å‡ºåº“任务
                var result = _task_HtyService.DeleteAndMoveIntoHty(currentTask, OperateTypeEnum.人工删除);
                await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();

                if (!result)
                {
                    await _taskRepository.Db.Deleteable(currentTask).ExecuteCommandAsync();
                }

                // è¿”回任务信息
                return new ReturnTaskInfo
                {
                    ShouldSendESS = true,
                    PalletCode = palletCode,
                    OriginalTaskTargetAddress = currentTask.TargetAddress,
                    ReturnTask = returnTask
                };
            }
            catch (Exception ex)
            {
                _logger.LogError($"创建空托盘回库任务失败: {ex.Message}");
                throw;
            }
        }

        /// <summary>
        /// åˆ†æžæ‰˜ç›˜çŠ¶æ€ç”¨äºŽå›žåº“ - ä¿®æ­£ç‰ˆï¼ˆè§£å†³æ‹†åŒ…记录重复计算问题）
        /// </summary>
        private async Task<PalletStatusAnalysis> AnalyzePalletStatusForReturn(string orderNo, string palletCode, int stockId)
        {
            var result = new PalletStatusAnalysis
            {
                OrderNo = orderNo,
                PalletCode = palletCode,
                StockId = stockId
                StockId = stockId,
                AllBarcodes = new List<string>(),
                ProcessedBarcodes = new HashSet<string>()
            };

            // åˆ†æžæœªåˆ†æ‹£çš„出库锁定记录
            var remainingLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(it => it.OrderNo == orderNo &&
                           it.PalletCode == palletCode &&
                           it.Status == (int)OutLockStockStatusEnum.出库中)
                .ToListAsync();
            _logger.LogInformation($"【回库分析】开始分析托盘状态 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, StockId: {stockId}");

            if (remainingLocks.Any())
            {
                result.HasRemainingLocks = true;
                result.RemainingLocks = remainingLocks;
                result.RemainingLocksReturnQty = remainingLocks.Sum(x => x.AssignQuantity - x.PickedQty);
                _logger.LogInformation($"发现{remainingLocks.Count}条未分拣锁定记录，总数量: {result.RemainingLocksReturnQty}");
            }

            // åˆ†æžæ‰˜ç›˜ä¸Šçš„库存货物
            var palletStockGoods = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .Where(it => it.StockId == stockId &&
                     (it.Status == StockStatusEmun.入库确认.ObjToInt() ||
                      it.Status == StockStatusEmun.入库完成.ObjToInt() ||
                      it.Status == StockStatusEmun.出库锁定.ObjToInt()))
                .Where(it => it.StockQuantity > 0)
                .ToListAsync();

            if (palletStockGoods.Any())
            {
                result.HasPalletStockGoods = true;
                result.PalletStockGoods = palletStockGoods;
                result.PalletStockReturnQty = palletStockGoods.Sum(x => x.StockQuantity);
                _logger.LogInformation($"发现{palletStockGoods.Count}个库存货物，总数量: {result.PalletStockReturnQty}");

                // è®°å½•è¯¦ç»†çŠ¶æ€åˆ†å¸ƒ
                var statusGroups = palletStockGoods.GroupBy(x => x.Status);
                foreach (var group in statusGroups)
                {
                    _logger.LogInformation($"库存状态{group.Key}: {group.Count()}个货物，数量: {group.Sum(x => x.StockQuantity)}");
                }
            }

            //分析拆包记录
            var splitRecords = await _splitPackageService.Db.Queryable<Dt_SplitPackageRecord>()
                .Where(it => it.OrderNo == orderNo &&
                           it.PalletCode == palletCode &&
                           !it.IsReverted && it.Status != (int)SplitPackageStatusEnum.已拣选 &&
                           it.Status != (int)SplitPackageStatusEnum.已回库)
                .ToListAsync();

            if (splitRecords.Any())
            {
                result.HasSplitRecords = true;
                result.SplitRecords = splitRecords;
                result.SplitReturnQty = await CalculateSplitReturnQuantity(splitRecords, stockId);

                _logger.LogInformation($"发现{splitRecords.Count}条未拣选拆包记录，总数量: {result.SplitReturnQty}");
            }

            // 4. è®¡ç®—总回库数量和空托盘状态
            result.TotalReturnQty = result.RemainingLocksReturnQty + result.PalletStockReturnQty + result.SplitReturnQty;
            result.HasItemsToReturn = result.TotalReturnQty > 0;
            result.IsEmptyPallet = !result.HasItemsToReturn;

            // 5. æ£€æŸ¥æ˜¯å¦æœ‰è¿›è¡Œä¸­çš„任务
            result.HasActiveTasks = await _taskRepository.Db.Queryable<Dt_Task>()
                .Where(x => x.OrderNo == orderNo && x.TaskType == TaskTypeEnum.InPick.ObjToInt() &&
                           x.PalletCode == palletCode &&
                           x.TaskStatus == (int)TaskStatusEnum.New)
                .AnyAsync();

            _logger.LogInformation($"托盘状态分析完成 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, " +
                                  $"总回库数量: {result.TotalReturnQty}, æ˜¯å¦ç©ºæ‰˜ç›˜: {result.IsEmptyPallet}, " +
                                  $"有进行中任务: {result.HasActiveTasks}");

            return result;
        }
        private async Task<decimal> CalculateSplitReturnQuantity(List<Dt_SplitPackageRecord> splitRecords, int stockId)
        {
            decimal totalQty = 0;
            var processedBarcodes = new HashSet<string>();

            foreach (var splitRecord in splitRecords)
            {
                if (splitRecord.Status != (int)SplitPackageStatusEnum.已撤销)
                    continue;
                // æ£€æŸ¥åŽŸæ¡ç 
                if (!processedBarcodes.Contains(splitRecord.OriginalBarcode))
                {
                    var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                        .Where(it => it.Barcode == splitRecord.OriginalBarcode && it.StockId == stockId &&
                           it.Status != StockStatusEmun.出库完成.ObjToInt())
                        .FirstAsync();

                    if (originalStock != null && originalStock.StockQuantity > 0)
                    {
                        totalQty += originalStock.StockQuantity;
                        processedBarcodes.Add(splitRecord.OriginalBarcode);
                    }
                }

                // æ£€æŸ¥æ–°æ¡ç 
                if (!processedBarcodes.Contains(splitRecord.NewBarcode))
                {
                    var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                        .Where(it => it.Barcode == splitRecord.NewBarcode && it.StockId == stockId && it.Status != StockStatusEmun.出库完成.ObjToInt())
                        .FirstAsync();

                    if (newStock != null && newStock.StockQuantity > 0)
                    {
                        totalQty += newStock.StockQuantity;
                        processedBarcodes.Add(splitRecord.NewBarcode);
                    }
                }
            }

            return totalQty;
        }

        /// <summary>
        /// ç»Ÿä¸€å›žåº“方法 - å¤„理托盘上所有剩余货物
        /// </summary>
        public async Task<WebResponseContent> ExecutePalletReturn(string orderNo, string palletCode, string returnReason = "分批回库")
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                //  é¦–先获取托盘上所有的库存明细（基础数据）
                var allStockDetails = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == stockId && x.StockQuantity > 0)
                    .ToListAsync();

                if (string.IsNullOrEmpty(orderNo) || string.IsNullOrEmpty(palletCode))
                    return WebResponseContent.Instance.Error("订单号和托盘码不能为空");
                _logger.LogInformation($"找到 {allStockDetails.Count} ä¸ªæœ‰åº“存的明细记录");

                // èŽ·å–库存信息
                var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>().FirstAsync(x => x.PalletCode == palletCode);
                if (stockInfo == null)
                    return WebResponseContent.Instance.Error($"未找到托盘 {palletCode} å¯¹åº”的库存信息");
                //  åˆ†æžæ‰€æœ‰é”å®šè®°å½•ï¼ˆå·²åˆ†é…å’Œæœªåˆ†é…ï¼‰
                var allLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .ToListAsync();

                var task = await GetCurrentTask(orderNo, palletCode);
                if (task == null)
                    return WebResponseContent.Instance.Error("未找到对应的任务信息");
                // åŒºåˆ†å·²åˆ†é…å’Œæœªåˆ†é…é”å®šè®°å½•
                var allocatedLocks = allLockInfos
                    .Where(x => x.IsUnallocated != 1 && x.OrderDetailId > 0 &&
                               x.Status == (int)OutLockStockStatusEnum.出库中)
                    .ToList();

                // åˆ†æžæ‰˜ç›˜çŠ¶æ€
                var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockInfo.Id);
                if (!statusAnalysis.HasItemsToReturn)
                    return await HandleNoReturnItems(orderNo, palletCode, task, stockInfo.Id);
                var unallocatedLocks = allLockInfos
                    .Where(x => (x.IsUnallocated == 1 || x.OrderDetailId == 0) &&
                               x.Status == (int)OutLockStockStatusEnum.出库中)
                    .ToList();

                // æ£€æŸ¥æ˜¯å¦æœ‰è¿›è¡Œä¸­çš„任务
                if (statusAnalysis.HasActiveTasks)
                // å¤„理已分配锁定记录
                if (allocatedLocks.Any())
                {
                    return WebResponseContent.Instance.Error($"托盘 {palletCode} æœ‰è¿›è¡Œä¸­çš„任务，不能执行回库操作");
                    result.HasRemainingLocks = true;
                    result.RemainingLocks = allocatedLocks;

                    // å¯¹äºŽå·²åˆ†é…é”å®šè®°å½•ï¼Œå›žåº“数量是未拣选的部分
                    result.RemainingLocksReturnQty = allocatedLocks.Sum(x =>
                    {
                        var returnQty = x.AssignQuantity - x.PickedQty;
                        return returnQty > 0 ? returnQty : 0;
                    });

                    foreach (var lockInfo in allocatedLocks)
                    {
                        if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
                        {
                            result.AllBarcodes.Add(lockInfo.CurrentBarcode);
                            result.ProcessedBarcodes.Add(lockInfo.CurrentBarcode);
                        }
                    }
                    _logger.LogInformation($"发现 {allocatedLocks.Count} æ¡å·²åˆ†é…é”å®šè®°å½•ï¼Œå›žåº“数量: {result.RemainingLocksReturnQty}");
                }

                // æ‰§è¡Œå›žåº“操作
                await ExecuteReturnDataOperations(orderNo, palletCode, stockInfo, task, statusAnalysis);

                // é‡Šæ”¾æ‰€æœ‰é”å®šä»¥ä¾¿é‡æ–°åˆ†é…
                await ReleaseAllLocksForReallocation(orderNo, palletCode, statusAnalysis);

                _unitOfWorkManage.CommitTran();

                // æ”¶é›†æ‰€æœ‰éœ€è¦å›žåº“的条码
                var returnBarcodes = await CollectReturnBarcodes(statusAnalysis);

                // åˆ›å»ºESS回库任务
                if (returnBarcodes.Any())
                // å¤„理未分配锁定记录（自动拆包产生的）
                if (unallocatedLocks.Any())
                {
                    _logger.LogInformation($"创建回库AGV任务 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, æ¡ç æ•°é‡: {returnBarcodes.Count}, åŽŸå› : {returnReason}");
                    await CreateReturnTaskAndHandleESS(orderNo, palletCode, task, TaskTypeEnum.InPick, stockInfo.PalletType);
                    result.HasUnallocatedLocks = true;
                    result.UnallocatedLocks = unallocatedLocks;

                    // å¯¹äºŽæœªåˆ†é…é”å®šè®°å½•ï¼Œå›žåº“数量是它的分配数量（因为未拣选过）
                    // ä½†å®žé™…上，库存本来就存在，只是状态需要恢复
                    result.UnallocatedLocksReturnQty = unallocatedLocks.Sum(x => x.AssignQuantity);

                    foreach (var lockInfo in unallocatedLocks)
                    {
                        if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode) &&
                            !result.ProcessedBarcodes.Contains(lockInfo.CurrentBarcode))
                        {
                            result.AllBarcodes.Add(lockInfo.CurrentBarcode);
                            result.ProcessedBarcodes.Add(lockInfo.CurrentBarcode);
                        }
                    }
                    _logger.LogInformation($"发现 {unallocatedLocks.Count} æ¡æœªåˆ†é…é”å®šè®°å½•ï¼Œå›žåº“数量（状态恢复）: {result.UnallocatedLocksReturnQty}");
                }

                // æ›´æ–°è®¢å•çŠ¶æ€ï¼ˆä¸è§¦å‘MES回传）
                await UpdateOrderStatusForReturn(orderNo);
                // é‡æ–°è®¡ç®—总回库数量
                // å¯¹äºŽå·²åˆ†é…é”å®šï¼šå›žåº“数量 = æœªæ‹£é€‰æ•°é‡
                // å¯¹äºŽæœªåˆ†é…é”å®šï¼šæ²¡æœ‰å®žé™…的库存数量变化，只是状态恢复
                result.TotalReturnQty = result.RemainingLocksReturnQty; // åªè®¡ç®—已分配锁定的回库数量

                return WebResponseContent.Instance.OK($"回库操作成功，共回库数量：{statusAnalysis.TotalReturnQty}", new
                {
                    ReturnQuantity = statusAnalysis.TotalReturnQty,
                    ReturnBarcodes = returnBarcodes,
                    Reason = returnReason,
                    PalletCode = palletCode,
                    OrderNo = orderNo
                });
                // è®°å½•åº“存数量（用于验证）
                decimal totalStockOnPallet = allStockDetails.Sum(x => x.StockQuantity);

                _logger.LogInformation($"回库分析完成:");
                _logger.LogInformation($"  æ‰˜ç›˜æ€»åº“å­˜: {totalStockOnPallet}");
                _logger.LogInformation($"  å·²åˆ†é…é”å®šå›žåº“数量: {result.RemainingLocksReturnQty}");
                _logger.LogInformation($"  æœªåˆ†é…é”å®šçŠ¶æ€æ¢å¤æ•°é‡: {result.UnallocatedLocksReturnQty}");
                _logger.LogInformation($"  å®žé™…物理回库数量: {result.TotalReturnQty}");

                result.HasItemsToReturn = result.TotalReturnQty > 0 || result.UnallocatedLocksReturnQty > 0;
                result.IsEmptyPallet = !result.HasItemsToReturn;

                return result;
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                _logger.LogError($"回库操作失败 - OrderNo: {orderNo}, PalletCode: {palletCode}, Error: {ex.Message}");
                return WebResponseContent.Instance.Error($"回库操作失败: {ex.Message}");
                _logger.LogError($"回库分析失败 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}, Error: {ex.Message}");
                throw;
            }
        }
        private async Task ExecuteReturnDataOperations(string orderNo, string palletCode, Dt_StockInfo stockInfo,Dt_Task task, PalletStatusAnalysis statusAnalysis)
        {
            _logger.LogInformation($"开始执行回库数据操作 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");

            // 1. å¤„理未分拣的锁定记录
            if (statusAnalysis.HasRemainingLocks)
            {
                _logger.LogInformation($"处理 {statusAnalysis.RemainingLocks.Count} æ¡æœªåˆ†æ‹£é”å®šè®°å½•");
                await HandleRemainingLocksReturn(statusAnalysis.RemainingLocks);
            }

            // 2. å¤„理托盘上的库存货物
            if (statusAnalysis.HasPalletStockGoods)
            {
                _logger.LogInformation($"处理 {statusAnalysis.PalletStockGoods.Count} ä¸ªåº“存货物");
                await HandlePalletStockGoodsReturn(statusAnalysis.PalletStockGoods, stockInfo.Id);
            }

            // 3. å¤„理拆包记录
            if (statusAnalysis.HasSplitRecords)
            {
                _logger.LogInformation($"处理 {statusAnalysis.SplitRecords.Count} æ¡æ‹†åŒ…记录");
                await HandleSplitRecordsReturn(statusAnalysis.SplitRecords, stockInfo.Id);
            }

            _logger.LogInformation($"回库数据操作完成 - æ€»å›žåº“数量: {statusAnalysis.TotalReturnQty}");
        }
        }       
     
        /// <summary>
        /// åˆ†æ‰¹å›žåº“ - è°ƒç”¨ç»Ÿä¸€å›žåº“方法
        /// </summary>
@@ -1613,53 +2890,120 @@
            return await ExecutePalletReturn(orderNo, palletCode, "分批回库");
        }

        /// <summary>
        /// å‰©ä½™å›žåº“ - è°ƒç”¨ç»Ÿä¸€å›žåº“方法
        /// </summary>
        public async Task<WebResponseContent> ReturnRemaining(string orderNo, string palletCode, string reason)
        {
            return await ExecutePalletReturn(orderNo, palletCode, reason);
        }
      

        /// <summary>
        /// å–走空箱 - å…ˆæ‰§è¡Œå›žåº“再清理 - å¢žå¼ºç‰ˆæœ¬
        /// å–走空箱 - ä¿®æ­£ç‰ˆï¼Œæ­£ç¡®å¤„理未分配锁定记录
        /// </summary>
        public async Task<WebResponseContent> RemoveEmptyPallet(string orderNo, string palletCode)
        {
            try
            {
                _logger.LogInformation($"【取走空箱开始】订单: {orderNo}, æ‰˜ç›˜: {palletCode}");

                _unitOfWorkManage.BeginTran();

                _logger.LogInformation($"开始取走空箱 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");
                //  å…ˆå°è¯•æ‰§è¡Œå›žåº“操作，确保所有物品都回库
                _logger.LogInformation($"步骤1: å…ˆæ‰§è¡Œå›žåº“操作");
                var returnResult = await ExecutePalletReturn(orderNo, palletCode, "取走空箱前回库");

                // 1. éªŒè¯ç©ºç®±å–走条件（必须全部完成拣选）
                var validationResult = await ValidateEmptyPalletRemoval(orderNo, palletCode);
                if (!validationResult.IsValid)
                // å³ä½¿å›žåº“失败，继续验证空箱条件（可能是真的空托盘）
                if (!returnResult.Status)
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error(validationResult.ErrorMessage);
                    _logger.LogWarning($"回库操作可能失败或无物品: {returnResult.Message}");
                }

                var completedLocks = validationResult.Data;
                // éªŒè¯ç©ºç®±å–走条件（必须全部完成拣选或已回库）
                _logger.LogInformation($"步骤2: éªŒè¯ç©ºç®±å–走条件");

                // 2. æ¸…理已完成的锁定记录（标记为已取走）
                await CleanupCompletedLocks(completedLocks);
                // èŽ·å–托盘的所有锁定记录（包括已回库和已取走的）
                var allLockInfos = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.OrderNo == orderNo && x.PalletCode == palletCode)
                    .ToListAsync();

                // 3. æ¸…理对应的库存记录状态
                if (!allLockInfos.Any())
                {
                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error("该托盘没有锁定记录");
                }

                // æ£€æŸ¥æ˜¯å¦æœ‰æœªå®Œæˆçš„锁定记录
                var unfinishedLocks = allLockInfos.Where(x =>
                    x.Status == (int)OutLockStockStatusEnum.出库中 ||
                    x.Status == (int)OutLockStockStatusEnum.回库中).ToList();

                if (unfinishedLocks.Any())
                {
                    var unfinishedCount = unfinishedLocks.Count;
                    // åŒºåˆ†å·²åˆ†é…å’Œæœªåˆ†é…
                    var allocatedUnfinished = unfinishedLocks.Where(x => x.IsUnallocated != 1).ToList();
                    var unallocatedUnfinished = unfinishedLocks.Where(x => x.IsUnallocated == 1).ToList();

                    string errorMsg = $"托盘还有{unfinishedCount}条未完成记录";
                    if (allocatedUnfinished.Any()) errorMsg += $"，其中已分配{allocatedUnfinished.Count}条";
                    if (unallocatedUnfinished.Any()) errorMsg += $"，未分配{unallocatedUnfinished.Count}条";

                    errorMsg += "，不能取走空箱";

                    _unitOfWorkManage.RollbackTran();
                    return WebResponseContent.Instance.Error(errorMsg);
                }

                // èŽ·å–已完成的锁定记录（状态为拣选完成或已取走）
                var completedLocks = allLockInfos.Where(x =>
                    x.Status == (int)OutLockStockStatusEnum.拣选完成 ||
                    x.Status == (int)OutLockStockStatusEnum.已取走).ToList();

                if (!completedLocks.Any())
                {
                    // æ£€æŸ¥æ˜¯å¦éƒ½æ˜¯å·²å›žåº“状态
                    var returnedLocks = allLockInfos.Where(x => x.Status == (int)OutLockStockStatusEnum.已回库).ToList();
                    if (returnedLocks.Any())
                    {
                        _logger.LogInformation($"所有锁定记录都已回库，可以取走空箱");
                        completedLocks = returnedLocks;
                    }
                    else
                    {
                        _unitOfWorkManage.RollbackTran();
                        return WebResponseContent.Instance.Error("该托盘没有已完成拣选或已回库的记录");
                    }
                }

                _logger.LogInformation($"验证通过，找到 {completedLocks.Count} æ¡å·²å®Œæˆè®°å½•");

                //  æ¸…理已完成的锁定记录（标记为已取走）
                _logger.LogInformation($"步骤3: æ¸…理锁定记录");
                foreach (var lockInfo in completedLocks)
                {
                    // åªå¤„理状态不是已取走的记录
                    if (lockInfo.Status != (int)OutLockStockStatusEnum.已取走)
                    {
                        lockInfo.Status = (int)OutLockStockStatusEnum.已取走;
                        lockInfo.Operator = App.User.UserName;
                        await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
                        _logger.LogInformation($"锁定记录标记为已取走 - ID: {lockInfo.Id}");
                    }
                }

                // æ¸…理对应的库存记录状态
                _logger.LogInformation($"步骤4: æ¸…理库存记录");
                foreach (var lockInfo in completedLocks)
                {
                    await CleanupStockInfo(lockInfo);
                }

                // 4. æ›´æ–°ç›¸å…³è®¢å•çŠ¶æ€
                // æ›´æ–°ç›¸å…³è®¢å•çŠ¶æ€
                _logger.LogInformation($"步骤5: æ›´æ–°è®¢å•çŠ¶æ€");
                await UpdateOrderStatusAfterPalletRemoval(orderNo);

                // 5. è®°å½•æ“ä½œåŽ†å²
                await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks);
                // è®°å½•æ“ä½œåŽ†å²
                //_logger.LogInformation($"步骤6: è®°å½•æ“ä½œåŽ†å²");
                //await RecordEmptyPalletRemoval(orderNo, palletCode, completedLocks);

                _unitOfWorkManage.CommitTran();

                _logger.LogInformation($"取走空箱成功 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");
                _logger.LogInformation($"【取走空箱成功】订单: {orderNo}, æ‰˜ç›˜: {palletCode}");

                return WebResponseContent.Instance.OK("取走空箱成功");
            }
@@ -1670,356 +3014,19 @@
                return WebResponseContent.Instance.Error($"取走空箱失败：{ex.Message}");
            }
        }
        /// <summary>
        /// æ”¶é›†éœ€è¦å›žåº“的条码
        /// </summary>
        private async Task<List<string>> CollectReturnBarcodes(PalletStatusAnalysis status)
        {
            var returnBarcodes = new HashSet<string>();

            try
            {
                _logger.LogInformation($"开始收集回库条码 - è®¢å•: {status.OrderNo}, æ‰˜ç›˜: {status.PalletCode}");

                // 1. æ”¶é›†æœªåˆ†æ‹£é”å®šè®°å½•çš„条码
                if (status.HasRemainingLocks)
                {
                    foreach (var lockInfo in status.RemainingLocks)
                    {
                        if (!string.IsNullOrEmpty(lockInfo.CurrentBarcode))
                        {
                            returnBarcodes.Add(lockInfo.CurrentBarcode);
                            _logger.LogInformation($"添加锁定记录条码: {lockInfo.CurrentBarcode}");
                        }
                    }
                }

                // 2. æ”¶é›†æ‰˜ç›˜ä¸Šåº“存货物的条码
                if (status.HasPalletStockGoods)
                {
                    foreach (var stockDetail in status.PalletStockGoods)
                    {
                        if (!string.IsNullOrEmpty(stockDetail.Barcode) && stockDetail.StockQuantity > 0)
                        {
                            returnBarcodes.Add(stockDetail.Barcode);
                            _logger.LogInformation($"添加库存货物条码: {stockDetail.Barcode}, æ•°é‡: {stockDetail.StockQuantity}");
                        }
                    }
                }

                // 3. æ”¶é›†æ‹†åŒ…记录相关的条码
                if (status.HasSplitRecords)
                {
                    foreach (var splitRecord in status.SplitRecords)
                    {
                        // æ·»åŠ åŽŸæ¡ç 
                        if (!string.IsNullOrEmpty(splitRecord.OriginalBarcode))
                        {
                            var originalStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                                .FirstAsync(x => x.Barcode == splitRecord.OriginalBarcode && x.StockId == status.StockId);

                            if (originalStock != null && originalStock.StockQuantity > 0)
                            {
                                returnBarcodes.Add(splitRecord.OriginalBarcode);
                                _logger.LogInformation($"添加拆包原条码: {splitRecord.OriginalBarcode}, æ•°é‡: {originalStock.StockQuantity}");
                            }
                        }

                        // æ·»åŠ æ–°æ¡ç 
                        if (!string.IsNullOrEmpty(splitRecord.NewBarcode))
                        {
                            var newStock = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                                .FirstAsync(x => x.Barcode == splitRecord.NewBarcode && x.StockId == status.StockId);

                            if (newStock != null && newStock.StockQuantity > 0)
                            {
                                returnBarcodes.Add(splitRecord.NewBarcode);
                                _logger.LogInformation($"添加拆包新条码: {splitRecord.NewBarcode}, æ•°é‡: {newStock.StockQuantity}");
                            }
                        }
                    }
                }

                _logger.LogInformation($"回库条码收集完成 - å…± {returnBarcodes.Count} ä¸ªæ¡ç : {string.Join(", ", returnBarcodes)}");

                return returnBarcodes.ToList();
            }
            catch (Exception ex)
            {
                _logger.LogError($"收集回库条码失败 - Error: {ex.Message}");
                return returnBarcodes.ToList();
            }
        }
 
        #endregion

        #region å›žåº“操作核心方法

        /// <summary>
        /// æ‰§è¡Œå›žåº“操作 - å¢žå¼ºç‰ˆæœ¬
        /// </summary>
        private async Task ExecuteReturnOperations(string orderNo, string palletCode, Dt_StockInfo stockInfo,
            Dt_Task task, PalletStatusAnalysis statusAnalysis)
        {
            _logger.LogInformation($"开始执行回库操作 - è®¢å•: {orderNo}, æ‰˜ç›˜: {palletCode}");

            //  å¤„理未分拣的锁定记录
            if (statusAnalysis.HasRemainingLocks)
            {
                _logger.LogInformation($"处理 {statusAnalysis.RemainingLocks.Count} æ¡æœªåˆ†æ‹£é”å®šè®°å½•");
                await HandleRemainingLocksReturn(statusAnalysis.RemainingLocks);
            }

            //处理托盘上的库存货物
            if (statusAnalysis.HasPalletStockGoods)
            {
                _logger.LogInformation($"处理 {statusAnalysis.PalletStockGoods.Count} ä¸ªåº“存货物");
                await HandlePalletStockGoodsReturn(statusAnalysis.PalletStockGoods, stockInfo.Id);
            }

            //处理拆包记录
            if (statusAnalysis.HasSplitRecords)
            {
                _logger.LogInformation($"处理 {statusAnalysis.SplitRecords.Count} æ¡æ‹†åŒ…记录");
                await HandleSplitRecordsReturn(statusAnalysis.SplitRecords, stockInfo.Id);
            }

            _logger.LogInformation($"回库操作完成 - æ€»å›žåº“数量: {statusAnalysis.TotalReturnQty}");
        }  

        /// <summary>
        /// å¤„理未分拣的锁定记录回库
        /// </summary>
        private async Task HandleRemainingLocksReturn(List<Dt_OutStockLockInfo> remainingLocks)
        {
            foreach (var lockInfo in remainingLocks)
            {
                // è®¡ç®—回库数量（未拣选的部分）
                decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;

                if (returnQty > 0)
                {
                    // æ¢å¤åº“存状态
                    var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                        .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

                    if (stockDetail != null)
                    {
                        stockDetail.StockQuantity += returnQty;
                        stockDetail.OutboundQuantity -= returnQty;

                        // ç¡®ä¿å‡ºåº“数量不会为负数
                        if (stockDetail.OutboundQuantity < 0)
                        {
                            stockDetail.OutboundQuantity = 0;
                        }

                        // å›žåº“后库存状态恢复为入库完成（可用状态）
                        stockDetail.Status = (int)StockStatusEmun.入库完成;
                        await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                        _logger.LogInformation($"恢复库存 - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {returnQty}, æ–°åº“å­˜: {stockDetail.StockQuantity}");
                    }

                    // æ›´æ–°é”å®šè®°å½•çŠ¶æ€ä¸ºå·²å›žåº“
                    lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
                    lockInfo.Operator = App.User.UserName;
                    await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

                    _logger.LogInformation($"更新锁定状态 - é”å®šID: {lockInfo.Id}, å›žåº“数量: {returnQty}");
                }
            }
        }

        /// <summary>
        /// å¤„理托盘上的库存货物回库
        /// </summary>
        private async Task HandlePalletStockGoodsReturn(List<Dt_StockInfoDetail> palletStockGoods, int stockId)
        {
            foreach (var stockDetail in palletStockGoods)
            {
                // åªå¤„理出库锁定状态的库存
                if (stockDetail.Status == (int)StockStatusEmun.出库锁定 && stockDetail.StockQuantity > 0)
                {
                    // æ¢å¤åº“存状态为可用状态
                    stockDetail.Status = (int)StockStatusEmun.入库完成;
                    await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

                    _logger.LogInformation($"恢复库存货物 - æ¡ç : {stockDetail.Barcode}, æ•°é‡: {stockDetail.StockQuantity}");
                }
            }
        }

        /// <summary>
        /// å¤„理拆包记录回库
        /// </summary>
        private async Task HandleSplitRecordsReturn(List<Dt_SplitPackageRecord> splitRecords, int stockId)
        {
            foreach (var splitRecord in splitRecords)
            {
                // å¤„理新条码
                var newLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.CurrentBarcode == splitRecord.NewBarcode &&
                               x.Status == (int)OutLockStockStatusEnum.出库中)
                    .FirstAsync();

                if (newLockInfo != null)
                {
                    await HandleSingleLockReturn(newLockInfo);
                }

                // å¤„理原条码
                var originalLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                    .Where(x => x.CurrentBarcode == splitRecord.OriginalBarcode &&
                               x.Status == (int)OutLockStockStatusEnum.出库中)
                    .FirstAsync();

                if (originalLockInfo != null)
                {
                    await HandleSingleLockReturn(originalLockInfo);
                }

                // æ›´æ–°æ‹†åŒ…记录状态为已回库
                splitRecord.Status = (int)SplitPackageStatusEnum.已回库;
                await _splitPackageService.Db.Updateable(splitRecord).ExecuteCommandAsync();
            }
        }

        /// <summary>
        /// å¤„理单个锁定记录回库
        /// </summary>
        private async Task HandleSingleLockReturn(Dt_OutStockLockInfo lockInfo)
        {
            decimal returnQty = lockInfo.AssignQuantity - lockInfo.PickedQty;

            if (returnQty > 0)
            {
                // æ¢å¤åº“å­˜
                var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                    .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

                if (stockDetail != null)
                {
                    stockDetail.StockQuantity += returnQty;
                    stockDetail.OutboundQuantity -= returnQty;

                    if (stockDetail.OutboundQuantity < 0)
                    {
                        stockDetail.OutboundQuantity = 0;
                    }

                    stockDetail.Status = (int)StockStatusEmun.入库完成;
                    await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
                }

                // æ›´æ–°é”å®šçŠ¶æ€
                lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
                lockInfo.Operator = App.User.UserName;
                await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

                _logger.LogInformation($"处理拆包相关锁定 - æ¡ç : {lockInfo.CurrentBarcode}, å›žåº“数量: {returnQty}");
            }
        }

        /// <summary>
        /// é‡Šæ”¾æ‰€æœ‰é”å®šä»¥ä¾¿é‡æ–°åˆ†é…
        /// </summary>
        private async Task ReleaseAllLocksForReallocation(string orderNo, string palletCode, PalletStatusAnalysis statusAnalysis)
        {
            // æ›´æ–°è®¢å•æ˜Žç»†çš„已分配数量
            if (statusAnalysis.HasRemainingLocks)
            {
                var orderDetailGroups = statusAnalysis.RemainingLocks.GroupBy(x => x.OrderDetailId);

                foreach (var group in orderDetailGroups)
                {
                    var orderDetailId = group.Key;
                    var returnedQty = group.Sum(x => x.AssignQuantity - x.PickedQty);

                    var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                        .FirstAsync(x => x.Id == orderDetailId);

                    if (orderDetail != null)
                    {
                        orderDetail.AllocatedQuantity -= returnedQty;
                        orderDetail.LockQuantity = orderDetail.AllocatedQuantity;

                        await UpdateBatchAllocateStatus(orderDetail);
                        await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();

                        _logger.LogInformation($"更新订单明细 - OrderDetailId: {orderDetailId}, å‡å°‘分配数量: {returnedQty}");
                    }
                }
            }
        }

        #endregion

        #region è¾…助方法

        /// <summary>
        /// å¤„理没有回库物品的情况
        /// </summary>
        private async Task<WebResponseContent> HandleNoReturnItems(string orderNo, string palletCode, Dt_Task originalTask, int stockId)
        {
            _logger.LogInformation($"托盘 {palletCode} æ²¡æœ‰éœ€è¦å›žåº“的物品");

            // æ£€æŸ¥æ˜¯å¦æ˜¯ç©ºæ‰˜ç›˜
            var statusAnalysis = await AnalyzePalletStatus(orderNo, palletCode, stockId);
            if (statusAnalysis.IsEmptyPallet)
            {
                try
                {
                    var locationtype = 0;
                    var stockInfo = await _stockInfoService.Db.Queryable<Dt_StockInfo>()
                            .Where(x => x.PalletCode == palletCode)
                            .FirstAsync();

                    if (stockInfo == null)
                    {
                        var firstLocation = await _locationInfoService.Db.Queryable<Dt_LocationInfo>().FirstAsync(x => x.LocationCode == originalTask.SourceAddress);
                        locationtype = firstLocation?.LocationType ?? 1;
                    }
                    else
                    {
                        locationtype = stockInfo.LocationType;
                        _stockInfoService.DeleteData(stockInfo);
                    }

                    var targetAddress = originalTask.TargetAddress;

                    await CleanupZeroStockData(stockId);


                    var emptystockInfo = new Dt_StockInfo() { PalletType = PalletTypeEnum.Empty.ObjToInt(), StockStatus = StockStatusEmun.组盘暂存.ObjToInt(), PalletCode = palletCode, LocationType = locationtype };
                    emptystockInfo.Details = new List<Dt_StockInfoDetail>();
                    _stockInfoService.AddMaterielGroup(emptystockInfo);
                    //空托盘如何处理  è¿˜æœ‰ä¸€ä¸ªå‡ºåº“任务要处理。
                    originalTask.PalletType = PalletTypeEnum.Empty.ObjToInt();

                    await CreateReturnTaskAndHandleESS(orderNo, palletCode, originalTask, TaskTypeEnum.InEmpty, PalletTypeEnum.Empty.ObjToInt());

                }
                catch (Exception ex)
                {
                    _logger.LogError($" HandleNoReturnItems  å¤±è´¥: {ex.Message}");
                    return WebResponseContent.Instance.Error($" å›žåº“空托盘失败！");
                }
                return WebResponseContent.Instance.OK("空托盘回库任务创建成功");
            }
            else
            {
                return WebResponseContent.Instance.Error("托盘状态异常：有物品但无法计算回库数量");
            }
        }
       #region è¾…助方法
            
        private async Task CleanupZeroStockData(int stockId)
        {
            try
            {
                // 1. åˆ é™¤åº“存数量为0的明细记录
                // åˆ é™¤åº“存数量为0的明细记录
                var deleteDetailCount = await _stockInfoDetailService.Db.Deleteable<Dt_StockInfoDetail>()
                    .Where(x => x.StockId == stockId && x.StockQuantity == 0 && (x.Status == StockStatusEmun.出库完成.ObjToInt() || x.Status ==
                                          StockStatusEmun.入库完成.ObjToInt()))
                    .ExecuteCommandAsync();
            .Where(x => x.StockId == stockId && x.StockQuantity == 0)
            .ExecuteCommandAsync();

                await _stockInfoService.Db.Deleteable<Dt_StockInfo>()
                   .Where(x => x.Id == stockId).ExecuteCommandAsync();
@@ -2032,42 +3039,11 @@
            catch (Exception ex)
            {
                _logger.LogWarning($"清理零库存数据失败 - StockId: {stockId}, Error: {ex.Message}");
                // æ³¨æ„ï¼šæ¸…理失败不应该影响主流程
                
            }
        }
        /// <summary>
        /// æ›´æ–°è®¢å•çŠ¶æ€ï¼ˆå›žåº“后）
        /// </summary>
        private async Task UpdateOrderStatusForReturn(string orderNo)
        {
            // æ£€æŸ¥è®¢å•æ˜¯å¦æ‰€æœ‰æ‰˜ç›˜éƒ½å·²å®Œæˆæˆ–已回库
            var allLocks = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .Where(x => x.OrderNo == orderNo)
                .ToListAsync();

            var activeLocks = allLocks.Where(x =>
                x.Status == (int)OutLockStockStatusEnum.出库中 ||
                x.Status == (int)OutLockStockStatusEnum.回库中).ToList();

            // å¦‚果没有活跃的锁定记录，更新订单状态
            if (!activeLocks.Any())
            {
                await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
                    .SetColumns(x => new Dt_OutboundOrder
                    {
                        OrderStatus = (int)OutOrderStatusEnum.出库完成,
                    })
                    .Where(x => x.OrderNo == orderNo)
                    .ExecuteCommandAsync();

                _logger.LogInformation($"更新订单状态为出库完成 - è®¢å•: {orderNo}");
            }
        }

   
        #endregion




        #region éªŒè¯æ–¹æ³•
        private async Task<ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>> ValidatePickingRequest(
@@ -2086,6 +3062,11 @@
            if (lockInfo == null)
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("未找到有效的锁定信息");

            if (lockInfo.IsUnallocated == 1 || lockInfo.OrderDetailId == 0)
            {
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error("该条码是未分配锁定记录，不能直接分拣");
            }

            _logger.LogInformation($"找到锁定信息 - åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}, å·²æ‹£é€‰: {lockInfo.PickedQty}");

            // æ£€æŸ¥æ˜¯å¦å·²ç»åˆ†æ‹£å®Œæˆ
@@ -2101,21 +3082,32 @@

            _logger.LogInformation($"找到订单明细 - å·²åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}, é”å®šæ•°é‡: {orderDetail.LockQuantity}");

            // é‡è¦ä¿®å¤ï¼šæ£€æŸ¥è®¢å•æ˜Žç»†çš„已分配数量是否足够
            // æ£€æŸ¥è®¢å•æ˜Žç»†çš„已分配数量是否足够
            decimal remainingToPick = lockInfo.AssignQuantity - lockInfo.PickedQty;
            if (orderDetail.AllocatedQuantity < remainingToPick)

            // è¿™é‡Œåº”该检查锁定信息的分配数量，而不是订单明细的分配数量
            // å› ä¸ºæ‹†åŒ…后，锁定信息的分配数量可能小于订单明细的分配数量
            if (lockInfo.AssignQuantity < remainingToPick)
            {
                _logger.LogWarning($"订单明细已分配数量不足 - éœ€è¦æ‹£é€‰: {remainingToPick}, å¯ç”¨åˆ†é…æ•°é‡: {orderDetail.AllocatedQuantity}");
                _logger.LogWarning($"锁定信息分配数量不足 - éœ€è¦æ‹£é€‰: {remainingToPick}, é”å®šä¿¡æ¯åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(
                    $"订单明细分配数量不足，需要拣选：{remainingToPick}，可用分配数量：{orderDetail.AllocatedQuantity}");
                    $"锁定信息分配数量不足，需要拣选：{remainingToPick}，锁定信息分配数量：{lockInfo.AssignQuantity}");
            }

            // é‡è¦ä¿®å¤ï¼šæ£€æŸ¥é”å®šæ•°é‡æ˜¯å¦è¶³å¤Ÿ
            // æ£€æŸ¥é”å®šæ•°é‡æ˜¯å¦è¶³å¤Ÿ
            if (orderDetail.LockQuantity < remainingToPick)
            {
                _logger.LogWarning($"订单明细锁定数量不足 - éœ€è¦æ‹£é€‰: {remainingToPick}, å¯ç”¨é”å®šæ•°é‡: {orderDetail.LockQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(
                    $"订单明细锁定数量不足，需要拣选：{remainingToPick}，可用锁定数量：{orderDetail.LockQuantity}");
            }

            // æ£€æŸ¥è®¢å•æ˜Žç»†åˆ†é…æ•°é‡æ˜¯å¦ä¸ºè´Ÿæ•°
            if (orderDetail.AllocatedQuantity < 0)
            {
                _logger.LogError($"订单明细分配数量为负数 - å½“前值: {orderDetail.AllocatedQuantity}");
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(
                    $"订单明细分配数量异常（负数），请联系管理员处理");
            }

            var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
@@ -2130,11 +3122,11 @@
                    $"库存数量不足，需要拣选：{remainingToPick}，实际库存：{stockDetail.StockQuantity}");

            // éªŒè¯åº“存状态
            if (stockDetail.Status != (int)StockStatusEmun.出库锁定)
            {
                return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(
                    $"库存状态异常，当前状态：{stockDetail.Status}，期望状态：出库锁定");
            }
            //if (stockDetail.Status != (int)StockStatusEmun.出库锁定)
            //{
            //    return ValidationResult<(Dt_OutStockLockInfo, Dt_OutboundOrderDetail, Dt_StockInfoDetail, Dt_OutboundBatch)>.Error(
            //        $"库存状态异常，当前状态：{stockDetail.Status}，期望状态：出库锁定");
            //}

            // ä½¿ç”¨ OutboundBatchNo æŸ¥æ‰¾æ‰¹æ¬¡
            var batch = await _outboundBatchRepository.Db.Queryable<Dt_OutboundBatch>()
@@ -2151,6 +3143,12 @@
        /// </summary>
        private async Task<List<SplitResult>> CheckAndAutoSplitIfNeeded(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, string palletCode)
        {
            if (lockInfo.IsUnallocated == 1 || lockInfo.OrderDetailId == 0)
            {
                _logger.LogInformation($"跳过未分配锁定记录的自动拆包检查 - é”å®šID: {lockInfo.Id}");
                return null;
            }

            // æ£€æŸ¥æ˜¯å¦éœ€è¦è‡ªåŠ¨æ‹†åŒ…的条件：
            // 1. åº“存数量大于分配数量
            // 2. é”å®šä¿¡æ¯çŠ¶æ€ä¸ºå‡ºåº“中
@@ -2165,129 +3163,184 @@
            // è®¡ç®—拆包数量 = åº“存数量 - åˆ†é…æ•°é‡
            decimal splitQuantity = stockDetail.StockQuantity - lockInfo.AssignQuantity;

            _logger.LogInformation($"需要自动拆包 - åº“å­˜: {stockDetail.StockQuantity}, åˆ†é…: {lockInfo.AssignQuantity}, æ‹†åŒ…数量: {splitQuantity}");

            // æ‰§è¡Œè‡ªåŠ¨æ‹†åŒ…
            var splitResult = await ExecuteAutoSplitLogic(lockInfo, stockDetail, splitQuantity, palletCode);

            // å°†æ‹†åŒ…数量传递给调用方，用于验证
            if (splitResult != null && splitResult.Any())
            {
                // åœ¨è¿”回结果中携带拆包数量信息
                foreach (var result in splitResult)
                {
                    result.quantityTotal = splitQuantity.ToString("F2");
                }
            }

            return splitResult;
        }

        /// <summary>
        /// æ‰§è¡Œè‡ªåŠ¨æ‹†åŒ…逻辑
        /// æ‰§è¡Œè‡ªåŠ¨æ‹†åŒ…逻辑 - å®Œå…¨ä¿®æ­£ç‰ˆ
        /// åŽŸåˆ™ï¼šåªåˆ†ç¦»ç‰©ç†åº“存，不改变原订单的任何分配和出库数量
        /// </summary>
        private async Task<List<SplitResult>> ExecuteAutoSplitLogic(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail,
            decimal splitQuantity, string palletCode)
        {
            _logger.LogInformation($"开始执行自动拆包逻辑 - åŽŸæ¡ç : {stockDetail.Barcode}, æ‹†åŒ…数量: {splitQuantity}");

            // ç”Ÿæˆæ–°æ¡ç 
            string newBarcode = await GenerateNewBarcode();

            // é‡è¦ä¿®å¤ï¼šè®°å½•æ‹†åŒ…前的分配数量
            decimal originalAssignQtyBefore = lockInfo.AssignQuantity;
            decimal originalOrderQtyBefore = lockInfo.OrderQuantity;
            decimal remainQty = originalAssignQtyBefore; // è‡ªåŠ¨æ‹†åŒ…后原条码分配数量保持不变

            // åˆ›å»ºæ–°åº“存明细（剩余部分）
            var newStockDetail = new Dt_StockInfoDetail
            try
            {
                StockId = stockDetail.StockId,
                MaterielCode = stockDetail.MaterielCode,
                OrderNo = stockDetail.OrderNo,
                BatchNo = stockDetail.BatchNo,
                StockQuantity = splitQuantity,
                OutboundQuantity = 0,
                Barcode = newBarcode,
                Status = (int)StockStatusEmun.出库锁定,
                SupplyCode = stockDetail.SupplyCode,
                Unit = stockDetail.Unit,
                BarcodeQty = stockDetail.BarcodeQty,
                BarcodeUnit = stockDetail.BarcodeUnit,
                BusinessType = stockDetail.BusinessType,
                InboundOrderRowNo = stockDetail.InboundOrderRowNo,
            };
            await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
            _logger.LogInformation($"创建新库存明细 - æ¡ç : {newBarcode}, åº“存数量: {splitQuantity}");
                //  éªŒè¯æ‹†åŒ…数量合理性
                if (splitQuantity <= 0)
                    throw new InvalidOperationException($"拆包数量必须大于0，当前值: {splitQuantity}");

            // æ›´æ–°åŽŸåº“存明细
            // é‡è¦ä¿®å¤ï¼šè‡ªåŠ¨æ‹†åŒ…时，原库存数量保持不变，因为我们要分拣的就是分配数量
            // stockDetail.StockQuantity ä¿æŒä¸å˜
                if (stockDetail.StockQuantity < lockInfo.AssignQuantity + splitQuantity)
                    throw new InvalidOperationException($"库存数量不足以进行自动拆包，库存: {stockDetail.StockQuantity}, éœ€è¦: {lockInfo.AssignQuantity + splitQuantity}");

            _logger.LogInformation($"原库存明细保持不变 - åº“存数量: {stockDetail.StockQuantity}");
                //  ç”Ÿæˆæ–°æ¡ç 
                string newBarcode = await GenerateNewBarcode();
                _logger.LogInformation($"生成新条码: {newBarcode}");

            // åˆ›å»ºæ–°é”å®šä¿¡æ¯ï¼ˆå‰©ä½™éƒ¨åˆ†ï¼‰
            var newLockInfo = new Dt_OutStockLockInfo
                // ã€æ ¸å¿ƒä¿®æ­£ã€‘更新原库存明细：只减少物理库存，不影响出库数量
                decimal originalStockQty = stockDetail.StockQuantity;
                stockDetail.StockQuantity -= splitQuantity; // ä»…库存减少
                                                            // stockDetail.OutboundQuantity ä¿æŒä¸å˜ï¼

                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
                _logger.LogInformation($"更新原库存明细：条码 {stockDetail.Barcode} åº“å­˜ {originalStockQty} -> {stockDetail.StockQuantity}，出库数量不变({stockDetail.OutboundQuantity})");

                //  åˆ›å»ºæ–°åº“存明细（多余部分）- å‡ºåº“数量为0
                var newStockDetail = new Dt_StockInfoDetail
                {
                    StockId = stockDetail.StockId,
                    MaterielCode = stockDetail.MaterielCode,
                    OrderNo = stockDetail.OrderNo,
                    BatchNo = stockDetail.BatchNo,
                    StockQuantity = splitQuantity, // æ–°åº“存数量
                    OutboundQuantity = 0, // åˆå§‹å‡ºåº“数量为0
                    Barcode = newBarcode,
                    Status = (int)StockStatusEmun.出库锁定, // ä»ä¸ºé”å®šçŠ¶æ€ï¼Œä½†æœªç»‘定订单
                    SupplyCode = stockDetail.SupplyCode,
                    Unit = stockDetail.Unit,
                    BarcodeQty = stockDetail.BarcodeQty,
                    BarcodeUnit = stockDetail.BarcodeUnit,
                    BusinessType = stockDetail.BusinessType,
                    InboundOrderRowNo = stockDetail.InboundOrderRowNo,
                };

                await _stockInfoDetailService.Db.Insertable(newStockDetail).ExecuteCommandAsync();
                _logger.LogInformation($"创建新库存明细：条码 {newBarcode}，库存 {splitQuantity}，出库 0");

                //  åˆ›å»ºæ–°é”å®šä¿¡æ¯ - æ ‡è®°ä¸ºæœªåˆ†é…
                var newLockInfo = new Dt_OutStockLockInfo
                {
                    OrderNo = lockInfo.OrderNo,
                    OrderDetailId = 0, // ä¸ç»‘定到具体订单明细，表示未分配
                    OutboundBatchNo = lockInfo.OutboundBatchNo,
                    MaterielCode = lockInfo.MaterielCode,
                    MaterielName = lockInfo.MaterielName,
                    StockId = lockInfo.StockId,
                    OrderQuantity = splitQuantity,
                    AssignQuantity = splitQuantity,
                    PickedQty = 0,
                    LocationCode = lockInfo.LocationCode,
                    PalletCode = lockInfo.PalletCode,
                    TaskNum = lockInfo.TaskNum,
                    Status = (int)OutLockStockStatusEnum.出库中,
                    Unit = lockInfo.Unit,
                    SupplyCode = lockInfo.SupplyCode,
                    OrderType = lockInfo.OrderType,
                    CurrentBarcode = newBarcode,
                    IsSplitted = 1,
                    ParentLockId = lockInfo.Id,
                    Operator = App.User.UserName,
                    FactoryArea = lockInfo.FactoryArea,
                    lineNo = lockInfo.lineNo,
                    WarehouseCode = lockInfo.WarehouseCode,
                    BarcodeQty = lockInfo.BarcodeQty,
                    BarcodeUnit = lockInfo.BarcodeUnit,
                    IsUnallocated = 1 // æ˜Žç¡®æ ‡è®°ä¸º"未分配"的锁定记录
                };

                await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
                _logger.LogInformation($"创建未分配锁定记录：ID {newLockInfo.Id}，条码 {newBarcode}，数量 {splitQuantity}");

                //原锁定记录和原订单明细数据完全保持不变！
                // - ä¸ä¿®æ”¹ lockInfo çš„任何字段
                // - ä¸ä¿®æ”¹å…³è”çš„ Dt_OutboundOrderDetail çš„ AllocatedQuantity å’Œ LockQuantity

                // è®°å½•æ‹†åŒ…历史
                await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, true, originalStockQty);

                // åˆ›å»ºæ‹†åŒ…结果列表
                var splitResults = CreateSplitResults(lockInfo, splitQuantity, lockInfo.AssignQuantity, newBarcode, stockDetail.Barcode);

                _logger.LogInformation($"自动拆包逻辑执行完成 - åˆ›å»ºäº†æœªåˆ†é…çš„库存和锁定记录");

                return splitResults;
            }
            catch (Exception ex)
            {
                OrderNo = lockInfo.OrderNo,
                OrderDetailId = lockInfo.OrderDetailId,
                OutboundBatchNo = lockInfo.OutboundBatchNo,
                MaterielCode = lockInfo.MaterielCode,
                MaterielName = lockInfo.MaterielName,
                StockId = lockInfo.StockId,
                OrderQuantity = splitQuantity,
                AssignQuantity = splitQuantity,
                PickedQty = 0,
                LocationCode = lockInfo.LocationCode,
                PalletCode = lockInfo.PalletCode,
                TaskNum = lockInfo.TaskNum,
                Status = (int)OutLockStockStatusEnum.出库中,
                Unit = lockInfo.Unit,
                SupplyCode = lockInfo.SupplyCode,
                OrderType = lockInfo.OrderType,
                CurrentBarcode = newBarcode,
                IsSplitted = 1,
                ParentLockId = lockInfo.Id,
                Operator = App.User.UserName,
                FactoryArea = lockInfo.FactoryArea,
                lineNo = lockInfo.lineNo,
                WarehouseCode = lockInfo.WarehouseCode,
                BarcodeQty = lockInfo.BarcodeQty,
                BarcodeUnit = lockInfo.BarcodeUnit,
            };

            await _outStockLockInfoService.Db.Insertable(newLockInfo).ExecuteCommandAsync();
            _logger.LogInformation($"创建新锁定信息 - æ¡ç : {newBarcode}, åˆ†é…æ•°é‡: {splitQuantity}");

            // è‡ªåŠ¨æ‹†åŒ…时，原锁定信息的分配数量保持不变
            // å› ä¸ºè‡ªåŠ¨æ‹†åŒ…后，原条码仍然需要被分拣，分配数量不应该改变
            _logger.LogInformation($"原锁定信息保持不变 - åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}, è®¢å•æ•°é‡: {lockInfo.OrderQuantity}");

            // è®°å½•æ‹†åŒ…历史
            await RecordSplitHistory(lockInfo, stockDetail, splitQuantity, newBarcode, true, stockDetail.StockQuantity);

            //  åˆ›å»ºæ‹†åŒ…结果列表
            var splitResults = CreateSplitResults(lockInfo, splitQuantity, remainQty, newBarcode, stockDetail.Barcode);

            _logger.LogInformation($"自动拆包逻辑执行完成");

            return splitResults;
                _logger.LogError($"自动拆包逻辑执行失败 - åŽŸæ¡ç : {stockDetail.Barcode}, Error: {ex.Message}");
                throw;
            }
        }


        #endregion

        #region æ ¸å¿ƒé€»è¾‘方法

        /// <summary>
        /// æ‰§è¡Œåˆ†æ‹£é€»è¾‘ - å®Œå…¨ä¿®æ­£ç‰ˆ
        /// ç¡®ä¿OutboundQuantity准确累加，不包含拆包数量
        /// </summary>
        private async Task<PickingResult> ExecutePickingLogic(
            Dt_OutStockLockInfo lockInfo, Dt_OutboundOrderDetail orderDetail,
            Dt_StockInfoDetail stockDetail, decimal actualPickedQty)
        {
            _logger.LogInformation($"开始执行分拣逻辑 - æ¡ç : {stockDetail.Barcode}, åˆ†é…æ•°é‡: {lockInfo.AssignQuantity}, å®žé™…拣选: {actualPickedQty}");

            // å†æ¬¡éªŒè¯è®¢å•æ˜Žç»†çš„分配数量（防止并发操作）
            if (orderDetail.AllocatedQuantity < actualPickedQty)
            // å†æ¬¡éªŒè¯åº“存数量
            if (stockDetail.StockQuantity < actualPickedQty)
            {
                throw new InvalidOperationException($"订单明细分配数量不足，需要拣选 {actualPickedQty}，可用分配数量 {orderDetail.AllocatedQuantity}");
                throw new InvalidOperationException($"库存数量不足，需要拣选 {actualPickedQty}，实际库存 {stockDetail.StockQuantity}");
            }

            if (orderDetail.LockQuantity < actualPickedQty)
            // è®°å½•æ‹£é€‰å‰çš„值
            decimal originalStockQty = stockDetail.StockQuantity;
            decimal originalOutboundQty = stockDetail.OutboundQuantity;
            int originalStatus = stockDetail.Status;

            // ç¡®ä¿OutboundQuantity只增加本次拣选数量，不包含其他
            stockDetail.StockQuantity -= actualPickedQty;
            stockDetail.OutboundQuantity += actualPickedQty;  // åªå¢žåŠ æœ¬æ¬¡æ‹£é€‰æ•°é‡

            _logger.LogInformation($"更新库存信息 - æ¡ç : {stockDetail.Barcode}");
            _logger.LogInformation($"  åº“存数量: {originalStockQty} -> {stockDetail.StockQuantity}");
            _logger.LogInformation($"  å‡ºåº“数量: {originalOutboundQty} -> {stockDetail.OutboundQuantity}");

            // æ›´æ–°åº“存状态
            if (stockDetail.StockQuantity <= 0)
            {
                throw new InvalidOperationException($"订单明细锁定数量不足，需要拣选 {actualPickedQty}，可用锁定数量 {orderDetail.LockQuantity}");
                stockDetail.Status = (int)StockStatusEmun.出库完成;
                _logger.LogInformation($"库存状态更新为出库完成");
            }
            else
            {
                stockDetail.Status = (int)StockStatusEmun.出库锁定;
                _logger.LogInformation($"库存状态保持为出库锁定");
            }

            await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();

            // æ›´æ–°é”å®šä¿¡æ¯
            decimal originalPickedQty = lockInfo.PickedQty;
            lockInfo.PickedQty += actualPickedQty;
            _logger.LogInformation($"更新锁定信息 - å·²æ‹£é€‰æ•°é‡ä»Ž {lockInfo.PickedQty - actualPickedQty} å¢žåŠ åˆ° {lockInfo.PickedQty}");
            _logger.LogInformation($"更新锁定信息 - å·²æ‹£é€‰æ•°é‡ä»Ž {originalPickedQty} å¢žåŠ åˆ° {lockInfo.PickedQty}");

            // å‡†ç¡®åˆ¤æ–­æ‹£é€‰å®ŒæˆçŠ¶æ€
            // åˆ¤æ–­æ‹£é€‰å®ŒæˆçŠ¶æ€
            if (Math.Abs(lockInfo.PickedQty - lockInfo.AssignQuantity) < 0.001m)
            {
                lockInfo.Status = (int)OutLockStockStatusEnum.拣选完成;
@@ -2302,29 +3355,8 @@
            lockInfo.Operator = App.User.UserName;
            await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

            // æ›´æ–°åº“存信息
            decimal originalStockQty = stockDetail.StockQuantity;
            decimal originalOutboundQty = stockDetail.OutboundQuantity;

            stockDetail.StockQuantity -= actualPickedQty;
            stockDetail.OutboundQuantity += actualPickedQty;

            _logger.LogInformation($"更新库存信息 - åº“存数量从 {originalStockQty} å‡å°‘到 {stockDetail.StockQuantity}");
            _logger.LogInformation($"更新库存信息 - å‡ºåº“数量从 {originalOutboundQty} å¢žåŠ åˆ° {stockDetail.OutboundQuantity}");

            // å‡†ç¡®åˆ¤æ–­åº“存状态
            if (stockDetail.StockQuantity <= 0)
            {
                stockDetail.Status = (int)StockStatusEmun.出库完成;
                _logger.LogInformation($"库存状态更新为出库完成");
            }
            else
            {
                stockDetail.Status = (int)StockStatusEmun.出库锁定;
                _logger.LogInformation($"库存状态保持为出库锁定");
            }

            await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
            // éªŒè¯æ‹£é€‰åŽçš„数据一致性
            await ValidatePickingDataConsistency(lockInfo, stockDetail, actualPickedQty);

            _logger.LogInformation($"分拣逻辑执行完成 - æ¡ç : {stockDetail.Barcode}");

@@ -2335,11 +3367,45 @@
            };
        }

        /// <summary>
        /// éªŒè¯æ‹£é€‰åŽæ•°æ®ä¸€è‡´æ€§
        /// </summary>
        private async Task ValidatePickingDataConsistency(Dt_OutStockLockInfo lockInfo, Dt_StockInfoDetail stockDetail, decimal pickedQty)
        {
            _logger.LogInformation($"验证拣选数据一致性 - æ¡ç : {stockDetail.Barcode}");

            //  éªŒè¯åº“存明细的OutboundQuantity增加量等于拣选数量
            var refreshedStockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .FirstAsync(x => x.Id == stockDetail.Id);

            decimal outboundIncrease = refreshedStockDetail.OutboundQuantity - stockDetail.OutboundQuantity;

            if (Math.Abs(outboundIncrease - pickedQty) > 0.01m)
            {
                _logger.LogError($"拣选数据不一致：出库数量增加 {outboundIncrease}，但拣选数量是 {pickedQty}");
                // ç¡®ä¿OutboundQuantity正确
                refreshedStockDetail.OutboundQuantity = stockDetail.OutboundQuantity + pickedQty;
                await _stockInfoDetailService.Db.Updateable(refreshedStockDetail).ExecuteCommandAsync();
                _logger.LogWarning($"已修复出库数量：{stockDetail.OutboundQuantity} -> {refreshedStockDetail.OutboundQuantity}");
            }

            // éªŒè¯é”å®šè®°å½•çš„已拣选数量
            var refreshedLockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .FirstAsync(x => x.Id == lockInfo.Id);

            if (Math.Abs(refreshedLockInfo.PickedQty - (lockInfo.PickedQty - pickedQty) - pickedQty) > 0.01m)
            {
                _logger.LogError($"锁定记录已拣选数量不一致");
            }

            _logger.LogInformation($"拣选数据一致性验证通过");
        }

        private async Task<RevertPickingResult> RevertPickingData(Dt_PickingRecord pickingRecord)
        {
            _logger.LogInformation($"开始恢复拣选数据 - æ‹£é€‰è®°å½•ID: {pickingRecord.Id}, æ¡ç : {pickingRecord.Barcode}, æ‹£é€‰æ•°é‡: {pickingRecord.PickQuantity}");

            // 1. æ¢å¤é”å®šä¿¡æ¯
            // æ¢å¤é”å®šä¿¡æ¯
            var lockInfo = await _outStockLockInfoService.Db.Queryable<Dt_OutStockLockInfo>()
                .FirstAsync(x => x.Id == pickingRecord.OutStockLockId);

@@ -2351,7 +3417,7 @@
            decimal originalPickedQty = lockInfo.PickedQty;
            decimal originalAssignQty = lockInfo.AssignQuantity; // è®°å½•åŽŸå§‹åˆ†é…æ•°é‡

            // é‡è¦ä¿®å¤ï¼šåªæ¢å¤å·²æ‹£é€‰æ•°é‡ï¼Œä¸ä¿®æ”¹åˆ†é…æ•°é‡
            // åªæ¢å¤å·²æ‹£é€‰æ•°é‡ï¼Œä¸ä¿®æ”¹åˆ†é…æ•°é‡
            lockInfo.PickedQty -= pickingRecord.PickQuantity;

            // ç¡®ä¿å·²æ‹£é€‰æ•°é‡ä¸ä¼šä¸ºè´Ÿæ•°
@@ -2378,7 +3444,7 @@

            await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();

            // 2. æ¢å¤åº“存信息
            // æ¢å¤åº“存信息
            var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .FirstAsync(x => x.Barcode == pickingRecord.Barcode);

@@ -2425,59 +3491,85 @@

        #region æ•°æ®æ›´æ–°æ–¹æ³•

        /// <summary>
        /// æ›´æ–°æ‰¹æ¬¡å’Œè®¢å•æ•°æ® - ä¿®æ­£ç‰ˆ
        /// ç¡®ä¿åªæ›´æ–°å®žé™…的拣选数量
        /// </summary>
        private async Task UpdateBatchAndOrderData(Dt_OutboundBatch batch, Dt_OutboundOrderDetail orderDetail, decimal pickedQty, string orderNo)
        {
            _logger.LogInformation($"开始更新批次和订单数据 - æ‹£é€‰æ•°é‡: {pickedQty}");
            var latestOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().FirstAsync(x => x.Id == orderDetail.Id);

            // é‡æ–°èŽ·å–最新数据（防止并发问题）
            var latestOrderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                .FirstAsync(x => x.Id == orderDetail.Id);

            if (latestOrderDetail == null)
                throw new InvalidOperationException("未找到订单明细");

            orderDetail = latestOrderDetail;
            // é‡è¦ä¿®å¤ï¼šéªŒè¯åˆ†é…æ•°é‡ä¸ä¼šå˜æˆè´Ÿæ•°
            if (orderDetail.AllocatedQuantity < pickedQty)

            // éªŒè¯æ‹£é€‰æ•°é‡åˆç†æ€§
            if (pickedQty <= 0)
            {
                decimal actualPickedQty = orderDetail.AllocatedQuantity;
                _logger.LogWarning($"分配数量不足，调整拣选数量 - åŽŸéœ€è¦: {pickedQty}, å®žé™…可用: {actualPickedQty}");
                pickedQty = actualPickedQty;
                _logger.LogWarning($"拣选数量无效: {pickedQty}");
                return;
            }

            if (orderDetail.LockQuantity < pickedQty)
            {
                decimal actualPickedQty = orderDetail.LockQuantity;
                _logger.LogWarning($"锁定数量不足，调整拣选数量 - åŽŸéœ€è¦: {pickedQty}, å®žé™…可用: {actualPickedQty}");
                pickedQty = actualPickedQty;
            }

            // 1. æ›´æ–°æ‰¹æ¬¡å®Œæˆæ•°é‡
            decimal originalBatchCompletedQty = batch.CompletedQuantity;
            batch.CompletedQuantity += pickedQty;

            _logger.LogInformation($"更新批次完成数量 - ä»Ž {originalBatchCompletedQty} å¢žåŠ åˆ° {batch.CompletedQuantity}");

            if (batch.CompletedQuantity >= batch.BatchQuantity)
            {
                batch.BatchStatus = (int)BatchStatusEnum.已完成;
                _logger.LogInformation($"批次状态更新为已完成");
            }
            await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();

            // æ›´æ–°è®¢å•æ˜Žç»†
            // è®°å½•åŽŸå§‹å€¼
            decimal originalOverOutQty = orderDetail.OverOutQuantity;
            decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
            decimal originalLockQty = orderDetail.LockQuantity;

            orderDetail.OverOutQuantity += pickedQty;
            orderDetail.AllocatedQuantity -= pickedQty;
            // LockQuantity åŒæ­¥å‡å°‘
            orderDetail.LockQuantity = orderDetail.AllocatedQuantity;
            if (orderDetail.AllocatedQuantity < 0) orderDetail.AllocatedQuantity = 0;
            if (orderDetail.LockQuantity < 0) orderDetail.LockQuantity = 0;
            _logger.LogInformation($"更新订单明细 - å·²å‡ºåº“数量从 {originalOverOutQty} å¢žåŠ åˆ° {orderDetail.OverOutQuantity}");
            _logger.LogInformation($"更新订单明细 - å·²åˆ†é…æ•°é‡ä»Ž {originalAllocatedQty} å‡å°‘到 {orderDetail.AllocatedQuantity}");
            _logger.LogInformation($"更新订单明细 - é”å®šæ•°é‡ä»Ž {originalLockQty} å‡å°‘到 {orderDetail.LockQuantity}");
            // æ›´æ–°è®¢å•æ˜Žç»†
            orderDetail.OverOutQuantity += pickedQty;  // å·²å‡ºåº“数量增加
            orderDetail.AllocatedQuantity -= pickedQty;  // å·²åˆ†é…æ•°é‡å‡å°‘
            orderDetail.LockQuantity -= pickedQty;  // é”å®šæ•°é‡å‡å°‘

            // ç¡®ä¿æ•°é‡ä¸ä¼šä¸ºè´Ÿæ•°
            if (orderDetail.AllocatedQuantity < 0)
            {
                _logger.LogWarning($"分配数量出现负数，重置为0。原值: {orderDetail.AllocatedQuantity + pickedQty}");
                orderDetail.AllocatedQuantity = 0;
            }

            if (orderDetail.LockQuantity < 0)
            {
                _logger.LogWarning($"锁定数量出现负数，重置为0。原值: {orderDetail.LockQuantity + pickedQty}");
                orderDetail.LockQuantity = 0;
            }

            // æ›´æ–°æ‰¹æ¬¡åˆ†é…çŠ¶æ€
            await UpdateBatchAllocateStatus(orderDetail);

            await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();

            _logger.LogInformation($"更新订单明细成功");
            _logger.LogInformation($"  å·²å‡ºåº“数量: {originalOverOutQty} -> {orderDetail.OverOutQuantity}");
            _logger.LogInformation($"  å·²åˆ†é…æ•°é‡: {originalAllocatedQty} -> {orderDetail.AllocatedQuantity}");
            _logger.LogInformation($"  é”å®šæ•°é‡: {originalLockQty} -> {orderDetail.LockQuantity}");

            // æ›´æ–°æ‰¹æ¬¡å®Œæˆæ•°é‡
            if (batch != null)
            {
                decimal originalBatchCompletedQty = batch.CompletedQuantity;
                batch.CompletedQuantity += pickedQty;

                _logger.LogInformation($"更新批次完成数量 - ä»Ž {originalBatchCompletedQty} å¢žåŠ åˆ° {batch.CompletedQuantity}");

                // æ›´æ–°æ‰¹æ¬¡çŠ¶æ€
                if (batch.CompletedQuantity >= batch.BatchQuantity)
                {
                    batch.BatchStatus = (int)BatchStatusEnum.已完成;
                    _logger.LogInformation($"批次状态更新为已完成");
                }
                else if (batch.CompletedQuantity > 0)
                {
                    batch.BatchStatus = (int)BatchStatusEnum.执行中;
                    _logger.LogInformation($"批次状态更新为执行中");
                }

                await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();
            }

            // æ£€æŸ¥è®¢å•çŠ¶æ€
            await CheckAndUpdateOrderStatus(orderNo);
@@ -2529,9 +3621,9 @@
                decimal originalAllocatedQty = orderDetail.AllocatedQuantity;
                decimal originalLockQty = orderDetail.LockQuantity;

                // é‡è¦ä¿®å¤ï¼šåªæ¢å¤ç›¸å…³æ•°é‡ï¼Œåˆ†é…æ•°é‡ä¿æŒä¸å˜
                // åªæ¢å¤ç›¸å…³æ•°é‡ï¼Œåˆ†é…æ•°é‡ä¿æŒä¸å˜
                orderDetail.OverOutQuantity -= pickingRecord.PickQuantity;
                orderDetail.AllocatedQuantity += pickingRecord.PickQuantity;   
                orderDetail.AllocatedQuantity += pickingRecord.PickQuantity;
                orderDetail.LockQuantity += pickingRecord.PickQuantity;
                if (orderDetail.OverOutQuantity < 0) orderDetail.OverOutQuantity = 0;
                if (orderDetail.AllocatedQuantity < 0) orderDetail.AllocatedQuantity = 0;
@@ -2545,7 +3637,7 @@
                await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
            }

            // 3. é‡æ–°æ£€æŸ¥è®¢å•çŠ¶æ€
            // é‡æ–°æ£€æŸ¥è®¢å•çŠ¶æ€
            await CheckAndUpdateOrderStatus(pickingRecord.OrderNo);

            _logger.LogInformation($"恢复批次和订单数据完成");
@@ -2566,125 +3658,9 @@
                orderDetail.BatchAllocateStatus = OrderDetailStatusEnum.New.ObjToInt();
            }
        }
        private async Task ReleaseLockAndStock(Dt_OutStockLockInfo lockInfo)
        {
            // æ¢å¤åº“存状态 - å›žåº“后库存变为可用状态
            var stockDetail = await _stockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .FirstAsync(x => x.Barcode == lockInfo.CurrentBarcode && x.StockId == lockInfo.StockId);

            if (stockDetail != null)
            {
                // å›žåº“后库存状态恢复为入库完成（可用状态）
                stockDetail.Status = (int)StockStatusEmun.入库完成;
                await _stockInfoDetailService.Db.Updateable(stockDetail).ExecuteCommandAsync();
            }

            // æ›´æ–°é”å®šè®°å½•çŠ¶æ€ä¸ºå·²å›žåº“
            lockInfo.Status = (int)OutLockStockStatusEnum.已回库;
            lockInfo.Operator = App.User.UserName;
            await _outStockLockInfoService.Db.Updateable(lockInfo).ExecuteCommandAsync();
        }

        /// <summary>
        /// æ›´æ–°æ‰¹æ¬¡çŠ¶æ€ï¼ˆå›žåº“） 
        /// </summary>
        private async Task UpdateBatchStatusForReturn(string outboundBatchNo, List<Dt_OutStockLockInfo> returnedLocks)
        {
            var batch = await _outboundBatchRepository.Db.Queryable<Dt_OutboundBatch>()
                .FirstAsync(x => x.BatchNo == outboundBatchNo);

            if (batch != null)
            {
                // è®¡ç®—回库数量（未拣选的部分）
                var returnedQty = returnedLocks.Sum(x => x.AssignQuantity - x.PickedQty);
                batch.CompletedQuantity -= returnedQty;

                // æ›´æ–°æ‰¹æ¬¡çŠ¶æ€
                if (batch.CompletedQuantity <= 0)
                {
                    batch.BatchStatus = (int)BatchStatusEnum.已回库;
                }
                else if (batch.CompletedQuantity < batch.BatchQuantity)
                {
                    batch.BatchStatus = (int)BatchStatusEnum.执行中;
                }
                else
                {
                    batch.BatchStatus = (int)BatchStatusEnum.已完成;
                }

                batch.Operator = App.User.UserName;
                await _outboundBatchRepository.Db.Updateable(batch).ExecuteCommandAsync();
            }
        }

        /// <summary>
        /// æ›´æ–°è®¢å•æ˜Žç»†ï¼ˆå›žåº“后） 
        /// </summary>
        private async Task UpdateOrderDetailAfterReturn(List<Dt_OutStockLockInfo> returnedLocks)
        {
            var orderDetailGroups = returnedLocks.GroupBy(x => x.OrderDetailId);

            foreach (var group in orderDetailGroups)
            {
                var orderDetailId = group.Key;
                var returnedQty = group.Sum(x => x.AssignQuantity - x.PickedQty);

                var orderDetail = await _outboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                    .FirstAsync(x => x.Id == orderDetailId);

                if (orderDetail != null)
                {
                    orderDetail.AllocatedQuantity -= returnedQty;
                    // LockQuantity åŒæ­¥å‡å°‘，保持与已分配数量一致
                    orderDetail.LockQuantity = orderDetail.AllocatedQuantity;

                    await UpdateBatchAllocateStatus(orderDetail);

                    await _outboundOrderDetailService.Db.Updateable(orderDetail).ExecuteCommandAsync();
                }
            }
        }
      
        #endregion

        private async Task CreateReturnTaskAndHandleESS(string orderNo, string palletCode, Dt_Task originalTask, TaskTypeEnum taskTypeEnum, int palletType)
        {
            var firstLocation = await _locationInfoService.Db.Queryable<Dt_LocationInfo>()
                .FirstAsync(x => x.LocationCode == originalTask.SourceAddress);

            // åˆ†é…æ–°è´§ä½
            var newLocation = _locationInfoService.AssignLocation(firstLocation.LocationType);

            Dt_Task returnTask = new()
            {
                CurrentAddress = stations[originalTask.TargetAddress],
                Grade = 0,
                PalletCode = palletCode,
                NextAddress = "",
                // OrderNo = originalTask.OrderNo,
                OrderNo = orderNo,
                Roadway = newLocation.RoadwayNo,
                SourceAddress = stations[originalTask.TargetAddress],
                TargetAddress = newLocation.LocationCode,
                TaskStatus = TaskStatusEnum.New.ObjToInt(),
                TaskType = taskTypeEnum.ObjToInt(),
                PalletType = palletType,
                WarehouseId = originalTask.WarehouseId

            };
            // ä¿å­˜å›žåº“任务
            await _taskRepository.Db.Insertable(returnTask).ExecuteCommandAsync();
            var targetAddress = originalTask.TargetAddress;

            // åˆ é™¤åŽŸå§‹å‡ºåº“任务
            _taskRepository.DeleteAndMoveIntoHty(originalTask, OperateTypeEnum.自动完成);
            // await _taskRepository.Db.Deleteable(originalTask).ExecuteCommandAsync();



            // ç»™ ESS å‘送流动信号和创建任务
            await SendESSCommands(palletCode, targetAddress, returnTask);
        }
                
        /// <summary>
        /// ç»™ESS下任务
        /// </summary>
@@ -2697,16 +3673,14 @@
        {
            try
            {
                // 1. å‘送流动信号
                // å‘送流动信号
                var moveResult = await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest
                {
                    slotCode = movestations[targetAddress],
                    containerCode = palletCode
                });

                //if (moveResult)
                //{
                // 2. åˆ›å»ºå›žåº“任务
              
                var essTask = new TaskModel()
                {
                    taskType = "putaway",
@@ -2730,7 +3704,7 @@

                var resultTask = await _eSSApiService.CreateTaskAsync(essTask);
                _logger.LogInformation($"ReturnRemaining åˆ›å»ºä»»åŠ¡æˆåŠŸ: {resultTask}");
                //}
             
            }
            catch (Exception ex)
            {
@@ -2738,7 +3712,6 @@
                throw new Exception($"ESS系统通信失败: {ex.Message}");
            }
        }


        #region è¾…助方法

@@ -2765,6 +3738,7 @@
                // SplitType = isAutoSplit ? "自动拆包" : "手动拆包"
                OriginalStockQuantity = originalStockQuantity ?? stockDetail.StockQuantity,
                //RemainingStockQuantity = stockDetail.StockQuantity - splitQty
                TaskNum = lockInfo.TaskNum
            };

            await _splitPackageService.Db.Insertable(splitHistory).ExecuteCommandAsync();
@@ -2827,28 +3801,32 @@
        }
        #endregion


        #region DTOç±»

        /// <summary>
        /// æ¡ç çŠ¶æ€ä¿¡æ¯DTO
        /// å›žåº“任务信息类
        /// </summary>
        public class BarcodeStatusInfoDto
        public class ReturnTaskInfo
        {
            public string Barcode { get; set; }
            public string OrderNo { get; set; }
            public bool IsOriginalBarcode { get; set; }
            public int SplitChainCount { get; set; }
            public bool HasBeenPicked { get; set; }
            public decimal TotalPickedQuantity { get; set; }
            public int PickRecordCount { get; set; }
            public int LockInfoStatus { get; set; }
            public decimal LockInfoPickedQty { get; set; }
            public decimal LockInfoAssignQty { get; set; }
            public decimal StockQuantity { get; set; }
            public int StockStatus { get; set; }
            public bool CanCancelSplit { get; set; }
            public bool NeedCancelPickFirst { get; set; }
            public List<string> OperationSuggestions { get; set; } = new List<string>();
            /// <summary>
            /// æ˜¯å¦éœ€è¦å‘送ESS命令
            /// </summary>
            public bool ShouldSendESS { get; set; }

            /// <summary>
            /// æ‰˜ç›˜ç 
            /// </summary>
            public string PalletCode { get; set; }

            /// <summary>
            /// åŽŸå§‹ä»»åŠ¡çš„目标地址
            /// </summary>
            public string OriginalTaskTargetAddress { get; set; }

            /// <summary>
            /// å›žåº“任务
            /// </summary>
            public Dt_Task ReturnTask { get; set; }
        }
        public class PickedBarcodeInfo
        {
@@ -2856,14 +3834,7 @@
            public decimal PickedQty { get; set; }
            public int PickRecordCount { get; set; }
        }
        /// <summary>
        /// è‡ªåŠ¨æ‹†åŒ…结果
        /// </summary>
        public class AutoSplitResult
        {
            public string NewBarcode { get; set; }
            public decimal SplitQuantity { get; set; }
        }


        public class PickingResult
        {
@@ -2875,11 +3846,6 @@
        {
            public Dt_OutStockLockInfo LockInfo { get; set; }
            public Dt_StockInfoDetail StockDetail { get; set; }
        }

        public class SplitResultDto
        {
            public string NewBarcode { get; set; }
        }

        public class ValidationResult<T>