1

wankeda

2026-01-09 58a1b8b7db72225e0c2acca4f76399899f1bda4f

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -114,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,INewOutboundOrderDetailRepository newOutboundOrderDetailRepository) : 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;
@@ -493,206 +493,238 @@
                Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

                dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;

                if (warehouse.WarehouseCode.Contains("CP"))
                if (task.TaskType == TaskTypeEnum.InSyncretism.ObjToInt())
                {
                    // 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();
                    }
                    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());

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

                        if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && inboundOrder == null)
                    // 更新任务状态
                    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())
                        {
                            return WebResponseContent.Instance.Error("未找到入库单信息");
                            return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
                        }
                        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)
                        // 1. 获取入库单信息
                        Dt_InboundOrder? inboundOrder = null;
                        if (!string.IsNullOrEmpty(dt_StockInfo.Details.FirstOrDefault()?.OrderNo))
                        {
                            if (!string.IsNullOrEmpty(detail))
                            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)
                            {
                                var codes = detail.Split(',', StringSplitOptions.RemoveEmptyEntries);
                                boxCodes.AddRange(codes);
                                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();

                        // 根据托盘明细获取对应的入库单明细
                        List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
                            // 2. 获取托盘下的所有箱号
                            var boxCodes = new List<string>();

                        // 处理多个库存明细的情况
                        foreach (var stockDetail in dt_StockInfo.Details)
                        {
                            if (!string.IsNullOrEmpty(stockDetail.OrderNo))
                            // 方法1：从库存明细的BoxCodes字段获取（组盘时保存的）
                            foreach (var detail in allBoxCodesForDetail)
                            {
                                var detail = inboundOrder.Details.FirstOrDefault(x => x.LinId == stockDetail.LinId && x.BatchNo == stockDetail.BatchNo);

                                if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
                                if (!string.IsNullOrEmpty(detail))
                                {
                                    inboundOrderDetails.Add(detail);
                                    var codes = detail.Split(',', StringSplitOptions.RemoveEmptyEntries);
                                    boxCodes.AddRange(codes);
                                }
                            }
                        }

                        if (!inboundOrderDetails.Any())
                        {
                            return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
                        }
                            // 根据托盘明细获取对应的入库单明细
                            List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();

                        // 更新入库单明细状态
                        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)
                            // 处理多个库存明细的情况
                            foreach (var stockDetail in dt_StockInfo.Details)
                            {
                                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)
                                if (!string.IsNullOrEmpty(stockDetail.OrderNo))
                                {
                                    inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                                    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
                                {
                                    inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
                                }
                            }

                            // 更新入库单
                            UpdateInboundOrder(inboundOrder, inboundOrderDetails.FirstOrDefault());
                            ///更新库存状态
                            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())
                            {
                                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()))
                                foreach (var cpDetail in cpInboundDetails)
                                {
                                    FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
                                    cpDetail.CPOrderDetailStatus = InboundStatusEnum.入库完成.ObjToInt();
                                }
                            }
                            if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))

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

                                if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
                                var houseInboundPassBack = new HouseInboundPassBack
                                // 更新成品库存明细状态
                                foreach (var cpStockDetail in cpStockDetails)
                                {
                                    ApiType = "AsnController",
                                    Method = "AsrsGroudingAsn",
                                    Parameters = new List<HouseInboundPassBack.data>
                                    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();
                                    }
                                    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
                                                {
@@ -726,42 +758,41 @@
                                                    }
                                                }
                                            }
                                };
                                    };

                                var authResult = AuthenticateWithWMS();
                                if (authResult.IsSuccess)
                                {
                                    houseInboundPassBack.Context = new Dictionary<string, string>
                                            {
                                                { "Ticket", authResult.Ticket },
                                                { "InvOrgId", authResult.InvOrgId }
                                            };
                                    //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 ?? "未提供错误信息"}");
                                    }
                                    //    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
                                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                                {
                                    ApiType = "InventoryAllocateController",
                                    Method = "AsrsFinishedStockCount",
                                    Parameters = new List<InventoryAllocate.Allocate>
                                    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
                                            {
@@ -774,6 +805,7 @@
                                                    TransactionCode = inboundOrder.TransactionCode,
                                                    InoutType = inboundOrder.OrderType,
                                                    OrderType = inboundOrder.InoutType,
                                                    ActiveType=1,
                                                    DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
                                                     {
                                                        LinId = d.Details.FirstOrDefault()?.LinId?? "",
@@ -783,6 +815,7 @@
                                                        LPNNo = d.PalletCode,
                                                        FinishQty = d.Details.FirstOrDefault().StockQuantity,
                                                        LocationName = d.LocationCode,
                                                        OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
                                                         LabelList= d.Details
                                                                    .Where(detail => detail.StockDetails != null)
                                                                    .SelectMany(detail => detail.StockDetails)
@@ -794,66 +827,68 @@
                                                }
                                            }
                                        }
                                };
                                    };

                                var authResult = AuthenticateWithWMS();
                                if (authResult.IsSuccess)
                                {
                                    inventoryAllocate.Context = new Dictionary<string, string>
                                        {
                                            { "Ticket", authResult.Ticket },
                                            { "InvOrgId", authResult.InvOrgId }
                                        };
                                    //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 ?? "未提供错误信息"}");
                                    }
                                    //    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();
                        }
                        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();
            }
@@ -1433,101 +1468,116 @@
                int lastStatus = locationInfo.LocationStatus;

                ///盘点出库任务完成逻辑
                if ((task.TaskType == TaskTypeEnum.OutInventory.ObjToInt()))
                if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
                {
                    return OutInventoryCompleted(task, stockInfo, locationInfo);
                }
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

                if (warehouse.WarehouseCode.Contains("CP"))
                if (task.TaskType == TaskTypeEnum.OutSyncretism.ObjToInt())
                {
                    try
                    stockInfo.StockStatus = StockStatusEmun.合托出库完成.ObjToInt();
                    stockInfo.Details.ForEach(x =>
                    {
                        Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
                        .First();
                        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();
                }
                else
                {
                    Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

                        Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                        .Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode)
                        .First();
                        //List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
                        //foreach (var item in stockInfoDetail)
                        //{
                        //    outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                        //       .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
                        //       .First();

                        //    item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
                        //}

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

                        foreach (var item in stockInfo.Details)
                    if (warehouse.WarehouseCode.Contains("CP"))
                    {
                        try
                        {
                            if (outboundOrderDetails == null) continue;
                            Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
                            .First();

                            outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;
                            Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                            .Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode&&x.LPNNo==stockInfo.PalletCode)
                            .First();
                            //List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
                            //foreach (var item in stockInfoDetail)
                            //{
                            //    outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                            //       .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
                            //       .First();

                            if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
                            //    item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
                            //}

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

                            foreach (var item in stockInfo.Details)
                            {
                                outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                overCount++;
                            }
                        }
                        if (outboundOrder.Details.Count == overCount)
                        {
                            outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                        }
                                if (outboundOrderDetails == null) continue;

                        _unitOfWorkManage.BeginTran();
                        ///更新出库单
                        _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
                        // 更新出库订单详情
                        _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
                                outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;

                        // 更新库存状态
                        AddCPRetrueOrder(stockInfo, outboundOrder);

                        // 区分单据数据来源更新货位状态
                        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");


                        if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
                        {
                            FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
                            DownloadReport(path, savePath, outboundOrderDetails.Id);
                        }
                        ///单据完成推送SMOM系统
                        if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.System.Equals("SMOM"))
                        {
                            var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
                            List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);

                            if (outStockLockInfo.Count == 0) throw new Exception("未找到库存信息");
                            //采购出库
                            if (outboundOrder.OrderType == 1)
                            {
                                var passBack = new HouseoutboundPassBack
                                if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
                                {
                                    ApiType = "ShippingOrderController",
                                    Method = "AsrsOutboundSO",
                                    Parameters = new List<HouseoutboundPassBack.datas>
                                    outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                    overCount++;
                                }
                            }
                            if (outboundOrder.Details.Count == overCount)
                            {
                                outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                            }

                            _unitOfWorkManage.BeginTran();
                            ///更新出库单
                            _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");


                            if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
                            {
                                FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
                                DownloadReport(path, savePath, outboundOrderDetails.Id);
                            }
                            ///单据完成推送SMOM系统
                            if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.System.Equals("SMOM"))
                            {
                                var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
                                List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);

                                if (outStockLockInfo.Count == 0) throw new Exception("未找到库存信息");
                                //采购出库
                                if (outboundOrder.OrderType == 1)
                                {
                                    var passBack = new HouseoutboundPassBack
                                    {
                                        ApiType = "ShippingOrderController",
                                        Method = "AsrsOutboundSO",
                                        Parameters = new List<HouseoutboundPassBack.datas>
                                        {
                                        new HouseoutboundPassBack.datas
                                        {
@@ -1556,31 +1606,31 @@
                                            }
                                        }
                                }
                                };
                                    };

                                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 ?? "未提供错误信息"}");
                                    }
                                //    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
                                //调拨出库
                                if (outboundOrder.OrderType == 2)
                                {
                                    ApiType = "InventoryAllocateController",
                                    Method = "AsrsFinishedStockCount",
                                    Parameters = new List<Allocate>
                                    var allocate = new InventoryAllocate
                                    {
                                        ApiType = "InventoryAllocateController",
                                        Method = "AsrsFinishedStockCount",
                                        Parameters = new List<Allocate>
                                        {
                                            new Allocate
                                            {
@@ -1593,7 +1643,8 @@
                                                        TransactionCode = outboundOrder.TransactionCode,
                                                        InoutType = outboundOrder.OrderType,
                                                        OrderType = outboundOrder.InoutType,
                                                        DetailList = outStockLockInfos.Select(item =>
                                                        ActiveType=2,
                                                        DetailList = outStockLockInfo.Select(item =>
                                                        {
                                                            return new Allocate.data1.Inventory
                                                            {
@@ -1603,6 +1654,7 @@
                                                                OrderQuantity = outboundOrderDetails.OrderQuantity,
                                                                BatchNo = outboundOrderDetails.BatchNo,
                                                                FinishQty = outboundOrderDetails.OrderQuantity,
                                                                OrinalLocation=outboundOrderDetails.OrinalLocation,
                                                                LocationName = task.SourceAddress
                                                            };
                                                        }).ToList()
@@ -1610,63 +1662,64 @@
                                                }
                                            }
                                        }
                                };

                                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 ?? "未提供错误信息"}");
                                    }

                                    //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) // 盘点出库
                            if (outboundOrder.OrderType == 240) // 盘点出库
                            {
                                // 盘点出库特殊处理逻辑
                            }

                            _unitOfWorkManage.CommitTran();
                            return WebResponseContent.Instance.OK();
                        }
                        catch
                        {
                            // 盘点出库特殊处理逻辑
                            _unitOfWorkManage.RollbackTran();
                            throw;
                        }

                        _unitOfWorkManage.CommitTran();
                        return WebResponseContent.Instance.OK();
                    }
                    catch
                    else
                    {
                        _unitOfWorkManage.RollbackTran();
                        throw;
                        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);
                    }
                }
                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)
            {
@@ -1734,7 +1787,7 @@
                // 更新出库订单详情
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

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

                // 区分单据数据来源更新货位状态
@@ -1882,7 +1935,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)
            {
@@ -2149,71 +2202,211 @@
        }

        //成品回库单
        private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder)
        private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
        {
            Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
           .Where(x => x.StockId == stockInfo.Id)
           .First();
            if (stockInfoDetail == null)
            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("建立回库单时，未找到该库存信息");
            }

            // 找到与当前出库单明细匹配的库存明细
            var matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
                x.MaterielCode == outboundOrderDetail.MaterielCode &&
                x.BatchNo == outboundOrderDetail.BatchNo);

            if (matchedStockDetail == null)
            {
                throw new Exception($"未找到匹配的库存明细信息，物料:{outboundOrderDetail.MaterielCode}, 批次:{outboundOrderDetail.BatchNo}");
            }

            if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
            {
                Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.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("反拣出库后，未找到对应反拣回库单信息");
                }

                // 只减去单据明细中的数量
                matchedStockDetail.OutboundQuantity = 0;
                matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
                matchedStockDetail.OrderNo = returnOrder.OrderNo;

                // 更新库存状态
                stockInfo.LocationCode = "";
                stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                stockInfo.Remark = "反拣入库";
                stockInfoDetail.OutboundQuantity = 0;
                stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
                stockInfoDetail.OrderNo = returnOrder.OrderNo;

                // 更新匹配的明细
                _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
            }
            else
            {
                decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
                if (returnQuantity > 0)
                // 计算当前批次的剩余数量
                decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;

                _unitOfWorkManage.BeginTran();

                try
                {
                    Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
                    if (remainingQuantity > 0)
                    {
                        MaterielCode = stockInfoDetail.MaterielCode,
                        MaterielName = stockInfoDetail.MaterielName,
                        BatchNo = stockInfoDetail.BatchNo,
                        OrderQuantity = returnQuantity,
                        ReceiptQuantity = returnQuantity,
                        OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                        LinId = stockInfoDetail.LinId,
                        LPNNo = stockInfo.PalletCode,
                        Creater = "LK",
                        CreateDate = DateTime.Now,
                        OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                        System = "WMS"
                    };
                    if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                    {
                        returnOrder.LocationCode = stockInfo.LocationCode;
                        // 为当前批次创建返库单
                        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"
                        };

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

                        // 添加返库单
                        _returnOrderRepository.AddData(returnOrder);

                        // 更新当前批次明细：只保留出库数量，其余返库
                        matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
                        matchedStockDetail.OutboundQuantity = outboundOrderDetail.OrderQuantity;
                        matchedStockDetail.OrderNo = returnOrder.OrderNo;

                        _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);

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

                        foreach (var otherDetail in otherBatchDetails)
                        {
                            if (otherDetail.StockQuantity > 0)
                            {
                                // 为其他批次创建返库单
                                Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
                                {
                                    MaterielCode = otherDetail.MaterielCode,
                                    MaterielName = otherDetail.MaterielName,
                                    BatchNo = otherDetail.BatchNo,
                                    OrderQuantity = otherDetail.StockQuantity,
                                    ReceiptQuantity = otherDetail.StockQuantity,
                                    OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                                    LinId = otherDetail.LinId,
                                    LPNNo = stockInfo.PalletCode,
                                    Creater = "LK",
                                    CreateDate = DateTime.Now,
                                    OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                                    System = "WMS"
                                };

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

                                _returnOrderRepository.AddData(otherReturnOrder);

                                // 其他批次全部返库，库存清零
                                otherDetail.StockQuantity = 0;
                                otherDetail.OutboundQuantity = 0;
                                otherDetail.OrderNo = otherReturnOrder.OrderNo;

                                _stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
                            }
                        }

                        // 更新库存主表状态
                        stockInfo.LocationCode = "";
                        stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                        stockInfo.Remark = "余料退库";
                        _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    }
                    _unitOfWorkManage.BeginTran();
                    _returnOrderRepository.AddData(returnOrder);
                    stockInfo.LocationCode = "";
                    stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                    stockInfo.Remark = "余料退库";
                    stockInfoDetail.OutboundQuantity = 0;
                    stockInfoDetail.StockQuantity = returnQuantity;
                    stockInfoDetail.OrderNo = returnOrder.OrderNo;
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
                    else if (remainingQuantity == 0)
                    {
                        // 当前批次正好出完
                        matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
                        _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

                        // 其他批次全部返库
                        var otherBatchDetails = stockInfoDetails
                            .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
                            .ToList();

                        foreach (var otherDetail in otherBatchDetails)
                        {
                            if (otherDetail.StockQuantity > 0)
                            {
                                Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
                                {
                                    MaterielCode = otherDetail.MaterielCode,
                                    MaterielName = otherDetail.MaterielName,
                                    BatchNo = otherDetail.BatchNo,
                                    OrderQuantity = otherDetail.StockQuantity,
                                    ReceiptQuantity = otherDetail.StockQuantity,
                                    OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
                                    LinId = otherDetail.LinId,
                                    LPNNo = stockInfo.PalletCode,
                                    Creater = "LK",
                                    CreateDate = DateTime.Now,
                                    OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                                    System = "WMS"
                                };

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

                                _returnOrderRepository.AddData(otherReturnOrder);
                            }
                        }

                        // 如果所有批次都出完了，删除库存
                        var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
                        if (totalRemaining == 0)
                        {
                            DeleteAndMoveIntoHtStockStatus(stockInfo);
                        }
                        else
                        {
                            // 还有库存，更新状态
                            stockInfo.LocationCode = "";
                            stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                            stockInfo.Remark = "余料退库";
                            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                        }
                    }
                    else
                    {
                        throw new Exception($"出库数量 {outboundOrderDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
                    }

                    _unitOfWorkManage.CommitTran();
                }
                else
                catch
                {
                    DeleteAndMoveIntoHtStockStatus(stockInfo);
                    _unitOfWorkManage.RollbackTran();
                    throw;
                }
            }

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