前端，pda，后端接口更改，新增，优化

647556386

2025-10-18 d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb

 WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -34,6 +34,7 @@
using System.Threading.Tasks;
using WIDESEA_BasicRepository;
using WIDESEA_Common;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -41,11 +42,13 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Core.TaskEnum;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
using WIDESEA_IOutboundRepository;
using WIDESEA_IOutboundService;
@@ -55,14 +58,27 @@
using WIDESEA_ITaskInfoRepository;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Inbound;
using WIDESEA_StockRepository;
using WIDESEA_TaskInfoRepository;
using static WIDESEA_Common.Authentication;
using static WIDESEA_Common.HouseBackboundPassBack;
using static WIDESEA_Common.HouseInboundPassBack;
using static WIDESEA_Common.HouseoutboundPassBack;
using static WIDESEA_Common.InventoryAllocate;
using static WIDESEA_ITaskInfoService.ITaskService;
using Parameter = WIDESEA_Common.Parameter;
using WIDESEA_DTO.ERP;
using WIDESEA_OutboundRepository;
using System.ComponentModel.DataAnnotations;
using System;
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
using Spire.Pdf;
using WIDESEA_InboundRepository;
using System.Drawing.Printing;
using System;

namespace WIDESEA_TaskInfoService
{
@@ -89,9 +105,12 @@
        private readonly IPalletTypeInfoRepository _palletTypeInfoRepository;
        private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
        private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
        private readonly IReturnOrderRepository _returnOrderRepository;
        private readonly IProductionRepository _productionRepository;
        private readonly IInboundRepository _inboundRepository; 
        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) : 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) : base(BaseDal)
        {
            _mapper = mapper;
            _stockRepository = stockRepository;
@@ -113,13 +132,18 @@
            _basicRepository = basicRepository;
            _stockInfoDetailRepository = stockInfoDetailRepository;
            _palletTypeInfoRepository = palletTypeInfoRepository;
            _returnOrderRepository = returnOrderRepository;
            _productionRepository = productionRepository;
            _inboundRepository = inboundRepository;
        }

        public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
        public string ReceiveWMSTaskreturn = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskreturn"];
        public string ReceiveWMSTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskout"];
        public string ReceiveWMSTaskAUT = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAUT"];
        public string ReceiveWMSTaskAllocatein = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAllocatein"];

        public string ReceiveERPTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveERPTaskout"];
        public string InMaterialWarehousingCallback = WIDESEA_Core.Helper.AppSettings.Configuration["InMaterialWarehousingCallback"];

        /// <summary>
        /// 任务信息推送至WCS
@@ -140,6 +164,30 @@
                    return WebResponseContent.Instance.Error($"未找到WCSApi地址,请检查配置文件");
                }
                string response = HttpHelper.Post($"{url}/api/Task/ReceiveTask", taskDTOs.Serialize());

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

        public WebResponseContent FeedBackWCSTaskCompleted(int taskNum)
        {
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null)
                {
                    return WebResponseContent.Instance.Error("未找到该任务信息");
                }
                string url = AppSettings.app("WCS");
                if (string.IsNullOrEmpty(url))
                {
                    return WebResponseContent.Instance.Error($"未找到WCSApi地址,请检查配置文件");
                }
                string response = HttpHelper.Get($"{url}/api/Task/RecWMSTaskCompleted?taskNum=" + taskNum);

                return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("返回错误");
            }
@@ -381,7 +429,7 @@
                {
                    return WebResponseContent.Instance.Error($"未找到该任务");
                }
                if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
                if (task.TaskType.GetTaskTypeGroup() != TaskTypeGroup.InboundGroup)
                {
                    return WebResponseContent.Instance.Error($"任务类型错误");
                }
@@ -421,7 +469,31 @@
                Dt_InboundOrderDetail? inboundOrderDetail = null;

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

                }
                return WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
@@ -440,11 +512,12 @@
                .Includes(x => x.Details)
                .First();

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

            if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt() && inboundOrder == null)
            {
                return WebResponseContent.Instance.Error("未找到入库单信息");
            }
            Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details
                .FirstOrDefault(x => x.LinId == stockInfo.Details.FirstOrDefault()?.LinId);

            //if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.入库确认.ObjToInt())
            //{
            //入库数量回传
@@ -456,6 +529,29 @@
            //    return ProcessAllocateInbound(task, stockInfo, locationInfo, lastStatus, inboundOrder, inboundOrderDetail);
            //}
        }
        private WebResponseContent ReturnInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
        {
            int lastStatus = locationInfo.LocationStatus;
            locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();

            Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.OrderNo == stockInfo.Details.FirstOrDefault().OrderNo);
            if (returnOrder == null)
            {
                return WebResponseContent.Instance.Error("未找到回库单信息");
            }
            //if (inboundOrder != null && stockInfo.StockStatus == StockStatusEmun.入库确认.ObjToInt())
            //{
            //入库数量回传
            return SurplusReturnInbound(task, stockInfo, locationInfo, lastStatus, returnOrder);
            //}
            //else
            //{
            //    //调拨出入库任务数量回传
            //    return ProcessAllocateInbound(task, stockInfo, locationInfo, lastStatus, inboundOrder, inboundOrderDetail);
            //}
        }


        //其他入库
        private WebResponseContent ProcessNormalInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo,
            int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
@@ -487,16 +583,77 @@
                UpdateInboundOrder(inboundOrder, inboundOrderDetail);

                // 单据数量全部上架完成，处理WMS回传
                if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0)
                if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
                {
                    var stockInfoDetail = stockInfo.Details.FirstOrDefault();
                    FeedBackInboundERP(inboundOrder.UpperOrderNo, inboundOrderDetail.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)
                else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
                {
                    SendAllocateInfoToWMS(task, inboundOrder, stockInfo);
                }

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
            catch
            {
                _unitOfWorkManage.RollbackTran();
                throw;
            }
        }
        //回库逻辑处理并上报WMS
        private WebResponseContent SurplusReturnInbound(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo,
            int lastStatus, Dt_ReturnOrder returnOrder)
        {
            returnOrder.OrderStatus = InOrderStatusEnum.入库完成.ObjToInt();

            if (task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
            {
                foreach (var item in stockInfo.Details)
                {
                    item.StockQuantity = returnOrder.OrderQuantity;
                    returnOrder.OverInQuantity = returnOrder.OrderQuantity;
                }
            }
            else
            {
                foreach (var item in stockInfo.Details)
                {
                    returnOrder.OverInQuantity += item.StockQuantity;
                }
            }
            ///更新库存状态
            stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
            // 更新库存明细状态
            stockInfo.Details.ForEach(x => x.Status = StockStatusEmun.入库完成.ObjToInt());

            try
            {
                _unitOfWorkManage.BeginTran();

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

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

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

                // 添加记录
                AddRecords(task, stockInfo, locationInfo, lastStatus);

                //更新回库单
                _returnOrderRepository.UpdateData(returnOrder);

                if (returnOrder.OrderType == OrderTypeEnum.反拣回库单.ObjToInt() && (returnOrder.LocationCode == null || returnOrder.LocationCode == ""))
                {
                    SurplusReturnInboundToWMS(task, returnOrder, stockInfo, locationInfo);
                }
                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
            }
@@ -585,7 +742,8 @@

        private void UpdateTaskStatus(Dt_Task task)
        {
            task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
            task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
            FeedBackWCSTaskCompleted(task.TaskNum);
            BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.人工完成 : OperateType.自动完成);
        }

@@ -621,7 +779,7 @@
            }
        }

        private void SendInboundInfoToWMS(Dt_Task task, Dt_InboundOrder inboundOrder, Dt_StockInfo stockInfo)
        private WebResponseContent SendInboundInfoToWMS(Dt_Task task, Dt_InboundOrder inboundOrder, Dt_StockInfo stockInfo)
        {


@@ -678,8 +836,80 @@
                { "InvOrgId", authResult.InvOrgId }
            };

                HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
                var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
                // 判断Success的值
                if (response.Success)
                {
                    // 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
                    return WebResponseContent.Instance.OK();
            }
                else
                {
                    // 如果Success为false，抛出异常并包含错误信息
                    throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                }

            }
            return WebResponseContent.Instance.OK();
        }

        private WebResponseContent SurplusReturnInboundToWMS(Dt_Task task, Dt_ReturnOrder returnOrder, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
        {
            List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.WarehouseId == task.WarehouseId).Includes(x => x.Details).Where(x => x.Details.Any(v => v.OrderNo == returnOrder.OrderNo)).ToList();
            Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);
            if (StockInfos.Count == 0) throw new Exception("未找到库存信息");
            var houseReturnOrders = new HouseBackboundPassBack
            {
                ApiType = "ShippingOrderController",
                Method = "returnShippingOrderUnPickingToAsrsCallback",
                Parameters = new List<HouseBackboundPassBack.backdata>
                {
                   new HouseBackboundPassBack.backdata
                    {
                         Value= new List<backdata.backdata1>
                        {
                            new backdata.backdata1
                            {
                                OrderType = returnOrder.OrderType,
                                MaterielCode = returnOrder.MaterielCode,
                                MaterielName = returnOrder.MaterielName,
                                MaterieSpec = returnOrder.MaterieSpec,
                                BatchNo = returnOrder.BatchNo,
                                OrderQuantity = returnOrder.OrderQuantity,
                                Remark = returnOrder.Remark,
                                LinId = returnOrder.LinId,
                                LPNNo = returnOrder.LPNNo,
                                LocationCode = locationInfo.LocationCode,
                                WarehouseCode = returnOrder.WarehouseCode,
                                System = returnOrder.System,
                            }
                        }
                   }    
                }
            };
            var authResult = AuthenticateWithWMS();
            if (authResult.IsSuccess)
            {
                houseReturnOrders.Context = new Dictionary<string, string>
            {
                { "Ticket", authResult.Ticket },
                { "InvOrgId", authResult.InvOrgId }
            };
                var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskreturn, houseReturnOrders, "取消发货后立库反拣入库回传WMS");
                // 判断Success的值
                if (response.Success)
                {
                    // 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
                    return WebResponseContent.Instance.OK();
                }
                else
                {
                    // 如果Success为false，抛出异常并包含错误信息
                    throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                }
                
            }
            return WebResponseContent.Instance.OK();
        }

        private void ProcessAllocateInboundOrder(Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
@@ -839,19 +1069,34 @@
                if (!validationResult.Status) return validationResult;

                int lastStatus = locationInfo.LocationStatus;
                locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();

                Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                    .Where(x => x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
                    .First();
                if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");

                Dt_Task task1 = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task1 == null)
                {
                    return WebResponseContent.Instance.Error("未找到该任务信息");
                }
                ///盘点出库任务完成逻辑
                if ((task.TaskType == TaskTypeEnum.OutInventory.ObjToInt()))
                {
                    return OutInventoryCompleted(task, stockInfo, locationInfo);
                }
                Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
                .Where(x => x.Id == outboundOrderDetails.OrderId)
                .Where(x => x.OrderNo == task1.OrderNo)
                .Includes(x => x.Details)
                .First();

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

                Dt_OutboundOrderDetail outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo)
                .First();
                if (outboundOrderDetails.LocationName != null && outboundOrderDetails.LocationName != "")
                {
                    outboundOrderDetails = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
                .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == stockInfo.Details.FirstOrDefault().BatchNo && x.LocationName == stockInfo.LocationCode)
                .First();
                }
                if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");

                // 2. 处理出库订单详情
                //var outboundOrderDetails = ProcessOutboundOrderDetails(outStockLockInfos);

@@ -888,7 +1133,7 @@

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

            return WebResponseContent.Instance.OK();
@@ -927,11 +1172,17 @@
                _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

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

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

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

@@ -939,27 +1190,38 @@
                AddStatusChangeRecord(task, stockInfo, locationInfo);

                // 根据订单类型处理不同逻辑
                var outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
                    .Where(x => x.BatchNo == outboundOrderDetails.BatchNo).First();

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

                if (outboundOrder.OrderType == 240) // 盘点出库
                {
                    // 盘点出库特殊处理逻辑
                }
                //else // 调拨出库
                //{
                //    ProcessAllocateOutbound(task, stockInfo, outboundOrder, outDetail);
                //}

                _unitOfWorkManage.CommitTran();
                return WebResponseContent.Instance.OK();
@@ -1013,7 +1275,8 @@

        private void CompleteTask(Dt_Task task)
        {
            task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
            task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
            FeedBackWCSTaskCompleted(task.TaskNum);
            BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
        }

@@ -1055,7 +1318,7 @@
            //MoveOutboundDetailToHistory(outDetail);

            // 发送出库信息到WMS
            if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 0)
            if (outboundOrder.OrderStatus == OutboundStatusEnum.出库完成.ObjToInt() && outboundOrder.OrderType == 1)
            {
                SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
            }
@@ -1120,7 +1383,7 @@
            _outboundService.OutboundOrderService.DeleteData(outDetail);
        }

        private void SendNormalOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
        private WebResponseContent SendNormalOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
            Dt_StockInfoDetail stockInfoDetail, Dt_OutboundOrderDetail outDetail)
            {

@@ -1132,8 +1395,8 @@
                // 构建回传数据，将所有匹配的库存明细加入 DetailList
                var passBack = new HouseoutboundPassBack
                {
                    ApiType = "InventoryAllocateController",
                    Method = "AsrsFinishedStockCount",
                ApiType = "ShippingOrderController",
                Method = "AsrsOutboundSO",
                    Parameters = new List<HouseoutboundPassBack.datas>
            {
            new HouseoutboundPassBack.datas
@@ -1174,8 +1437,21 @@
            { "InvOrgId", authResult.InvOrgId }
        };

                HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, passBack, "立库入库数量回传WMS");
                var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
                // 判断Success的值
                if (response.Success)
                {
                    // 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
                    return WebResponseContent.Instance.OK();
            }
                else
                {
                    // 如果Success为false，抛出异常并包含错误信息
                    throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
                }

            }
            return WebResponseContent.Instance.OK();
        }

        private void SendAllocateOutboundToWMS(Dt_Task task, Dt_OutboundOrder outboundOrder,
@@ -1243,6 +1519,285 @@
                App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
        }

        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();
            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
            {
                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"
                    };
                    if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
                    {
                        returnOrder.LocationCode = stockInfo.LocationCode;
                    }
                    _unitOfWorkManage.BeginTran();
                    _returnOrderRepository.AddData(returnOrder);
                    stockInfo.LocationCode = "";
                    stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
                    stockInfo.Remark = "余料退库";
                    stockInfoDetail.OutboundQuantity = 0;
                    stockInfoDetail.StockQuantity = returnQuantity;
                    stockInfoDetail.OrderNo = returnOrder.OrderNo;
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
                    _unitOfWorkManage.CommitTran();
                }
                else
                {
                    DeleteAndMoveIntoHtStockStatus(stockInfo);
                }
            }

        }
        /// <summary>
        /// 单据明细出库完成回调ERP(表单提交)
        /// </summary>
        /// <param name="outboundOrder"></param>
        /// <param name="outboundOrderDetail"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public WebResponseContent FeedBackOutERP(string orderNO, string linId)
        {
            Dt_OutStockLockInfo outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryFirst(x => x.OrderNo == orderNO && x.LinId == linId);
            if (outStockLockInfos == null)
            {
                return WebResponseContent.Instance.Error("未找到出库库存信息");
            }
            var postContent = new MultipartFormDataContent();
            postContent.Headers.Add("ContentType", $"multipart/form-data");
            postContent.Add(new StringContent(outStockLockInfos.LinId), "ids");
            string result = string.Empty;
            HttpClient client = null;
            try
            {
                using (client = new HttpClient())
                {
                    HttpResponseMessage response = client.PostAsync(ReceiveERPTaskout, postContent)
                        .ConfigureAwait(false).GetAwaiter().GetResult();

                    // 确保响应成功
                    response.EnsureSuccessStatusCode();

                    result = response.Content.ReadAsStringAsync()
                        .ConfigureAwait(false).GetAwaiter().GetResult();
                }

                // 假设ERP返回成功时返回成功响应
                return WebResponseContent.Instance.OK(result);
            }
            catch (HttpRequestException ex)
            {
                // 处理HTTP请求相关异常
                return WebResponseContent.Instance.Error($"HTTP请求错误: {ex.Message}");
            }
            catch (Exception ex)
            {
                // 处理其他异常
                return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
            }


        }

        public WebResponseContent FeedBackInboundERP(string upperOrderNo, string linId)
        {
            if (upperOrderNo == null)
            {
                return WebResponseContent.Instance.Error("未找到入库单信息");
            }
            List<FeedbackInboundOrderERP> feedbackInboundOrderERPs = new List<FeedbackInboundOrderERP>();

            FeedbackInboundOrderERP feedbackInboundOrder = new FeedbackInboundOrderERP()
            {
                code = upperOrderNo,
                itemId = linId,
                success = true

            };
            feedbackInboundOrderERPs.Add(feedbackInboundOrder);
            var response = HttpHelper.Post<WebResponseContent>(InMaterialWarehousingCallback, feedbackInboundOrderERPs, "入库单完成回传ERP");
            // 判断Success的值
            if (response.Code == 0)
            {
                // 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
                return WebResponseContent.Instance.OK();
            }
            else
            {
                // 如果Success为false，抛出异常并包含错误信息
                throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
            }
        }
        public string DownloadReport(string path, string savePath, int orderId)
        {
            // 构建完整 URL，（报表传参）
            string reportUrl = path + "&orderId=" + orderId;

            try
            {
                // 确保保存目录存在
                string directory = Path.GetDirectoryName(savePath);
                if (!Directory.Exists(directory))
                {
                    Directory.CreateDirectory(directory);
                }

                string[] files = Directory.GetFiles(directory);
                // 删除每个文件
                foreach (string filePath in files)
                {
                    File.Delete(filePath);
                }
                // 使用 HttpClient 下载文件
                using (var httpClient = new HttpClient())
                {
                    // 设置超时时间（帆软报表生成可能需要较长时间）
                    httpClient.Timeout = TimeSpan.FromMinutes(5);

                    // 发送 GET 请求（同步方式）
                    using (var response = httpClient.GetAsync(reportUrl, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult())
                    {
                        // 检查响应状态
                        response.EnsureSuccessStatusCode();

                        // 获取内容流（同步方式）
                        using (var contentStream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult())
                        {
                            // 创建文件流
                            using (var fileStream = new FileStream(savePath, FileMode.Create, FileAccess.Write, FileShare.None))
                            {
                                // 复制内容到文件（同步方式）
                                contentStream.CopyToAsync(fileStream).GetAwaiter().GetResult();
                            }
                        }
                    }
                }
                return savePath;

            }
            catch (Exception ex)
            {
                throw new ValidationException(ex.Message);
            }
        }

        public virtual void printTest(string fullPath)
        {
            Spire.Pdf.PdfDocument pdf = new PdfDocument();
            //文件地址
            pdf.LoadFromFile(fullPath);
            //指定打印机位置
            string url = AppSettings.app("PrinterName");
            pdf.PrintSettings.PrinterName = url;
            //执行打印
            pdf.Print();
            //内存释放
            pdf.Dispose();

        }


        /// <summary>
        /// 盘点出库完成
        /// </summary>
        public WebResponseContent OutInventoryCompleted(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                //获取对应盘点单
                Dt_TakeStockOrder takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
                if (takeStockOrder == null)
                {
                    return content.Error($"盘点单{task.OrderNo}不存在");
                }
                if (takeStockOrder.TakeStockStatus != TakeStockStatusEnum.盘点中.ObjToInt())
                {
                    return content.Error($"盘点单{task.OrderNo}盘点已完成或未开始");
                }
                if (stockInfo.StockStatus != StockStatusEmun.出库锁定.ObjToInt())
                {
                    return content.Error($"{stockInfo.PalletCode}库存状态不正确");
                }
                if (locationInfo.LocationStatus != LocationStatusEnum.Lock.ObjToInt())
                {
                    return content.Error($"{locationInfo.LocationCode}货位状态不正确");
                }
                //根据任务托盘查盘点明细
                Dt_TakeStockOrderDetail? takeStockOrderDetail = takeStockOrder.Details.FirstOrDefault(x => x.TakePalletCode == stockInfo.PalletCode);
                if (takeStockOrderDetail == null)
                {
                    return content.Error($"{stockInfo.PalletCode}未找到对应盘点明细");
                }
                if (takeStockOrderDetail.TakeDetalStatus != TakeStockDetailStatusEnum.盘点出库中.ObjToInt())
                {
                    return content.Error($"{stockInfo.PalletCode}盘点明细状态不正确");
                }
                takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库完成.ObjToInt();
                stockInfo.StockStatus = StockStatusEmun.盘点出库完成.ObjToInt();
                stockInfo.Details.ForEach(x =>
                {
                    x.Status = StockStatusEmun.盘点出库完成.ObjToInt();
                });
                stockInfo.LocationCode = "";
                task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
                int beforeStatus = locationInfo.LocationStatus;
                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _unitOfWorkManage.BeginTran();
                //货位变动记录
                _basicService.LocationInfoService.UpdateData(locationInfo);
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Free.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
                _inboundRepository.TakeStockOrderDetailRepository.UpdateData(takeStockOrderDetail);
                _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                _stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                _unitOfWorkManage.CommitTran();
                content.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
            }
            return content;
        }
    }
        #endregion
        #endregion

@@ -1763,5 +2318,4 @@
        //    }
        //}
        #endregion
    }
}