MeiRuiAn/JiAnLiKu.git

			@@ -20,20 +20,30 @@
			using Microsoft.AspNetCore.SignalR;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Database;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
			using Org.BouncyCastle.Asn1.Tsp;
			using Spire.Pdf;
			using SqlSugar;
			using System;
			using System;
			using System;
			using System.Collections.Generic;
			using System.ComponentModel;
			using System.ComponentModel.DataAnnotations;
			using System.Diagnostics.CodeAnalysis;
			using System.Drawing.Printing;
			using System.IO;
			using System.Linq;
			using System.Net.Http;
			using System.Reflection;
			using System.Reflection.Metadata;
			using System.Text;
			using System.Threading.Tasks;
			using System.Threading.Tasks;
			using WIDESEA_BasicRepository;
			using WIDESEA_Common;
			using WIDESEA_Common.Log;
			using WIDESEA_Common.OrderEnum;
			using WIDESEA_Common.TaskEnum;
			using WIDESEA_Core;
			@@ -43,6 +53,7 @@
			using WIDESEA_Core.Helper;
			using WIDESEA_Core.TaskEnum;
			using WIDESEA_DTO.Basic;
			using WIDESEA_DTO.ERP;
			using WIDESEA_DTO.Inbound;
			using WIDESEA_DTO.Stock;
			using WIDESEA_DTO.Task;
			@@ -50,6 +61,7 @@
			using WIDESEA_IBasicService;
			using WIDESEA_IInboundRepository;
			using WIDESEA_IInboundService;
			using WIDESEA_InboundRepository;
			using WIDESEA_IOutboundRepository;
			using WIDESEA_IOutboundService;
			using WIDESEA_IRecordService;
			@@ -59,13 +71,17 @@
			using WIDESEA_ITaskInfoService;
			using WIDESEA_Model.Models;
			using WIDESEA_Model.Models.Inbound;
			using WIDESEA_OutboundRepository;
			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.HouseInboundPassBack.data.data1;
			using static WIDESEA_Common.HouseoutboundPassBack;
			using static WIDESEA_Common.InventoryAllocate;
			using static WIDESEA_Common.NewHouseInboundPassBack;
			using static WIDESEA_Common.NewHouseInboundPassBack.Parame.Syncretism;
			using static WIDESEA_ITaskInfoService.ITaskService;
			using Parameter = WIDESEA_Common.Parameter;
			using WIDESEA_DTO.ERP;
			@@ -81,6 +97,7 @@
			using System;
			using WIDESEA_Common.Log;
			using static WIDESEA_Common.HouseInboundPassBack.data.data1;
			using System.Diagnostics;

			namespace WIDESEA_TaskInfoService
			{
			@@ -108,13 +125,15 @@
			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;

			private readonly ITakeStockOrderCPRepository _takeStockOrderCPRepository;
			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) : 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;
			@@ -140,6 +159,9 @@
			_productionRepository = productionRepository;
			_inboundRepository = inboundRepository;
			_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
			_takeStockOrderCPRepository = takeStockOrderCPRepository;
			_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
			_stockInfoDetailCPRepository = stockInfoDetailCPRepository;
			}

			public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
			@@ -526,7 +548,14 @@

			if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() \|\| task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
			{
			return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
			int lastStatus = dt_LocationInfo.LocationStatus;
			dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == dt_StockInfo.PalletCode);
			if (returnOrder == null)
			{
			return WebResponseContent.Instance.Error("未找到回库单信息");
			}
			return SurplusReturnInbound(task, dt_StockInfo, dt_LocationInfo, lastStatus, returnOrder);
			}
			// 1. 获取入库单信息
			Dt_InboundOrder? inboundOrder = null;
			@@ -549,9 +578,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>();
			@@ -588,7 +617,7 @@
			return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
			}

			// 更新入库单明细状态
			// 更新入库单明细状态
			foreach (var inboundOrderDetail in inboundOrderDetails)
			{
			// 检查该明细是否已全部入库
			@@ -628,14 +657,6 @@
			.ToList();
			}

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

			// 4. 查询并更新成品库存明细（如果有单独的成品库存表）
			List<Dt_StockInfoDetailCP> cpStockDetails = new List<Dt_StockInfoDetailCP>();
			@@ -680,6 +701,10 @@
			if (allCompleted)
			{
			inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
			foreach (var item in inboundOrderDetails)
			{
			BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
			}
			}
			else
			{
			@@ -693,7 +718,7 @@
			// 更新成品入库明细状态
			if (cpInboundDetails.Any())
			{
			BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
			BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
			}

			// 更新成品库存明细状态
			@@ -712,6 +737,7 @@
			}
			if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
			{

			List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details, d => d.StockDetails)
			@@ -738,45 +764,54 @@
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			// 遍历所有库存明细，添加到 DetailList
			DetailList = StockInfos.Select(d => new data.data1.Inbound
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.Details.FirstOrDefault()?.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			.Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
			.Select(stockDetail => stockDetail.BoxCode )
			.ToList()
			}).ToList()
			DetailList = StockInfos
			.SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
			.GroupBy(x => new
			{
			x.Pallet.PalletCode,
			x.Detail.MaterielCode,
			x.Detail.BatchNo,
			x.Detail.LinId
			})
			.Select(g => new data.data1.Inbound
			{
			LinId = g.Key.LinId ?? "",
			MaterielCode = g.Key.MaterielCode ?? "",
			OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
			BatchNo = g.Key.BatchNo,
			LPNNo = g.Key.PalletCode,
			FinishQty = g.Sum(x => x.Detail.StockQuantity),
			LocationName = g.First().Pallet.LocationCode,
			LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
			.Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
			.Select(sd => sd.BoxCode)
			.Distinct()
			.ToList()
			})
			.ToList()
			}
			}
			}
			}
			};

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

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

			//}
			}

			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
			@@ -806,44 +841,256 @@
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			ActiveType=1,
			DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.Details.FirstOrDefault()?.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode,
			OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
			LabelList= d.Details
			.Where(detail => detail.StockDetails != null)
			.SelectMany(detail => detail.StockDetails)
			.Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
			.Select(stockDetail => stockDetail.BoxCode )
			.ToList()
			}).ToList()

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

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

			// var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			// if (!response.Success)
			// {
			// throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			// }
			//}
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			}
			}
			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 5 && inboundOrder.System.Equals("SMOM"))
			{

			List<Dt_StockInfo> StockInfos = _stockRepository.StockInfoRepository.Db
			.Queryable<Dt_StockInfo>()
			.Includes(x => x.Details, d => d.StockDetails)
			.Where(x => x.WarehouseId == task.WarehouseId &&
			x.Details.Any(v => v.OrderNo == inboundOrder.OrderNo))
			.ToList();

			Dt_InboundOrder? dt_InboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == inboundOrder.OrderNo).Includes(x => x.Details).First();
			if (StockInfos.Count == 0) throw new Exception("未找到库存信息");

			var houseSyncretism = new NewHouseInboundPassBack
			{
			ApiType = "InventoryMoveController",
			Method = "AsrsUnPickingDatas",
			Parameters = new List<NewHouseInboundPassBack.Parame>
			{
			new NewHouseInboundPassBack.Parame
			{

			Value = new Parame.Syncretism
			{
			OrderNo = inboundOrder.OrderNo,
			Details = StockInfos.SelectMany(stockInfo =>

			stockInfo.Details.Select(g =>
			{
			//var InboundOrderde1=dt_InboundOrder.Details.FirstOrDefault;

			return new Parame.Syncretism.details
			{
			MoveType = 0,
			WareHouseCode = warehouse.WarehouseCode,
			ItemCode = g.MaterielCode,
			MoveNumber = g.StockQuantity,
			LotNo = g.BatchNo,
			WipBatch = g.BatchNo,
			Lpn = g.StockDetails.FirstOrDefault().LPNNO,
			LocationName = g.StockDetails.FirstOrDefault().OrinalLocation,
			TargetLocName = stockInfo.LocationCode, // 添加null检查
			TargetLpn = stockInfo.PalletCode, // 添加null检查
			};


			})).ToList()

			}

			}
			}
			};

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

			};

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

			}

			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			throw new Exception($"入库处理失败：{ex.Message}", ex);
			}
			}
			}
			else 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();
			@@ -854,7 +1101,29 @@
			_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
			{
			@@ -986,7 +1255,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"))
			{
			@@ -1468,7 +1737,11 @@
			int lastStatus = locationInfo.LocationStatus;

			///盘点出库任务完成逻辑
			if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
			if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt() && stockInfo.System == "SMOM")
			{
			return SMOMOutInventoryCompleted(task, stockInfo, locationInfo);
			}
			else if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
			{
			return OutInventoryCompleted(task, stockInfo, locationInfo);
			}
			@@ -1493,104 +1766,158 @@
			{
			try
			{
			Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
			.First();
			Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>()
			.Where(x => x.OrderNo == task.OrderNo)
			.Includes(x => x.Details)
			.First();

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

			// item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
			//}
			List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
			.Where(x => x.OrderId == outboundOrder.Id &&
			x.LocationName == stockInfo.LocationCode &&
			x.LPNNo == stockInfo.PalletCode)
			.ToList();
			List<Dt_NewOutboundOrderDetail> outboundOrderDetails1 = new List<Dt_NewOutboundOrderDetail>();
			if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			{
			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 item in stockInfo.Details)
			if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			{
			if (outboundOrderDetails == null) continue;

			outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;

			if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
			foreach (var stockDetail in stockInfoDetails)
			{
			outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			}
			}
			if (outboundOrder.Details.Count == overCount)
			{
			outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
			}
			var matchingOrderDetails = outboundOrderDetails1
			.Where(x => x.MaterielCode == stockDetail.MaterielCode)
			.ToList();

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

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

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

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

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


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

			if (outStockLockInfo.Count == 0) throw new Exception("未找到库存信息");
			//采购出库
			if (outboundOrder.OrderType == 1)
			{
			var passBack = new HouseoutboundPassBack
			if (matchingOrderDetails.Count == 0)
			{
			ApiType = "ShippingOrderController",
			Method = "AsrsOutboundSO",
			Parameters = new List<HouseoutboundPassBack.datas>
			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)
			{
			new HouseoutboundPassBack.datas
			{
			Value = new List<HouseoutboundPassBack.datas.data1>
			orderDetail.OverOutQuantity += allocateQty;
			remainingStock -= allocateQty;

			// 检查是否完成
			if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
			{
			new HouseoutboundPassBack.datas.data1
			{
			No = outboundOrder.OrderNo,
			OutWareHouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
			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(outboundOrderDetails1);


			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails1);

			// 区分单据数据来源更新货位状态
			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 outboundOrderDetails1.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
			{
			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
			{
			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,
			@@ -1601,99 +1928,378 @@
			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 ?? "未提供错误信息"}");
			}
			}
			}
			}
			};

			// 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>
			// 调拨出库
			if (outboundOrder.OrderType == 4)
			{
			new Allocate
			var allocate = new InventoryAllocate
			{
			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 = outStockLockInfo.Select(item =>
			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 = outboundOrderDetails.LinId,
			LinId = item.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = outboundOrderDetails.MaterielCode,
			OrderQuantity = outboundOrderDetails.OrderQuantity,
			BatchNo = outboundOrderDetails.BatchNo,
			FinishQty = outboundOrderDetails.OrderQuantity,
			OrinalLocation=outboundOrderDetails.OrinalLocation,
			MaterielCode = item.MaterielCode,
			OrderQuantity = item.OrderQuantity,
			BatchNo = item.BatchNo,
			FinishQty = item.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			}
			}
			}
			}
			}
			};

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

			//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;
			}
			}

			if (outboundOrder.OrderType == 240) // 盘点出库
			else
			{
			// 盘点出库特殊处理逻辑
			}
			foreach (var stockDetail in stockInfoDetails)
			{
			var matchingOrderDetails = outboundOrderDetails
			.Where(x => x.MaterielCode == stockDetail.MaterielCode &&
			x.BatchNo == stockDetail.BatchNo)
			.ToList();

			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch
			if (matchingOrderDetails.Count == 0)
			{
			continue;
			}

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

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

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

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

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

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

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

			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

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

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

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

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

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

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

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

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

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

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

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

			// 调拨出库
			if (outboundOrder.OrderType == 4)
			{
			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();
			if (outboundOrderDetail != null)
			{
			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
			{
			@@ -1788,7 +2394,9 @@
			_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

			// 更新库存状态回库单

			AddRetrueOrder(stockInfo, inboundOrder);


			// 区分单据数据来源更新货位状态
			if (inboundOrder.System == null)
			@@ -1847,6 +2455,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());
			@@ -1873,6 +2557,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)
			@@ -2137,8 +2861,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("建立回库单时，未找到该库存信息");
			@@ -2199,10 +2922,99 @@
			}
			}


			}

			//低温、药水回库单
			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();
			}
			}
			}
			}


			}

			//成品回库单
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, List<Dt_NewOutboundOrderDetail> outboundOrderDetails)
			{
			List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id)
			@@ -2212,202 +3024,219 @@
			{
			throw new Exception("建立回库单时，未找到该库存信息");
			}

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

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

			if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
			{
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
			x.LPNNo == stockInfo.PalletCode &&
			x.LocationCode == stockInfo.LocationCode &&
			x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());

			if (returnOrder == null)
			if (outboundOrder.OrderType == OrderTypeEnum.反拣出库单.ObjToInt())
			{
			throw new Exception("反拣出库后，未找到对应反拣回库单信息");
			}
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
			x.LPNNo == stockInfo.PalletCode &&
			x.LocationCode == stockInfo.LocationCode &&
			x.OrderStatus == InOrderStatusEnum.未开始.ObjToInt());

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

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

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

			_unitOfWorkManage.BeginTran();

			try
			{
			if (remainingQuantity > 0)
			if (returnOrder == null)
			{
			// 为当前批次创建返库单
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			throw new Exception("反拣出库后，未找到对应反拣回库单信息");
			}
			foreach (var outDetail in outboundOrderDetails)
			{
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
			if (matchedStockDetail == null)
			{
			MaterielCode = matchedStockDetail.MaterielCode,
			MaterielName = matchedStockDetail.MaterielName,
			BatchNo = matchedStockDetail.BatchNo,
			OrderQuantity = remainingQuantity,
			ReceiptQuantity = remainingQuantity,
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = matchedStockDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			};
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
			x.MaterielCode == outDetail.MaterielCode);

			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			returnOrder.LocationCode = stockInfo.LocationCode;
			if (matchedStockDetail == null)
			{
			throw new Exception($"未找到匹配的库存明细信息，物料:{outDetail.MaterielCode}, 批次:{outDetail.BatchNo}");
			}
			}

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

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

			// 只减去单据明细中的数量
			//matchedStockDetail.OutboundQuantity = 0;
			//matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
			//matchedStockDetail.OrderNo = returnOrder.OrderNo;
			// 更新匹配的明细
			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
			}

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

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

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

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

			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			var outboundDetail = groupeDetail.First();
			if (outboundDetail.MaterielCode == detail.MaterielCode)
			{
			decimal totalOrderQuantity = groupeDetail.Sum(x => x.OrderQuantity);
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
			if (matchedStockDetail == null)
			{
			otherReturnOrder.LocationCode = stockInfo.LocationCode;
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode);

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

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

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

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

			}
			if (remainingQuantity < 0 && matchedStockDetail.StockQuantity < matchedStockDetail.OutboundQuantity)
			{
			throw new Exception($"出库数量 {outboundDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
			}
			processedStockDetails.Add(matchedStockDetail);


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

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

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

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

			}
			else
			{
			decimal totalOtherQuantity = otherBatchDetails.Sum(x => x.StockQuantity);
			foreach (var item in returnOrders)
			{
			item.OrderQuantity = totalOrderQuantity;
			item.ReceiptQuantity = totalOrderQuantity;
			item.Remark = $"多批次返库，共{otherBatchDetails.Count}个批次";
			}
			}

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

			// 其他批次全部返库，库存清零
			otherDetail.StockQuantity = 0;
			otherDetail.OutboundQuantity = 0;
			otherDetail.OrderNo = otherReturnOrder.OrderNo;
			// 添加返库单
			if (returnOrders.Any())
			{
			_returnOrderRepository.AddData(returnOrders);
			}

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

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

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

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

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

			_returnOrderRepository.AddData(otherReturnOrder);
			}
			}

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

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

			}

			/// <summary>
			/// 单据明细出库完成回调ERP(表单提交)
			/// </summary>
			@@ -2685,127 +3514,204 @@
			}
			}

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

			// 尝试不同的打印方法
			for (int retryCount = 0; retryCount < maxRetryCount; retryCount++)
			if (string.IsNullOrEmpty(printerName))
			{
			try
			{
			Console.WriteLine($"尝试打印 (方法 {retryCount + 1}/{maxRetryCount}): {fullPath}");

			switch (retryCount)
			{
			case 0:
			// 方法1: 使用原始打印命令
			PrintUsingRawCommand(fullPath, printerName);
			break;
			case 1:
			// 方法3: 直接使用Spire.PDF但简化设置
			PrintUsingSpireSimple(fullPath, printerName);
			break;
			case 2:
			// 方法3: 直接使用Spire.PDF但简化设置
			PrintUsingSpireSimple(fullPath, printerName);
			break;
			}

			Console.WriteLine("打印任务发送成功");
			return;
			}
			catch (Exception ex)
			{
			Console.WriteLine($"打印方法 {retryCount + 1} 失败: {ex.Message}");

			if (retryCount < maxRetryCount - 1)
			{
			Thread.Sleep(retryDelayMs);
			}
			}
			// 如果没有配置，使用系统默认打印机
			printerName = GetDefaultPrinterUbuntu();
			}

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

			/// <summary>
			/// 使用原始打印命令
			/// 获取 Ubuntu 默认打印机
			/// </summary>
			private void PrintUsingRawCommand(string filePath, string printerName)
			private string GetDefaultPrinterUbuntu()
			{
			try
			{
			// 方法1: 使用Process直接打印
			var process = new System.Diagnostics.Process();
			process.StartInfo.FileName = filePath;
			process.StartInfo.Verb = "print";
			process.StartInfo.CreateNoWindow = true;
			process.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
			process.Start();

			// 等待一段时间让打印任务提交
			if (!process.WaitForExit(5000))
			ProcessStartInfo psi = new ProcessStartInfo
			{
			Console.WriteLine("打印进程未及时退出，但任务可能已提交");
			FileName = "lpstat",
			Arguments = "-d",
			UseShellExecute = false,
			CreateNoWindow = true,
			RedirectStandardOutput = true
			};

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

			// 解析默认打印机名称，例如: "system default destination: LenovoPrinter"
			if (output.Contains(":"))
			{
			return output.Split(':')[1].Trim();
			}
			return "LenovoPrinter"; // 默认回退
			}
			}
			catch
			{
			// 如果上述方法失败，尝试使用rundll32
			try
			{
			var args = $@"/c rundll32.exe C:\Windows\System32\shimgvw.dll,ImageView_PrintTo ""{filePath}"" ""{printerName}""";
			System.Diagnostics.Process.Start("cmd.exe", args);
			}
			catch
			{
			throw;
			}
			return "LenovoPrinter";
			}
			}

			/// <summary>
			/// 使用Spire.PDF但简化设置
			/// Ubuntu 打印实现
			/// </summary>
			private void PrintUsingSpireSimple(string filePath, string printerName)
			{
			using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
			{
			// 使用最小配置加载文件
			pdf.LoadFromFile(filePath);

			// 设置基本打印机信息
			if (!string.IsNullOrEmpty(printerName))
			{
			pdf.PrintSettings.PrinterName = printerName;
			}

			// 直接打印，不检查
			pdf.Print();
			}
			}

			/// <summary>
			/// 检查文件是否可访问
			/// </summary>
			private bool IsFileAccessible(string filePath)
			private void PrintUsingUbuntuPrinter(string filePath, string printerName)
			{
			try
			{
			using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
			PrintWithLpr(filePath, printerName);

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

			/// <summary>
			/// 使用 lpr 命令打印
			/// </summary>
			private void PrintWithLpr(string filePath, string printerName)
			{
			Console.WriteLine($"📄 正在打印到 {printerName}: {Path.GetFileName(filePath)}");

			// 使用 lp 命令，添加 -o raw 选项
			string command = $"lp -d {printerName} -o raw \"{filePath}\"";

			ExecuteShellCommand(command);
			}
			/// <summary>
			/// 执行 Shell 命令
			/// </summary>
			private void ExecuteShellCommand(string command)
			{
			ProcessStartInfo psi = new ProcessStartInfo
			{
			FileName = "/bin/bash",
			Arguments = $"-c \"{command.Replace("\"", "\\\"")}\"",
			UseShellExecute = false,
			CreateNoWindow = true,
			RedirectStandardOutput = true,
			RedirectStandardError = true
			};

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

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


			/// <summary>
			/// 只使用配置的打印机进行打印
			/// </summary>
			/// <summary>
			/// Ubuntu 打印方法 - 使用 lpr 命令
			/// </summary>
			private void PrintUsingConfiguredPrinter(string filePath, string printerName)
			{
			try
			{
			// 1. 检查打印机是否在线
			if (!IsPrinterAvailableUbuntu(printerName))
			{
			throw new InvalidOperationException($"打印机 '{printerName}' 不可用或未找到");
			}

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

			// 2. 使用 lpr 命令打印
			ProcessStartInfo psi = new ProcessStartInfo
			{
			FileName = "lpr",
			Arguments = $"-P {printerName} \"{filePath}\"",
			UseShellExecute = false,
			CreateNoWindow = true,
			RedirectStandardOutput = true,
			RedirectStandardError = true
			};

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

			if (process.ExitCode == 0)
			{
			Console.WriteLine($"✓ 打印任务已提交到 {printerName}");
			}
			else
			{
			throw new InvalidOperationException($"打印失败: {error}");
			}
			}
			}
			catch (Exception ex)
			{
			Console.WriteLine($"✗ 打印失败: {ex.Message}");
			throw;
			}
			}

			/// <summary>
			/// Ubuntu 检查打印机可用性
			/// </summary>
			private bool IsPrinterAvailableUbuntu(string printerName)
			{
			try
			{
			ProcessStartInfo psi = new ProcessStartInfo
			{
			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
			@@ -2813,25 +3719,6 @@
			return false;
			}
			}

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


			/// <summary>
			/// 盘点出库完成
			/// </summary>
			@@ -2896,6 +3783,97 @@
			}
			return content;
			}

			/// <summary>
			/// SMOM盘点单完成
			/// </summary>
			/// <param name="task"></param>
			/// <param name="stockInfo"></param>
			/// <param name="locationInfo"></param>
			/// <returns></returns>
			public WebResponseContent SMOMOutInventoryCompleted(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			//获取对应盘点单
			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}不存在");
			}
			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_TakeStockOrderDetailCP? 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}盘点明细状态不正确");
			}
			takeStockOrder.Details.ForEach(x =>
			{
			x.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.Lock.ObjToInt();
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			{
			MaterielCode = stockInfo.Details.FirstOrDefault()?.MaterielCode,
			MaterielName = stockInfo.Details.FirstOrDefault()?.MaterielName,
			BatchNo = stockInfo.Details.FirstOrDefault()?.BatchNo,
			OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			ReceiptQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = stockInfo.Details.FirstOrDefault()?.LinId,
			LocationCode = stockInfo.LocationCode,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.盘点回库单.ObjToInt(),
			System = "WMS"
			};

			_unitOfWorkManage.BeginTran();
			//货位变动记录
			_basicService.LocationInfoService.UpdateData(locationInfo);
			_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.人工完成);
			_unitOfWorkManage.CommitTran();
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			}
			#endregion
			#endregion