1

wankeda

2026-02-04 7df9475d342d199ae9cc5585d5d3a95888c33208

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -81,6 +81,7 @@
using System;
using WIDESEA_Common.Log;
using static WIDESEA_Common.HouseInboundPassBack.data.data1;
using System.Diagnostics;

namespace WIDESEA_TaskInfoService
{
@@ -108,6 +109,7 @@
        private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
        private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
        private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
        private readonly IStockInfoDetailCPRepository _stockInfoDetailCPRepository;
        private readonly IReturnOrderRepository _returnOrderRepository;
        private readonly IProductionRepository _productionRepository;
        private readonly IInboundRepository _inboundRepository;
@@ -115,7 +117,7 @@
        private readonly ITakeStockOrderDetailCPRepository _takeStockOrderDetailCPRepository;
        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, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository) : 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, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository, IStockInfoDetailCPRepository stockInfoDetailCPRepository) : base(BaseDal)
        {
            _mapper = mapper;
            _stockRepository = stockRepository;
@@ -143,6 +145,7 @@
            _newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
            _takeStockOrderCPRepository = takeStockOrderCPRepository;
            _takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
            _stockInfoDetailCPRepository = stockInfoDetailCPRepository;
        }

        public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -559,9 +562,9 @@
                                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();
              .Where(x => dt_StockInfo.Details.Select(d => d.Id).Contains(x.StockDetailId))
              .Select(x => x.BoxCode)
              .ToList();

                            // 2. 获取托盘下的所有箱号
                            var boxCodes = new List<string>();
@@ -638,14 +641,6 @@
                                    .ToList();
                            }

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

                            // 4. 查询并更新成品库存明细（如果有单独的成品库存表）
                            List<Dt_StockInfoDetailCP> cpStockDetails = new List<Dt_StockInfoDetailCP>();
@@ -707,7 +702,7 @@
                                // 更新成品入库明细状态
                                if (cpInboundDetails.Any())
                                {
                                    BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
                                    BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
                                }

                                // 更新成品库存明细状态
@@ -889,6 +884,158 @@
                            }
                        }
                    }
                    else if (warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
                    {
                        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;
                        //出库入库逻辑
                        if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
                        {
                            int lastStatus = dt_LocationInfo.LocationStatus;
                            dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                            // 根据托盘明细获取对应的入库单明细
                            List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();

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

                                    if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
                                    {
                                        inboundOrderDetails.Add(detail);
                                    }
                                }
                            }
                            if (!inboundOrderDetails.Any())
                            {
                                return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
                            }
                            // 更新入库单明细状态
                            foreach (var inboundOrderDetail in inboundOrderDetails)
                            {
                                // 检查该明细是否已全部入库
                                decimal totalStockQuantity = dt_StockInfo.Details
                                    .Where(x => x.LinId == inboundOrderDetail.LinId && x.BatchNo == inboundOrderDetail.BatchNo)
                                    .Sum(x => x.StockQuantity);

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

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

                                // 检查是否全部完成
                                if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                }
                                else
                                {
                                    inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
                                }
                            }
                            ///更新库存状态
                            dt_StockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                            // 更新库存明细状态
                            dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());
                            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());

                                // 单据数量全部上架完成，处理WMS回传
                                if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
                                {
                                    if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt())
                                    {
                                        bool allCompleted = inboundOrder.Details.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
                                        if (allCompleted)
                                        {
                                            foreach (var detail in inboundOrder.Details)
                                            {
                                                FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
                                            }
                                        }
                                    }
                                }
                                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
                                {
                                    //SendInboundInfoToWMS(task, inboundOrder, stockInfo);
                                }
                                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                                {
                                    SendAllocateInfoToWMS(task, inboundOrder, dt_StockInfo);
                                }

                                _unitOfWorkManage.CommitTran();
                                return WebResponseContent.Instance.OK();
                            }
                            catch (Exception ex)
                            {
                                _unitOfWorkManage.RollbackTran();
                                throw new Exception($"入库处理失败：{ex.Message}", ex);
                            }

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

                        }

                    }
                    else
                    {
                        Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
@@ -1019,7 +1166,7 @@
                }
                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
                {
                    //SendInboundInfoToWMS(task, inboundOrder, stockInfo);
                    SendInboundInfoToWMS(task, inboundOrder, stockInfo);
                }
                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                {
@@ -1541,128 +1688,130 @@
                                       x.LPNNo == stockInfo.PalletCode)
                                .ToList();

                            if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
                            List<Dt_NewOutboundOrderDetail> outboundOrderDetails1 = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
                                .Where(x => x.OrderId == outboundOrder.Id)                                 
                                .ToList();
                            if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0  && outboundOrderDetails1.Count == 0))
                            {
                                throw new Exception($"未找到托盘 {stockInfo.PalletCode} 在货位 {stockInfo.LocationCode} 上的出库单明细");
                            }

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

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

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

                                if (matchingOrderDetails.Count == 0)
                                foreach (var stockDetail in stockInfoDetails)
                                {
                                    continue;
                                }
                                    var matchingOrderDetails = outboundOrderDetails1
                                        .Where(x => x.MaterielCode == stockDetail.MaterielCode)
                                        .ToList();

                                // 计算需要分配的数量
                                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)
                                    if (matchingOrderDetails.Count == 0)
                                    {
                                        orderDetail.OverOutQuantity += allocateQty;
                                        remainingStock -= allocateQty;
                                        continue;
                                    }

                                        // 检查是否完成
                                        if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
                                    // 计算需要分配的数量
                                    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.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                            overCount++;
                                            orderDetail.OverOutQuantity += allocateQty;
                                            remainingStock -= allocateQty;

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

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

                                _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


                                AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

                                // 区分单据数据来源更新货位状态
                                if (outboundOrder.System == null)
                                // 更新订单状态
                                if (outboundOrder.Details.Count == overCount)
                                {
                                    return WebResponseContent.Instance.Error("出库单数据源为空");
                                    outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                                }
                                _unitOfWorkManage.BeginTran();

                                if (!outboundOrder.System.Equals("SMOM"))
                                try
                                {
                                    UpdateLocationStatus(locationInfo);
                                }
                                    // 更新出库单
                                    _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);

                                // 处理任务完成
                                CompleteTask(task);
                                    _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails1);

                                // 添加状态变更记录
                                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");
                                    AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails1);

                                // ERP系统反馈
                                if (outboundOrder.System.Equals("ERP"))
                                {
                                    // 为每个完成的明细反馈ERP
                                    foreach (var orderDetail in outboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
                                    // 区分单据数据来源更新货位状态
                                    if (outboundOrder.System == null)
                                    {
                                        FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
                                        return WebResponseContent.Instance.Error("出库单数据源为空");
                                    }

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

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

                                    if (outStockLockInfoList.Count == 0)
                                        throw new Exception($"订单 {outboundOrder.OrderNo} 托盘 {stockInfo.PalletCode} 未找到库存锁定信息");
                                    // 添加状态变更记录
                                    AddStatusChangeRecord(task, stockInfo, locationInfo);

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

                                    // ERP系统反馈
                                    if (outboundOrder.System.Equals("ERP"))
                                    {
                                        var passBack = new HouseoutboundPassBack
                                        // 为每个完成的明细反馈ERP
                                        foreach (var orderDetail in outboundOrderDetails1.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
                                        {
                                            ApiType = "ShippingOrderController",
                                            Method = "AsrsOutboundSO",
                                            Parameters = new List<HouseoutboundPassBack.datas>
                                            FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
                                        }

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

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

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

                                        // 采购出库
                                        if (outboundOrder.OrderType == 1)
                                        {
                                            var passBack = new HouseoutboundPassBack
                                            {
                                                ApiType = "ShippingOrderController",
                                                Method = "AsrsOutboundSO",
                                                Parameters = new List<HouseoutboundPassBack.datas>
                        {
                            new HouseoutboundPassBack.datas
                            {
@@ -1690,33 +1839,33 @@
                                }
                            }
                        }
                                        };
                                            };

                                        //调用SMOM接口...
                                        var authResult = AuthenticateWithWMS();
                                        if (authResult.IsSuccess)
                                        {
                                            passBack.Context = new Dictionary<string, string>
                                            //调用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 ?? "未提供错误信息"}");
                                                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
                            {
@@ -1747,44 +1896,313 @@
                                }
                            }
                        }
                                        };
                                            };

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

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

                                    _unitOfWorkManage.CommitTran();
                                    return WebResponseContent.Instance.OK();
                                }
                                catch
                                {
                                    _unitOfWorkManage.RollbackTran();
                                    throw;
                                }
                            }
                            else
                            {
                                foreach (var stockDetail in stockInfoDetails)
                                {
                                    var matchingOrderDetails = outboundOrderDetails
                                        .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
                                               x.BatchNo == stockDetail.BatchNo)
                                        .ToList();

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

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

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

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

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

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

                                            // 检查是否完成
                                            if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
                                            {
                                                throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                                                orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                                                overCount++;
                                            }
                                        }
                                    }
                                }

                                if (outboundOrder.OrderType == 240) // 盘点出库
                                // 更新订单状态
                                if (outboundOrder.Details.Count == overCount)
                                {
                                    // 盘点出库特殊处理逻辑
                                    outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                                }
                                _unitOfWorkManage.BeginTran();

                                _unitOfWorkManage.CommitTran();
                                return WebResponseContent.Instance.OK();
                            }
                            catch
                                try
                                {
                                    // 更新出库单
                                    _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);

                                    _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


                                    AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                                    _unitOfWorkManage.CommitTran();
                                    return WebResponseContent.Instance.OK();
                                }
                                catch
                                {
                                    _unitOfWorkManage.RollbackTran();
                                    throw;
                                }
                            }
                        }
                        catch (Exception ex)
                        {
                            return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
                        }
                    }
                    else if (warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
                    {
                        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("未找到出库单信息");

                        List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
                        foreach(var detail in stockInfo.Details)
                        {
                            Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                           .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo).First();
                            outboundOrderDetails.Add(outboundOrderDetail);
                        }

                        for(var i = 0; i<outboundOrderDetails.Count; i++)
                        {
                            if (outboundOrderDetails[i].LocationName != null && outboundOrderDetails[i].LocationName != "")
                            {
                                foreach (var detail in stockInfo.Details)
                                {
                                    Dt_OutboundOrderDetail newOutboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                                   .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo && x.LocationName == stockInfo.LocationCode)
                                   .First();
                                    outboundOrderDetails[i] = newOutboundOrderDetail;
                                }
                            }
                        }

                        if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
                        DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
                        // 3. 执行核心出库逻辑
                        return DWANDYSExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
                    }
                    else
                    {
@@ -1879,8 +2297,10 @@
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

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

                 AddRetrueOrder(stockInfo, inboundOrder);
     
                   
                // 区分单据数据来源更新货位状态
                if (inboundOrder.System == null)
                {
@@ -1938,6 +2358,82 @@
                throw;
            }
        }

        private WebResponseContent DWANDYSExecuteOutboundLogic(Dt_Task task, Dt_StockInfo stockInfo,
          Dt_LocationInfo locationInfo, List<Dt_OutboundOrderDetail> outboundOrderDetails, Dt_OutboundOrder inboundOrder)
        {
            try
            {
                _unitOfWorkManage.BeginTran();
                ///更新出库单
                _outboundService.OutboundOrderService.Repository.UpdateData(inboundOrder);
                // 更新出库订单详情
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

                // 更新库存状态 回库单
                if (locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
                {
                    AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
                }

                // 区分单据数据来源更新货位状态
                if (inboundOrder.System == null)
                {
                    return WebResponseContent.Instance.Error("出库单数据源为空");
                }
                if (!inboundOrder.System.Equals("SMOM"))
                {
                    UpdateLocationStatus(locationInfo);
                }
                // 处理任务完成
                CompleteTask(task);

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

                // 根据订单类型处理不同逻辑

                var outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                    .Where(x => x.OrderNo == inboundOrder.OrderNo).First();
                foreach(var outboundOrderDetail in outboundOrderDetails)
                {
                    var outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                   .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == outboundOrderDetail.BatchNo).First();
                    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 (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
                    {
                        FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetail.LinId);
                        DownloadReport(path, savePath, outboundOrderDetail.Id);
                    }
                    ///单据完成推送SMOM系统
                    if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && inboundOrder.System.Equals("SMOM"))
                    {
                        var stockInfoDetail = stockInfo.Details.FirstOrDefault();
                        ProcessNormalOutbound(task, stockInfo, outboundOrder, outDetail);
                        //DownloadReport(path, savePath, outboundOrderDetails.Id);
                        //printTest(savePath);
                        //SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
                    }

                    if (outboundOrder.OrderType == 240) // 盘点出库
                    {
                        // 盘点出库特殊处理逻辑
                    }
                }
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch
            {
                _unitOfWorkManage.RollbackTran();
                throw;
            }
        }
        private void UpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
        {
            int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
@@ -1964,6 +2460,46 @@
            {
                inboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
            }
        }

        //低温、药水
        private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref List<Dt_OutboundOrderDetail> inboundOrderDetails)
        {
            List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
            int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
            foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
            {
                string BatchNo = newOutboundOrderDetail.BatchNo;
                //inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);

                foreach (var item in stockInfo.Details)
                {
                    if (newOutboundOrderDetail == null) continue;

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

                    if (newOutboundOrderDetail.BatchNo == item.BatchNo)
                    {
                        newOutboundOrderDetail.OverOutQuantity += item.OutboundQuantity;

                        if (newOutboundOrderDetail.OverOutQuantity == newOutboundOrderDetail.OrderQuantity)
                        {
                            newOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
                            overCount++;
                        }
                        else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
                        {
                            newOutboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.出库中.ObjToInt();
                            inboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
                        }
                    }
                }
                if (inboundOrder.Details.Count() == overCount)
                {
                    inboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
                }
            }
  
        }

        private void DeleteAndMoveIntoHtStockStatus(Dt_StockInfo stockInfo)
@@ -2228,8 +2764,7 @@
        private void AddRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
        {
            Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
           .Where(x => x.StockId == stockInfo.Id)
           .First();
           .Where(x => x.StockId == stockInfo.Id).First();
            if (stockInfoDetail == null)
            {
                throw new Exception("建立回库单时，未找到该库存信息");
@@ -2289,6 +2824,95 @@
                    DeleteAndMoveIntoHtStockStatus(stockInfo);
                }
            }


        }

        //低温、药水回库单
        private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
        {

            List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
           .Where(x => x.StockId == stockInfo.Id).ToList();

            Dt_ReturnOrder? lastReturnOrder = null;
            foreach (var stockInfoDetail in stockInfoDetails)
            {
                if (stockInfoDetail == null)
                {
                    throw new Exception("建立回库单时，未找到该库存信息");
                }
                if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
                {
                    Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());
                    if (returnOrder == null)
                    {
                        throw new Exception("反拣出库后，未找到对应反拣回库单信息");
                    }
                    stockInfo.LocationCode = "";
                    stockInfo.StockStatus = StockStatusEmun.反拣入库.ObjToInt();
                    stockInfo.Remark = "反拣入库";
                    stockInfoDetail.OutboundQuantity = 0;
                    stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
                    stockInfoDetail.OrderNo = returnOrder.OrderNo;
                }
                else
                {
                    bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
                    if (allowCompeted)
                    {
                        DeleteAndMoveIntoHtStockStatus(stockInfo);
                    }
                    else
                    {
                        decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
                        if (returnQuantity > 0)
                        {
                            Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
                            {
                                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",
                                Remark = stockInfoDetail.BatchNo
                            };
                            if (lastReturnOrder != null)
                            {
                                lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
                                _returnOrderRepository.UpdateData(lastReturnOrder);
                            }
                            if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                            {
                                returnOrder.LocationCode = stockInfo.LocationCode;
                            }
                            _unitOfWorkManage.BeginTran();
                            if (lastReturnOrder == null)
                            {
                                _returnOrderRepository.AddData(returnOrder);
                                lastReturnOrder = returnOrder;
                            }
                            stockInfo.LocationCode = "";
                            stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                            stockInfo.Remark = "余料退库";
                            stockInfoDetail.OutboundQuantity = 0;
                            stockInfoDetail.StockQuantity = returnQuantity;
                            stockInfoDetail.OrderNo = lastReturnOrder.OrderNo;
                            _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                            _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
                            _unitOfWorkManage.CommitTran();
                        }
                    }
                }
            }


        }

@@ -2363,8 +2987,7 @@
                        var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
                        if (matchedStockDetail == null)
                        {
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
               x.MaterielCode == outboundDetail.MaterielCode);
                            matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode);

                            if (matchedStockDetail == null)
                            {
@@ -2402,7 +3025,7 @@
                            returnOrders.Add(returnOrder);

                            // 更新当前批次明细：只保留出库数量，其余返库
                            matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
                            matchedStockDetail.StockQuantity = remainingQuantity;
                            matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
                            //matchedStockDetail.OrderNo = returnOrder.OrderNo;
                        }
@@ -2792,223 +3415,205 @@
            }
        }

        public virtual void PrintTestDirect(string fullPath)
        public void PrintTestDirect(string fullPath)
        {
            const int maxRetryCount = 3;
            const int retryDelayMs = 1000;

            if (!File.Exists(fullPath))
            {
                Console.WriteLine($"打印失败：文件不存在 {fullPath}");
                Console.WriteLine($"✗ 打印失败：文件不存在 {fullPath}");
                return;
            }

            // 获取打印机名称
            string printerName = AppSettings.app("PrinterName");
            // 获取打印机名称配置
            string printerName = AppSettings.app("PrinterName")?.Trim();

            PrintUsingSpireSimple(fullPath, printerName);
            if (string.IsNullOrEmpty(printerName))
            {
                // 如果没有配置，使用系统默认打印机
                printerName = GetDefaultPrinterUbuntu();
            }


            Console.WriteLine("所有打印方法都失败");
            PrintUsingUbuntuPrinter(fullPath, printerName);
        }


        private void PrintUsingSpireSimple(string filePath, string printerName)
        /// <summary>
        /// 获取 Ubuntu 默认打印机
        /// </summary>
        private string GetDefaultPrinterUbuntu()
        {
            try
            {
                using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
                ProcessStartInfo psi = new ProcessStartInfo
                {
                    // 加载文件
                    pdf.LoadFromFile(filePath);
                    FileName = "lpstat",
                    Arguments = "-d",
                    UseShellExecute = false,
                    CreateNoWindow = true,
                    RedirectStandardOutput = true
                };

                    // 获取实际的打印机名称
                    string actualPrinterName = GetActualPrinterName(printerName);
                using (Process process = new Process { StartInfo = psi })
                {
                    process.Start();
                    string output = process.StandardOutput.ReadToEnd();
                    process.WaitForExit();

                    Console.WriteLine($"配置的打印机名称: {printerName}");
                    Console.WriteLine($"实际使用的打印机名称: {actualPrinterName}");

                    // 如果找不到实际打印机，使用默认打印机
                    if (!string.IsNullOrEmpty(actualPrinterName) && IsPrinterInstalled(actualPrinterName))
                    // 解析默认打印机名称，例如: "system default destination: LenovoPrinter"
                    if (output.Contains(":"))
                    {
                        pdf.PrintSettings.PrinterName = actualPrinterName;
                        Console.WriteLine($"✓ 已设置打印机: {actualPrinterName}");
                        return output.Split(':')[1].Trim();
                    }
                    else
                    {
                        Console.WriteLine($"⚠️ 打印机 '{actualPrinterName}' 未找到，使用默认打印机");
                    }

                    // 直接打印
                    pdf.Print();
                    Console.WriteLine("✓ 打印任务已提交成功");
                    return "LenovoPrinter"; // 默认回退
                }
            }
            catch
            {
                return "LenovoPrinter";
            }
        }

        /// <summary>
        /// Ubuntu 打印实现
        /// </summary>
        private void PrintUsingUbuntuPrinter(string filePath, string printerName)
        {
            try
            {
                PrintWithLpr(filePath, printerName);

            }
            catch (Exception ex)
            {
                Console.WriteLine($"✗ Spire.PDF打印失败: {ex.Message}");

                // 输出所有可用打印机，帮助调试
                Console.WriteLine("\n系统所有可用打印机:");
                foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
                {
                    Console.WriteLine($"  - {printer}");
                }

                Console.WriteLine($"✗ 打印失败: {ex.Message}");
                throw;
            }
        }

        /// <summary>
        /// 从配置的友好名称获取实际的打印机名称
        /// 使用 lpr 命令打印
        /// </summary>
        private string GetActualPrinterName(string displayName)
        private void PrintWithLpr(string filePath, string printerName)
        {
            if (string.IsNullOrEmpty(displayName))
                return string.Empty;
            Console.WriteLine($"📄 正在打印到 {printerName}: {Path.GetFileName(filePath)}");

            // 如果配置的是 "192.168.99.3 上的 Lenovo M7605D"
            if (displayName.Contains("192.168.99.3 上的 Lenovo M7605D"))
            {
                // 在系统中查找实际的打印机名称
                return FindActualPrinterForIP("192.168.99.3");
            }
            string command = $"lpr -P {printerName} \"{filePath}\"";

            // 如果直接配置的是IP地址
            if (displayName.Contains("192.168.99.3"))
            {
                return FindActualPrinterForIP("192.168.99.3");
            }

            // 如果已经是实际的打印机名称，直接返回
            if (IsPrinterInstalled(displayName))
            {
                return displayName;
            }

            // 默认返回原名称
            return displayName;
            ExecuteShellCommand(command);
        }


        /// <summary>
        /// 查找IP地址对应的实际打印机名称
        /// 执行 Shell 命令
        /// </summary>
        private string FindActualPrinterForIP(string ipAddress)
        private void ExecuteShellCommand(string command)
        {
            try
            ProcessStartInfo psi = new ProcessStartInfo
            {
                // 获取所有打印机
                var allPrinters = new List<string>();
                foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
                {
                    allPrinters.Add(printer);
                }
                FileName = "/bin/bash",
                Arguments = $"-c \"{command.Replace("\"", "\\\"")}\"",
                UseShellExecute = false,
                CreateNoWindow = true,
                RedirectStandardOutput = true,
                RedirectStandardError = true
            };

                Console.WriteLine($"查找IP地址 {ipAddress} 对应的打印机...");
                Console.WriteLine("系统打印机列表:");
                foreach (var printer in allPrinters)
                {
                    Console.WriteLine($"  - {printer}");
                }

                // 优先查找包含IP地址的打印机
                foreach (string printer in allPrinters)
                {
                    if (printer.Contains(ipAddress))
                    {
                        Console.WriteLine($"✓ 找到包含IP的打印机: {printer}");
                        return printer;
                    }
                }

                // 查找联想打印机
                foreach (string printer in allPrinters)
                {
                    if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
                    {
                        Console.WriteLine($"✓ 找到联想打印机: {printer}");
                        return printer;
                    }
                }


                // 返回第一个可用的打印机
                if (allPrinters.Any())
                {
                    Console.WriteLine($"⚠️ 未找到精确匹配，使用第一个打印机: {allPrinters.First()}");
                    return allPrinters.First();
                }

                return string.Empty;
            }
            catch (Exception ex)
            using (Process process = new Process { StartInfo = psi })
            {
                Console.WriteLine($"查找打印机失败: {ex.Message}");
                return string.Empty;
                process.Start();
                string output = process.StandardOutput.ReadToEnd();
                string error = process.StandardError.ReadToEnd();
                process.WaitForExit();

                if (process.ExitCode == 0)
                {
                    Console.WriteLine($"✅ 打印任务提交成功");
                    if (!string.IsNullOrEmpty(output))
                        Console.WriteLine($"输出: {output}");
                }
                else
                {
                    throw new InvalidOperationException($"命令执行失败: {error}");
                }
            }
        }


        /// <summary>
        /// 检查打印机是否已安装
        /// 只使用配置的打印机进行打印
        /// </summary>
        private bool IsPrinterInstalled(string printerName)
        /// <summary>
        /// Ubuntu 打印方法 - 使用 lpr 命令
        /// </summary>
        private void PrintUsingConfiguredPrinter(string filePath, string printerName)
        {
            try
            {
                foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
                // 1. 检查打印机是否在线
                if (!IsPrinterAvailableUbuntu(printerName))
                {
                    if (printer.Equals(printerName, StringComparison.OrdinalIgnoreCase))
                    {
                        return true;
                    }
                    throw new InvalidOperationException($"打印机 '{printerName}' 不可用或未找到");
                }
                return false;
            }
            catch
            {
                return false;
            }
        }
        /// <summary>
        /// 使用原始打印命令
        /// </summary>
        private void PrintUsingRawCommand(string filePath, string printerName)
        {
            try
            {
                var processStartInfo = new System.Diagnostics.ProcessStartInfo

                Console.WriteLine($"✓ 使用打印机: {printerName}");
                Console.WriteLine($"✓ 正在打印: {Path.GetFileName(filePath)}");

                // 2. 使用 lpr 命令打印
                ProcessStartInfo psi = new ProcessStartInfo
                {
                    FileName = filePath,
                    Verb = "print",  // 使用"print"动词
                    UseShellExecute = true,  // 关键：启用Shell执行
                    FileName = "lpr",
                    Arguments = $"-P {printerName} \"{filePath}\"",
                    UseShellExecute = false,
                    CreateNoWindow = true,
                    WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
                    RedirectStandardOutput = true,
                    RedirectStandardError = true
                };

                // 设置打印机（可选，系统通常会使用默认打印机）
                // processStartInfo.Arguments = $"/t \"{filePath}\" \"{printerName}\"";
                using (Process process = new Process { StartInfo = psi })
                {
                    process.Start();
                    string output = process.StandardOutput.ReadToEnd();
                    string error = process.StandardError.ReadToEnd();
                    process.WaitForExit();

                System.Diagnostics.Process.Start(processStartInfo);
                    if (process.ExitCode == 0)
                    {
                        Console.WriteLine($"✓ 打印任务已提交到 {printerName}");
                    }
                    else
                    {
                        throw new InvalidOperationException($"打印失败: {error}");
                    }
                }
            }
            catch (Exception ex)
            {
                Console.WriteLine($"打印失败: {ex.Message}");
                // 可以尝试其他方法
                //TryAlternativePrintMethod(filePath, printerName);
                Console.WriteLine($"✗ 打印失败: {ex.Message}");
                throw;
            }
        }


        /// <summary>
        /// 检查文件是否可访问
        /// Ubuntu 检查打印机可用性
        /// </summary>
        private bool IsFileAccessible(string filePath)
        private bool IsPrinterAvailableUbuntu(string printerName)
        {
            try
            {
                using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                ProcessStartInfo psi = new ProcessStartInfo
                {
                    return fs.Length > 0;
                    FileName = "lpstat",
                    Arguments = $"-p {printerName}",
                    UseShellExecute = false,
                    CreateNoWindow = true,
                    RedirectStandardOutput = true
                };

                using (Process process = new Process { StartInfo = psi })
                {
                    process.Start();
                    string output = process.StandardOutput.ReadToEnd();
                    process.WaitForExit();

                    return output.Contains($"{printerName} is idle") ||
                           output.Contains($"{printerName} is ready");
                }
            }
            catch
@@ -3016,25 +3621,6 @@
                return false;
            }
        }

        /// <summary>
        /// 尝试强制垃圾回收，释放可能存在的文件句柄
        /// </summary>
        private void TryForceGarbageCollection()
        {
            try
            {
                GC.Collect();
                GC.WaitForPendingFinalizers();
                Console.WriteLine("已执行垃圾回收");
            }
            catch (Exception ex)
            {
                Console.WriteLine($"垃圾回收失败: {ex.Message}");
            }
        }


        /// <summary>
        /// 盘点出库完成
        /// </summary>
@@ -3113,12 +3699,7 @@
            try
            {
                //获取对应盘点单
                Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode);
                if (takeStockOrderDetailCP == null)
                {
                    return content.Error($"盘点单，托盘号{takeStockOrderDetailCP.TakePalletCode}不存在");
                }
                Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First();
                Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
                if (takeStockOrder == null)
                {
                    return content.Error($"盘点单{task.OrderNo}不存在");
@@ -3181,6 +3762,7 @@
                _returnOrderRepository.AddData(returnOrder);
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
                _takeStockOrderCPRepository.UpdateData(takeStockOrder);
                _takeStockOrderDetailCPRepository.UpdateData(takeStockOrder.Details);
                _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);