优化成品出入库流程代码

wankeda

2026-01-13 ce3b28cdcdb2b6a912413cd9e744d0ecadcb78a0

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -80,6 +80,7 @@
using System.Drawing.Printing;
using System;
using WIDESEA_Common.Log;
using static WIDESEA_Common.HouseInboundPassBack.data.data1;

namespace WIDESEA_TaskInfoService
{
@@ -105,6 +106,7 @@
        private readonly IOutboundOrderDetail_HtyService _outboundOrderDetail_HtyService;
        private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
        private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
        private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
        private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
        private readonly IReturnOrderRepository _returnOrderRepository;
        private readonly IProductionRepository _productionRepository;
@@ -112,7 +114,7 @@

        public ITaskRepository Repository => BaseDal;

        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository,IInboundRepository inboundRepository) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _stockRepository = stockRepository;
@@ -137,6 +139,7 @@
            _returnOrderRepository = returnOrderRepository;
            _productionRepository = productionRepository;
            _inboundRepository = inboundRepository;
            _newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
        }

        public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -167,6 +170,30 @@
                    return WebResponseContent.Instance.Error($"未找到WCSApi地址,请检查配置文件");
                }
                string response = HttpHelper.Post($"{url}/api/Task/ReceiveTask", taskDTOs.Serialize());

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        public WebResponseContent PushTasksWCS(List<Dt_Task> tasks, string agvDescription = "")
        {
            try
            {
                List<WMSTaskDTO> taskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
                taskDTOs.ForEach(x =>
                {
                    x.AGVArea = agvDescription;
                });
                string url = AppSettings.app("WCS");
                if (string.IsNullOrEmpty(url))
                {
                    return WebResponseContent.Instance.Error($"未找到WCSApi地址,请检查配置文件");
                }
                string response = HttpHelper.Post($"{url}/api/Task/ReceiveCPTask", taskDTOs.Serialize());

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
            }
@@ -466,36 +493,433 @@
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

                dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;


                Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
                Dt_InboundOrderDetail? inboundOrderDetail = null;

                // 3. 处理入库逻辑
                if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
                if (task.TaskType == TaskTypeEnum.InSyncretism.ObjToInt())
                {
                    return ProcessInbound(task, dt_StockInfo, dt_LocationInfo);
                }
                if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
                {
                    return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
                }
                if(task.TaskType == TaskTypeEnum.InInventory.ObjToInt())
                {
                    int lastStatus = dt_LocationInfo.LocationStatus;
                    int laststatus = dt_LocationInfo.LocationStatus;
                    dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                    ///更新库存状态
                    dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                    // 更新库存明细状态
                    dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());
                    _unitOfWorkManage.BeginTran();
                    UpdateTaskStatus(task);
                    UpdateLocationStatus(dt_LocationInfo, lastStatus);
                    UpdateStockInfo(dt_StockInfo);
                    AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
                    _unitOfWorkManage.CommitTran();
                    return WebResponseContent.Instance.OK();

                    _unitOfWorkManage.BeginTran();

                    // 更新任务状态
                    UpdateTaskStatus(task);

                    // 更新货位状态
                    UpdateLocationStatus(dt_LocationInfo, laststatus);

                    // 更新库存信息
                    UpdateStockInfo(dt_StockInfo);

                    AddRecords(task, dt_StockInfo, dt_LocationInfo, laststatus);

                    //返回smom库存移动数据。。。。

                    _unitOfWorkManage.CommitTran();
                }
                else
                {
                    if (warehouse.WarehouseCode.Contains("CP"))
                    {

                        if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                            Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == dt_StockInfo.PalletCode);
                            if (returnOrder == null)
                            {
                                return WebResponseContent.Instance.Error("未找到回库单信息");
                            }
                            return SurplusReturnInbound(task, dt_StockInfo, dt_LocationInfo, lastStatus, returnOrder);
                        }
                        // 1. 获取入库单信息
                        Dt_InboundOrder? inboundOrder = null;
                        if (!string.IsNullOrEmpty(dt_StockInfo.Details.FirstOrDefault()?.OrderNo))
                        {
                            inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>()
                                .Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo)
                                .Includes(x => x.Details)
                                .First();
                        }

                        // 3. 处理入库逻辑
                        if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();

                            if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && inboundOrder == null)
                            {
                                return WebResponseContent.Instance.Error("未找到入库单信息");
                            }
                            var allBoxCodesForDetail = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
                         .Where(x => x.StockDetailId == dt_StockInfo.Details.FirstOrDefault().Id)
                         .Select(x => x.BoxCode)
                         .ToList();

                            // 2. 获取托盘下的所有箱号
                            var boxCodes = new List<string>();

                            // 方法1：从库存明细的BoxCodes字段获取（组盘时保存的）
                            foreach (var detail in allBoxCodesForDetail)
                            {
                                if (!string.IsNullOrEmpty(detail))
                                {
                                    var codes = detail.Split(',', StringSplitOptions.RemoveEmptyEntries);
                                    boxCodes.AddRange(codes);
                                }
                            }

                            // 根据托盘明细获取对应的入库单明细
                            List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();

                            // 处理多个库存明细的情况
                            foreach (var stockDetail in dt_StockInfo.Details)
                            {
                                if (!string.IsNullOrEmpty(stockDetail.OrderNo))
                                {
                                    var detail = inboundOrder.Details.FirstOrDefault(x => x.LinId == stockDetail.LinId && x.BatchNo == stockDetail.BatchNo);

                                    if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
                                    {
                                        inboundOrderDetails.Add(detail);
                                    }
                                }
                            }

                            if (!inboundOrderDetails.Any())
                            {
                                return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
                            }

                            // 更新入库单明细状态
                            foreach (var inboundOrderDetail in inboundOrderDetails)
                            {
                                // 检查该明细是否已全部入库
                                decimal totalStockQuantity = dt_StockInfo.Details
                                    .Where(x => x.LinId == inboundOrderDetail.LinId && x.BatchNo == inboundOrderDetail.BatchNo)
                                    .Sum(x => x.StockQuantity);

                                decimal orderQuantity = Convert.ToDecimal(inboundOrderDetail.OrderQuantity);
                                decimal receiptQuantity = Convert.ToDecimal(inboundOrderDetail.ReceiptQuantity);
                                decimal overInQuantity = Convert.ToDecimal(inboundOrderDetail.OverInQuantity);

                                // 更新收货数量
                                inboundOrderDetail.OverInQuantity = totalStockQuantity += overInQuantity;

                                // 检查是否全部完成
                                if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                }
                                else
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
                                }
                            }

                            ///更新库存状态
                            dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            // 更新库存明细状态
                            dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());

                            // 3. 查询成品入库明细（CP入库单明细）
                            List<Dt_CPInboundOrderDetail> cpInboundDetails = new List<Dt_CPInboundOrderDetail>();
                            if (boxCodes.Any())
                            {
                                cpInboundDetails = BaseDal.Db.Queryable<Dt_CPInboundOrderDetail>()
                                    .Where(x => boxCodes.Contains(x.BoxCode))
                                    .ToList();
                            }

                            // 更新成品入库明细状态
                            if (cpInboundDetails.Any())
                            {
                                foreach (var cpDetail in cpInboundDetails)
                                {
                                    cpDetail.CPOrderDetailStatus = InboundStatusEnum.入库完成.ObjToInt();
                                }
                            }

                            // 4. 查询并更新成品库存明细（如果有单独的成品库存表）
                            List<Dt_StockInfoDetailCP> cpStockDetails = new List<Dt_StockInfoDetailCP>();
                            if (boxCodes.Any())
                            {
                                cpStockDetails = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
                                    .Where(x => boxCodes.Contains(x.BoxCode))
                                    .ToList();

                                // 更新成品库存明细状态
                                foreach (var cpStockDetail in cpStockDetails)
                                {
                                    cpStockDetail.CPStockDetailStatus = StockStatusEmun.入库完成.ObjToInt();
                                }
                            }

                            try
                            {
                                _unitOfWorkManage.BeginTran();

                                // 更新任务状态
                                UpdateTaskStatus(task);

                                // 更新货位状态
                                UpdateLocationStatus(dt_LocationInfo, lastStatus);

                                // 更新库存信息
                                UpdateStockInfo(dt_StockInfo);

                                // 添加记录
                                AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);

                                // 更新入库单明细
                                if (inboundOrderDetails.Any())
                                {
                                    BaseDal.Db.Updateable(inboundOrderDetails).ExecuteCommand();

                                    // 检查入库单是否全部完成
                                    bool allCompleted = inboundOrder.Details.All(x =>
                                        x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());

                                    if (allCompleted)
                                    {
                                        inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                                        foreach (var item in inboundOrderDetails)
                                        {
                                            BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
                                        }
                                    }
                                    else
                                    {
                                        inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                                    }
                                }

                                // 更新入库单
                                UpdateInboundOrder(inboundOrder, inboundOrderDetails.FirstOrDefault());

                                // 更新成品入库明细状态
                                if (cpInboundDetails.Any())
                                {
                                    BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
                                }

                                // 更新成品库存明细状态
                                if (cpStockDetails.Any())
                                {
                                    BaseDal.Db.Updateable(cpStockDetails).ExecuteCommand();
                                }

                                // 单据数量全部上架完成，处理WMS回传
                                if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
                                {
                                    foreach (var detail in inboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
                                    {
                                        FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
                                    }
                                }
                                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
                                {
                                    List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
                                        .Queryable<Dt_StockInfo>()
                                        .Includes(x => x.Details, d => d.StockDetails)
                                        .Where(x => x.WarehouseId == task.WarehouseId &&
                                                    x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
                                        .ToList();

                                    if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
                                    var houseInboundPassBack = new HouseInboundPassBack
                                    {
                                        ApiType = "AsnController",
                                        Method = "AsrsGroudingAsn",
                                        Parameters = new List<HouseInboundPassBack.data>
                                            {
                                                new HouseInboundPassBack.data
                                                {
                                                    Value = new List<data.data1>
                                                    {
                                                        new data.data1
                                                        {
                                                            AsnNo = inboundOrder.OrderNo,
                                                            //InWarehouse = task.Roadway,
                                                            TransactionCode = inboundOrder.TransactionCode,
                                                            InoutType = inboundOrder.OrderType,
                                                            OrderType = inboundOrder.InoutType,
                                                            // 遍历所有库存明细，添加到 DetailList
                                                                     DetailList = StockInfos
                                                    .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
                                                    .GroupBy(x => new
                                                    {
                                                        x.Pallet.PalletCode,
                                                        x.Detail.MaterielCode,
                                                        x.Detail.BatchNo,
                                                        x.Detail.LinId
                                                    })
                                                    .Select(g => new data.data1.Inbound
                                                    {
                                                        LinId = g.Key.LinId ?? "",
                                                        MaterielCode = g.Key.MaterielCode ?? "",
                                                        OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
                                                        BatchNo = g.Key.BatchNo,
                                                        LPNNo = g.Key.PalletCode,
                                                        FinishQty = g.Sum(x => x.Detail.StockQuantity),
                                                        LocationName = g.First().Pallet.LocationCode,
                                                        LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
                                                            .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
                                                            .Select(sd => sd.BoxCode)
                                                            .Distinct()
                                                            .ToList()
                                                    })
                                                    .ToList()
                                                        }
                                                    }
                                                }
                                            }
                                    };

                                    var authResult = AuthenticateWithWMS();
                                    if (authResult.IsSuccess)
                                    {
                                        houseInboundPassBack.Context = new Dictionary<string, string>
                                            {
                                                { "Ticket", authResult.Ticket },
                                                { "InvOrgId", authResult.InvOrgId }
                                            };

                                        var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
                                        // 判断Success的值
                                        if (!response.Success)
                                        {
                                            throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                                        }

                                    }

                                }
                                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                                {
                                    List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
                                        .Queryable<Dt_StockInfo>()
                                        .Includes(x => x.Details, d => d.StockDetails)
                                        .Where(x => x.WarehouseId == task.WarehouseId &&
                                                    x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
                                        .ToList();
                                    if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
                                    var inventoryAllocate = new InventoryAllocate
                                    {
                                        ApiType = "InventoryAllocateController",
                                        Method = "AsrsFinishedStockCount",
                                        Parameters = new List<InventoryAllocate.Allocate>
                                        {
                                             new InventoryAllocate.Allocate
                                            {
                                                Value = new List<Allocate.data1>
                                                {
                                                new Allocate.data1
                                                {
                                                    No = inboundOrder.OrderNo,
                                                    //InWarehouse = task.Roadway,
                                                    TransactionCode = inboundOrder.TransactionCode,
                                                    InoutType = inboundOrder.OrderType,
                                                    OrderType = inboundOrder.InoutType,
                                                    ActiveType=1,

                                                    DetailList = StockInfos
                                                    .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
                                                    .GroupBy(x => new
                                                    {
                                                        x.Pallet.PalletCode,
                                                        x.Detail.MaterielCode,
                                                        x.Detail.BatchNo,
                                                        x.Detail.LinId
                                                    })
                                                    .Select(g => new Allocate.data1.Inventory
                                                    {
                                                        LinId = g.Key.LinId ?? "",
                                                        MaterielCode = g.Key.MaterielCode ?? "",
                                                        OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
                                                        BatchNo = g.Key.BatchNo,
                                                        LPNNo = g.Key.PalletCode,
                                                        FinishQty = g.Sum(x => x.Detail.StockQuantity),
                                                        LocationName = g.First().Pallet.LocationCode,
                                                        OrinalLocation = g.First().Detail?.OrinalLocation,
                                                        LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
                                                            .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
                                                            .Select(sd => sd.BoxCode)
                                                            .Distinct()
                                                            .ToList()
                                                    })
                                                    .ToList()
                                                }
                                                }
                                            }
                                        }
                                    };

                                    var authResult = AuthenticateWithWMS();
                                    if (authResult.IsSuccess)
                                    {
                                        inventoryAllocate.Context = new Dictionary<string, string>
                                        {
                                            { "Ticket", authResult.Ticket },
                                            { "InvOrgId", authResult.InvOrgId }
                                        };

                                        var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
                                        if (!response.Success)
                                        {
                                            throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
                                        }
                                    }
                                }

                                _unitOfWorkManage.CommitTran();
                                return WebResponseContent.Instance.OK();
                            }
                            catch (Exception ex)
                            {
                                _unitOfWorkManage.RollbackTran();
                                throw new Exception($"入库处理失败：{ex.Message}", ex);
                            }
                        }
                    }
                    else
                    {
                        Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
                        Dt_InboundOrderDetail? inboundOrderDetail = null;

                        // 3. 处理入库逻辑
                        if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
                        {
                            return ProcessInbound(task, dt_StockInfo, dt_LocationInfo);
                        }
                        if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
                        {
                            return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
                        }
                        if (task.TaskType == TaskTypeEnum.InInventory.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                            dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            // 更新库存明细状态
                            dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());
                            _unitOfWorkManage.BeginTran();
                            UpdateTaskStatus(task);
                            UpdateLocationStatus(dt_LocationInfo, lastStatus);
                            UpdateStockInfo(dt_StockInfo);
                            AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
                            _unitOfWorkManage.CommitTran();
                            return WebResponseContent.Instance.OK();

                        }
                    }
                }


                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -592,7 +1016,7 @@
                }
                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
                {
                    SendInboundInfoToWMS(task, inboundOrder, stockInfo);
                    //SendInboundInfoToWMS(task, inboundOrder, stockInfo);
                }
                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                {
@@ -887,7 +1311,7 @@
                                System = returnOrder.System,
                            }
                        }
                   }    
                   }
                }
            };
            var authResult = AuthenticateWithWMS();
@@ -910,7 +1334,7 @@
                    // 如果Success为false，抛出异常并包含错误信息
                    throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                }
                

            }
            return WebResponseContent.Instance.OK();
        }
@@ -990,7 +1414,7 @@
                        MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
                        OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
                        BatchNo = d.BatchNo,
                        LPN_No = d.PalletCode,
                        LPNNo = d.PalletCode,
                        FinishQty = d.Details.FirstOrDefault().StockQuantity,
                        LocationName = d.LocationCode
                    }).ToList()
@@ -1072,41 +1496,314 @@
                if (!validationResult.Status) return validationResult;

                int lastStatus = locationInfo.LocationStatus;
                Dt_Task task1 = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task1 == null)
                {
                    return WebResponseContent.Instance.Error("未找到该任务信息");
                }

                ///盘点出库任务完成逻辑
                if ((task.TaskType == TaskTypeEnum.OutInventory.ObjToInt()))
                if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
                {
                    return OutInventoryCompleted(task, stockInfo, locationInfo);
                }
                Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                .Where(x => x.OrderNo == task1.OrderNo)
                .Includes(x => x.Details)
                .First();

                if (inboundOrder == null) return WebResponseContent.Instance.Error("未找到出库单信息");

                Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
                .First();
                if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
                if (task.TaskType == TaskTypeEnum.OutSyncretism.ObjToInt())
                {
                    outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
                .First();
                    stockInfo.StockStatus = StockStatusEmun.合托出库完成.ObjToInt();
                    stockInfo.Details.ForEach(x =>
                    {
                        x.Status = StockStatusEmun.合托出库完成.ObjToInt();
                    });
                    _unitOfWorkManage.BeginTran();
                    _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                    _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
                    BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                    _unitOfWorkManage.CommitTran();
                }
                if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
                else
                {
                    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

                // 2. 处理出库订单详情
                //var outboundOrderDetails = ProcessOutboundOrderDetails(outStockLockInfos);
                    if (warehouse.WarehouseCode.Contains("CP"))
                    {
                        try
                        {
                            Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>()
                                .Where(x => x.OrderNo == task.OrderNo)
                                .Includes(x => x.Details)
                                .First();

                UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
                            List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                                .Where(x => x.OrderId == outboundOrder.Id &&
                                       x.LocationName == stockInfo.LocationCode &&
                                       x.LPNNo == stockInfo.PalletCode)
                                .ToList();

                // 3. 执行核心出库逻辑
                return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
                            if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
                            {
                                throw new Exception($"未找到托盘 {stockInfo.PalletCode} 在货位 {stockInfo.LocationCode} 上的出库单明细");
                            }

                            // 获取库存明细
                            var stockInfoDetails = stockInfo.Details.ToList();

                            int overCount = outboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());

                            foreach (var stockDetail in stockInfoDetails)
                            {
                                var matchingOrderDetails = outboundOrderDetails
                                    .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
                                           x.BatchNo == stockDetail.BatchNo)
                                    .ToList();

                                if (matchingOrderDetails.Count == 0)
                                {
                                    continue;
                                }

                                // 计算需要分配的数量
                                decimal remainingStock = stockDetail.OutboundQuantity;

                                foreach (var orderDetail in matchingOrderDetails)
                                {
                                    if (remainingStock <= 0) break;

                                    if (orderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
                                        continue;

                                    // 计算本次可以分配的数量
                                    decimal availableOrderQty = orderDetail.OrderQuantity - orderDetail.OverOutQuantity;
                                    decimal allocateQty = Math.Min(remainingStock, availableOrderQty);

                                    if (allocateQty > 0)
                                    {
                                        orderDetail.OverOutQuantity += allocateQty;
                                        remainingStock -= allocateQty;

                                        // 检查是否完成
                                        if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
                                        {
                                            orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                            overCount++;
                                        }
                                    }
                                }
                            }
                            // 更新订单状态
                            if (outboundOrder.Details.Count == overCount)
                            {
                                outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                            }
                            _unitOfWorkManage.BeginTran();

                            try
                            {
                                // 更新出库单
                                _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);

                                _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


                                AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

                                // 区分单据数据来源更新货位状态
                                if (outboundOrder.System == null)
                                {
                                    return WebResponseContent.Instance.Error("出库单数据源为空");
                                }

                                if (!outboundOrder.System.Equals("SMOM"))
                                {
                                    UpdateLocationStatus(locationInfo);
                                }

                                // 处理任务完成
                                CompleteTask(task);

                                // 添加状态变更记录
                                AddStatusChangeRecord(task, stockInfo, locationInfo);

                                string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
                                string fullPath = AppDomain.CurrentDomain.BaseDirectory;
                                var url = Path.Combine(fullPath, "wwwroot", "Reports");
                                string savePath = Path.Combine(url, "本次出库.pdf");

                                // ERP系统反馈
                                if (outboundOrder.System.Equals("ERP"))
                                {
                                    // 为每个完成的明细反馈ERP
                                    foreach (var orderDetail in outboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
                                    {
                                        FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
                                    }

                                    // 如果有完成的明细，下载报表
                                    if (outboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
                                    {
                                        DownloadReport(path, savePath, outboundOrderDetails.First().Id);
                                    }
                                }

                                // 单据完成推送SMOM系统
                                if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.System.Equals("SMOM"))
                                {
                                    var outStockLockInfoList = _outboundService.OutboundStockLockInfoService.Repository
                                        .QueryData(x => x.OrderNo == outboundOrder.OrderNo);

                                    if (outStockLockInfoList.Count == 0)
                                        throw new Exception($"订单 {outboundOrder.OrderNo} 托盘 {stockInfo.PalletCode} 未找到库存锁定信息");

                                    // 采购出库
                                    if (outboundOrder.OrderType == 1)
                                    {
                                        var passBack = new HouseoutboundPassBack
                                        {
                                            ApiType = "ShippingOrderController",
                                            Method = "AsrsOutboundSO",
                                            Parameters = new List<HouseoutboundPassBack.datas>
                        {
                            new HouseoutboundPassBack.datas
                            {
                                Value = new List<HouseoutboundPassBack.datas.data1>
                                {
                                    new HouseoutboundPassBack.datas.data1
                                    {
                                        No = outboundOrder.OrderNo,
                                        OutWareHouse = task.Roadway,
                                        TransactionCode = outboundOrder.TransactionCode,
                                        InoutType = outboundOrder.OrderType,
                                        OrderType = outboundOrder.InoutType,
                                              DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
                                                        {
                                                            LinId = d.LinId?? "",
                                                            LPN_No = d.PalletCode,
                                                            MaterielCode = d.MaterielCode?? "",
                                                            OrderQuantity = d.OrderQuantity,
                                                            BatchNo = d.BatchNo,
                                                            FinishQty = d.OrderQuantity,
                                                            LocationName = d.LocationCode
                                                        })
                                                        .ToList()
                                    }
                                }
                            }
                        }
                                        };

                                        //调用SMOM接口...
                                        var authResult = AuthenticateWithWMS();
                                        if (authResult.IsSuccess)
                                        {
                                            passBack.Context = new Dictionary<string, string>
                                        {
                                            { "Ticket", authResult.Ticket },
                                            { "InvOrgId", authResult.InvOrgId }
                                        };
                                            var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
                                            if (!response.Success)
                                            {
                                                throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                                            }
                                        }
                                    }

                                    // 调拨出库
                                    if (outboundOrder.OrderType == 2)
                                    {
                                        var allocate = new InventoryAllocate
                                        {
                                            ApiType = "InventoryAllocateController",
                                            Method = "AsrsFinishedStockCount",
                                            Parameters = new List<Allocate>
                        {
                            new Allocate
                            {
                                Value = new List<Allocate.data1>
                                {
                                    new Allocate.data1
                                    {
                                        No = outboundOrder.OrderNo,
                                        InWarehouse = task.Roadway,
                                        TransactionCode = outboundOrder.TransactionCode,
                                        InoutType = outboundOrder.OrderType,
                                        OrderType = outboundOrder.InoutType,
                                        ActiveType = 2,
                                                DetailList = outStockLockInfoList.Select(item =>
                                                        {
                                                            return new Allocate.data1.Inventory
                                                            {
                                                                LinId = item.LinId,
                                                                LPNNo = item.PalletCode,
                                                                MaterielCode = item.MaterielCode,
                                                                OrderQuantity = item.OrderQuantity,
                                                                BatchNo = item.BatchNo,
                                                                FinishQty = item.OrderQuantity,
                                                                LocationName = task.SourceAddress
                                                            };
                                                        }).ToList()
                                    }
                                }
                            }
                        }
                                        };

                                        // 调用SMOM接口...
                                        var authResult = AuthenticateWithWMS();
                                        if (authResult.IsSuccess)
                                        {
                                            allocate.Context = new Dictionary<string, string>
                                        {
                                            { "Ticket", authResult.Ticket },
                                            { "InvOrgId", authResult.InvOrgId }
                                        };
                                            var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
                                            if (!response.Success)
                                            {
                                                throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                                            }
                                        }
                                    }
                                }

                                if (outboundOrder.OrderType == 240) // 盘点出库
                                {
                                    // 盘点出库特殊处理逻辑
                                }

                                _unitOfWorkManage.CommitTran();
                                return WebResponseContent.Instance.OK();
                            }
                            catch
                            {
                                _unitOfWorkManage.RollbackTran();
                                throw;
                            }
                        }
                        catch (Exception ex)
                        {
                            return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
                        }
                    }
                    else
                    {
                        Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                            .Where(x => x.OrderNo == task.OrderNo)
                            .Includes(x => x.Details)
                            .First();

                        if (inboundOrder == null) return WebResponseContent.Instance.Error("未找到出库单信息");

                        Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                            .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
                            .First();
                        if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
                        {
                            outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                        .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
                        .First();
                        }
                        if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
                        UpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
                        // 3. 执行核心出库逻辑
                        return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
                    }
                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
@@ -1136,7 +1833,7 @@

            if (stockInfo == null) return WebResponseContent.Instance.Error("未找到库存信息");
            if (locationInfo == null) return WebResponseContent.Instance.Error("未找到货位信息");
            if ((outStockLockInfos == null || outStockLockInfos.Count == 0)&& task.TaskType != TaskTypeEnum.OutInventory.ObjToInt())
            if ((outStockLockInfos == null || outStockLockInfos.Count == 0) && task.TaskType != TaskTypeEnum.OutInventory.ObjToInt())
                return WebResponseContent.Instance.Error("未找到出库详情信息");

            return WebResponseContent.Instance.OK();
@@ -1174,7 +1871,7 @@
                // 更新出库订单详情
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

                // 更新库存状态
                // 更新库存状态 回库单
                AddRetrueOrder(stockInfo, inboundOrder);

                // 区分单据数据来源更新货位状态
@@ -1243,7 +1940,7 @@
            {
                if (inboundOrderDetail == null) continue;

                inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;    
                inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;

                if (inboundOrderDetail.OverOutQuantity == inboundOrderDetail.OrderQuantity)
                {
@@ -1322,7 +2019,7 @@
            // 发送出库信息到WMS
            if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 1)
            {
                SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
                //SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
            }
            else if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 2)
            {
@@ -1486,7 +2183,7 @@
                            return new Allocate.data1.Inventory
                            {
                                LinId = outDetail.LinId,
                                LPN_No = item.PalletCode,
                                LPNNo = item.PalletCode,
                                MaterielCode = outDetail.MaterielCode,
                                OrderQuantity = outDetail.OrderQuantity,
                                BatchNo = outDetail.BatchNo,
@@ -1587,6 +2284,230 @@
            }

        }

        //成品回库单
        private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, List<Dt_NewOutboundOrderDetail> outboundOrderDetails)
        {
            List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
                .Where(x => x.StockId == stockInfo.Id)
                .ToList();

            if (stockInfoDetails == null || stockInfoDetails.Count == 0)
            {
                throw new Exception("建立回库单时，未找到该库存信息");
            }
            _unitOfWorkManage.BeginTran();
            try
            {
                if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
                {
                    Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
                        x.LPNNo == stockInfo.PalletCode &&
                        x.LocationCode == stockInfo.LocationCode &&
                        x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());

                    if (returnOrder == null)
                    {
                        throw new Exception("反拣出库后，未找到对应反拣回库单信息");
                    }
                    foreach (var outDetail in outboundOrderDetails)
                    {
                        var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
                        if (matchedStockDetail == null)
                        {
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
               x.MaterielCode == outDetail.MaterielCode);

                            if (matchedStockDetail == null)
                            {
                                throw new Exception($"未找到匹配的库存明细信息，物料:{outDetail.MaterielCode}, 批次:{outDetail.BatchNo}");
                            }
                        }
                        // 只减去单据明细中的数量
                        matchedStockDetail.OutboundQuantity = 0;
                        matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
                        matchedStockDetail.OrderNo = returnOrder.OrderNo;
                        // 更新匹配的明细
                        _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
                    }


                    // 更新库存状态
                    stockInfo.LocationCode = "";
                    stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                    stockInfo.Remark = "反拣入库";
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                }
                else
                {
                    var groupedDetails = outboundOrderDetails
             .GroupBy(d => new { d.MaterielCode, d.BatchNo })
             .ToList();
                    List<Dt_StockInfoDetail> processedStockDetails = new List<Dt_StockInfoDetail>();
                    List<Dt_ReturnOrder> returnOrders = new List<Dt_ReturnOrder>();

                    decimal totalOutboundQuantity = outboundOrderDetails.Sum(x => x.OrderQuantity);
                    decimal totalStockQuantity = stockInfoDetails.Sum(x => x.StockQuantity);

                    foreach (var groupeDetail in groupedDetails)
                    {
                        var outboundDetail = groupeDetail.First();
                        decimal totalOrderQuantity = groupeDetail.Sum(x => x.OrderQuantity);
                        var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
                        if (matchedStockDetail == null)
                        {
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
               x.MaterielCode == outboundDetail.MaterielCode);

                            if (matchedStockDetail == null)
                            {
                                throw new Exception($"未找到匹配的库存明细信息，物料:{outboundDetail.MaterielCode}, 批次:{outboundDetail.BatchNo}");
                            }
                        }
                        // 计算当前批次的剩余数量
                        decimal remainingQuantity = matchedStockDetail.StockQuantity - totalOrderQuantity;

                        if (remainingQuantity > 0)
                        {
                            Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
                            {
                                MaterielCode = matchedStockDetail.MaterielCode,
                                MaterielName = matchedStockDetail.MaterielName,
                                BatchNo = matchedStockDetail.BatchNo,
                                OrderQuantity = remainingQuantity,
                                ReceiptQuantity = remainingQuantity,
                                OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                                LinId = matchedStockDetail.LinId,
                                LPNNo = stockInfo.PalletCode,
                                Creater = "LK",
                                CreateDate = DateTime.Now,
                                OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                                System = "WMS",
                                Remark = "多批次返库"  // 添加备注标识
                            };

                            if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                            {
                                returnOrder.LocationCode = stockInfo.LocationCode;
                            }

                            // 添加返库单
                            returnOrders.Add(returnOrder);

                            // 更新当前批次明细：只保留出库数量，其余返库
                            matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
                            matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
                            //matchedStockDetail.OrderNo = returnOrder.OrderNo;
                        }
                        else if (remainingQuantity == 0)
                        {
                            // 当前批次正好出完
                            matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
                            if (matchedStockDetail.StockQuantity == totalOrderQuantity)
                            {
                                _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(
                                    matchedStockDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                            }
                            else
                            {
                                matchedStockDetail.StockQuantity = 0;
                                _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
                            }
                        }
                        else
                        {
                            throw new Exception($"出库数量 {outboundDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
                        }
                        processedStockDetails.Add(matchedStockDetail);
                    }

                    // 处理其他批次的库存明细（全部返库）
                    var otherBatchDetails = stockInfoDetails
                        .Where(x => !processedStockDetails.Contains(x) && x.StockQuantity > 0)
                        .ToList();

                    if (otherBatchDetails.Count > 0)
                    {
                        decimal totalOtherQuantity = otherBatchDetails.Sum(x => x.StockQuantity);

                        // 为其他批次创建返库单（只创建一个，包含所有批次）
                        var firstOtherDetail = otherBatchDetails.First();
                        Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
                        {
                            MaterielCode = firstOtherDetail.MaterielCode,
                            MaterielName = firstOtherDetail.MaterielName,
                            BatchNo = firstOtherDetail.BatchNo,
                            OrderQuantity = totalOtherQuantity,
                            ReceiptQuantity = totalOtherQuantity,
                            OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                            LinId = firstOtherDetail.LinId,
                            LPNNo = stockInfo.PalletCode,
                            Creater = "LK",
                            CreateDate = DateTime.Now,
                            OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                            System = "WMS",
                            Remark = $"多批次返库，共{otherBatchDetails.Count}个批次"
                        };

                        if (outboundOrder.System == "SMOM" && !string.IsNullOrEmpty(stockInfo.LocationCode))
                        {
                            otherReturnOrder.LocationCode = stockInfo.LocationCode;
                        }


                        returnOrders.Add(otherReturnOrder);
                    }

                    // 批量更新已处理的库存明细
                    var updateDetails = processedStockDetails.Where(x => x.StockQuantity > 0).ToList();
                    if (updateDetails.Any())
                    {
                        _stockService.StockInfoDetailService.Repository.UpdateData(updateDetails);
                    }

                    // 添加返库单
                    if (returnOrders.Any())
                    {
                        _returnOrderRepository.AddData(returnOrders);
                    }

                    // 更新库存主表状态
                    decimal returnQuantity = totalStockQuantity - totalOutboundQuantity;
                    if (returnQuantity == 0)
                    {
                        if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                        {
                            Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                            _basicRepository.LocationInfoRepository.UpdateData(dt_LocationInfo);
                        }
                        // 全部出库，删除库存
                        DeleteAndMoveIntoHtStockStatus(stockInfo);
                        foreach (var item in stockInfo.Details)
                        {
                            BaseDal.Db.Deleteable(item.StockDetails).ExecuteCommand();
                        }
                    }
                    else if (returnQuantity > 0)
                    {
                        // 有余料返库
                        stockInfo.LocationCode = "";
                        stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                        stockInfo.Remark = $"余料退库，共{returnOrders.Count}个返库单";
                        _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    }

                }
                _unitOfWorkManage.CommitTran();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                throw;
            }

        }

        /// <summary>
        /// 单据明细出库完成回调ERP(表单提交)
        /// </summary>