优化成品出入库流程代码

wankeda

2026-01-13 ce3b28cdcdb2b6a912413cd9e744d0ecadcb78a0

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -526,7 +526,14 @@

                        if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
                        {
                            return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
                            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;
@@ -680,6 +687,10 @@
                                    if (allCompleted)
                                    {
                                        inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
                                        foreach (var item in inboundOrderDetails)
                                        {
                                            BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
                                        }
                                    }
                                    else
                                    {
@@ -738,45 +749,54 @@
                                                            InoutType = inboundOrder.OrderType,
                                                            OrderType = inboundOrder.InoutType,
                                                            // 遍历所有库存明细，添加到 DetailList
                                                            DetailList = StockInfos.Select(d => new data.data1.Inbound
                                                                     DetailList = StockInfos
                                                    .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
                                                    .GroupBy(x => new
                                                            {
                                                                LinId = d.Details.FirstOrDefault()?.LinId?? "",
                                                                MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
                                                                OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
                                                                BatchNo = d.Details.FirstOrDefault()?.BatchNo,
                                                                LPNNo = d.PalletCode,
                                                                FinishQty = d.Details.FirstOrDefault().StockQuantity,
                                                                LocationName = d.LocationCode,
                                                                LabelList= d.Details
                                                                .Where(detail => detail.StockDetails != null)
                                                                .SelectMany(detail => detail.StockDetails)
                                                                .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
                                                                .Select(stockDetail => stockDetail.BoxCode )
                                                        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()
                                                    })
                                                    .ToList()
                                                        }
                                                    }
                                                }
                                            }
                                    };

                                    //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"))
@@ -806,44 +826,54 @@
                                                    InoutType = inboundOrder.OrderType,
                                                    OrderType = inboundOrder.InoutType,
                                                    ActiveType=1,
                                                    DetailList = StockInfos.Select(d => new Allocate.data1.Inventory

                                                    DetailList = StockInfos
                                                    .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
                                                    .GroupBy(x => new
                                                     {
                                                        LinId = d.Details.FirstOrDefault()?.LinId?? "",
                                                        MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
                                                        OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
                                                        BatchNo = d.Details.FirstOrDefault()?.BatchNo,
                                                        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)
                                                                    .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
                                                                    .Select(stockDetail => stockDetail.BoxCode )
                                                        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()
                                                    })
                                                    .ToList()
                                                }
                                                }
                                            }
                                        }
                                    };

                                    //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();
@@ -1493,48 +1523,82 @@
                    {
                        try
                        {
                            Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
                            Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>()
                                .Where(x => x.OrderNo == task.OrderNo)
                                .Includes(x => x.Details)
                            .First();

                            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();
                            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();

                            //    item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
                            //}
                            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 item in stockInfo.Details)
                            foreach (var stockDetail in stockInfoDetails)
                            {
                                if (outboundOrderDetails == null) continue;
                                var matchingOrderDetails = outboundOrderDetails
                                    .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
                                           x.BatchNo == stockDetail.BatchNo)
                                    .ToList();

                                outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;

                                if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
                                if (matchingOrderDetails.Count == 0)
                                {
                                    outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                    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);

                            // 区分单据数据来源更新货位状态
@@ -1542,10 +1606,12 @@
                            {
                                return WebResponseContent.Instance.Error("出库单数据源为空");
                            }

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

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

@@ -1557,19 +1623,31 @@
                            var url = Path.Combine(fullPath, "wwwroot", "Reports");
                            string savePath = Path.Combine(url, "本次出库.pdf");


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

                                    // 如果有完成的明细，下载报表
                                    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 stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
                                List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
                                    var outStockLockInfoList = _outboundService.OutboundStockLockInfoService.Repository
                                        .QueryData(x => x.OrderNo == outboundOrder.OrderNo);

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

                                //采购出库
                                if (outboundOrder.OrderType == 1)
                                {
@@ -1590,7 +1668,7 @@
                                                    TransactionCode = outboundOrder.TransactionCode,
                                                    InoutType = outboundOrder.OrderType,
                                                    OrderType = outboundOrder.InoutType,
                                                    DetailList = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
                                              DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
                                                        {
                                                            LinId = d.LinId?? "",
                                                            LPN_No = d.PalletCode,
@@ -1601,28 +1679,29 @@
                                                            LocationName = d.LocationCode
                                                        })
                                                        .ToList()

                                                }
                                            }
                                        }
                                }
                                    };

                                //    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 ?? "未提供错误信息"}");
                                //        }
                                //    }
                                        //调用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)
                                {
@@ -1644,17 +1723,16 @@
                                                        InoutType = outboundOrder.OrderType,
                                                        OrderType = outboundOrder.InoutType,
                                                        ActiveType=2,
                                                        DetailList = outStockLockInfo.Select(item =>
                                                DetailList = outStockLockInfoList.Select(item =>
                                                        {
                                                            return new Allocate.data1.Inventory
                                                            {
                                                                LinId = outboundOrderDetails.LinId,
                                                                LinId = item.LinId,
                                                                LPNNo = item.PalletCode,
                                                                MaterielCode = outboundOrderDetails.MaterielCode,
                                                                OrderQuantity = outboundOrderDetails.OrderQuantity,
                                                                BatchNo = outboundOrderDetails.BatchNo,
                                                                FinishQty = outboundOrderDetails.OrderQuantity,
                                                                OrinalLocation=outboundOrderDetails.OrinalLocation,
                                                                MaterielCode = item.MaterielCode,
                                                                OrderQuantity = item.OrderQuantity,
                                                                BatchNo = item.BatchNo,
                                                                FinishQty = item.OrderQuantity,
                                                                LocationName = task.SourceAddress
                                                            };
                                                        }).ToList()
@@ -1664,20 +1742,21 @@
                                        }
                                    };

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

@@ -1693,6 +1772,11 @@
                        {
                            _unitOfWorkManage.RollbackTran();
                            throw;
                            }
                        }
                        catch (Exception ex)
                        {
                            return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
                        }
                    }
                    else
@@ -2202,7 +2286,7 @@
        }

        //成品回库单
        private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
        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)
@@ -2212,17 +2296,9 @@
            {
                throw new Exception("建立回库单时，未找到该库存信息");
            }

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

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

            if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
            {
                Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
@@ -2234,32 +2310,65 @@
                {
                    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 = outboundOrderDetail.OrderQuantity;
                        matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
                matchedStockDetail.OrderNo = returnOrder.OrderNo;
                        // 更新匹配的明细
                        _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
                    }


                // 更新库存状态
                stockInfo.LocationCode = "";
                stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                stockInfo.Remark = "反拣入库";

                // 更新匹配的明细
                _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
            }
            else
            {
                // 计算当前批次的剩余数量
                decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;
                    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>();

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

                try
                    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,
@@ -2273,7 +2382,8 @@
                            Creater = "LK",
                            CreateDate = DateTime.Now,
                            OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
                            System = "WMS"
                                System = "WMS",
                                Remark = "多批次返库"  // 添加备注标识
                        };

                        if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
@@ -2282,132 +2392,122 @@
                        }

                        // 添加返库单
                        _returnOrderRepository.AddData(returnOrder);
                            returnOrders.Add(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);
                            matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
                            matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
                            //matchedStockDetail.OrderNo = returnOrder.OrderNo;
                    }
                    else if (remainingQuantity == 0)
                    {
                        // 当前批次正好出完
                        matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
                        _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                            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 => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
                        .Where(x => !processedStockDetails.Contains(x) && x.StockQuantity > 0)
                            .ToList();

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

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

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

                                _returnOrderRepository.AddData(otherReturnOrder);
                            }

                        returnOrders.Add(otherReturnOrder);
                        }

                        // 如果所有批次都出完了，删除库存
                        var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
                        if (totalRemaining == 0)
                    // 批量更新已处理的库存明细
                    var updateDetails = processedStockDetails.Where(x => x.StockQuantity > 0).ToList();
                    if (updateDetails.Any())
                        {
                            DeleteAndMoveIntoHtStockStatus(stockInfo);
                        _stockService.StockInfoDetailService.Repository.UpdateData(updateDetails);
                        }
                        else

                    // 添加返库单
                    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 = "余料退库";
                        stockInfo.Remark = $"余料退库，共{returnOrders.Count}个返库单";
                            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                        }
                    }
                    else
                    {
                        throw new Exception($"出库数量 {outboundOrderDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
                    }

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

            }
        }

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