MeiRuiAn/JiAnLiKu.git

			@@ -111,10 +111,11 @@
			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) : base(BaseDal)
			{
			_mapper = mapper;
			_stockRepository = stockRepository;
			@@ -140,6 +141,8 @@
			_productionRepository = productionRepository;
			_inboundRepository = inboundRepository;
			_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
			_takeStockOrderCPRepository = takeStockOrderCPRepository;
			_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
			}

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

			if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() \|\| task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
			{
			return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
			int lastStatus = dt_LocationInfo.LocationStatus;
			dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == dt_StockInfo.PalletCode);
			if (returnOrder == null)
			{
			return WebResponseContent.Instance.Error("未找到回库单信息");
			}
			return SurplusReturnInbound(task, dt_StockInfo, dt_LocationInfo, lastStatus, returnOrder);
			}
			// 1. 获取入库单信息
			Dt_InboundOrder? inboundOrder = null;
			@@ -680,6 +690,10 @@
			if (allCompleted)
			{
			inboundOrder.OrderStatus = InboundStatusEnum.入库完成.ObjToInt();
			foreach (var item in inboundOrderDetails)
			{
			BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
			}
			}
			else
			{
			@@ -738,45 +752,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 +829,54 @@
			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 ?? "未提供错误信息"}");
			}
			}
			}

			_unitOfWorkManage.CommitTran();
			@@ -1468,7 +1501,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 +1530,152 @@
			{
			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();
			List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
			.Where(x => x.OrderId == outboundOrder.Id &&
			x.LocationName == stockInfo.LocationCode &&
			x.LPNNo == stockInfo.PalletCode)
			.ToList();

			// item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
			//}
			if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			{
			throw new Exception($"未找到托盘 {stockInfo.PalletCode} 在货位 {stockInfo.LocationCode} 上的出库单明细");
			}

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

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

			foreach (var item in stockInfo.Details)
			foreach (var stockDetail in stockInfoDetails)
			{
			if (outboundOrderDetails == null) continue;
			var matchingOrderDetails = outboundOrderDetails
			.Where(x => x.MaterielCode == stockDetail.MaterielCode &&
			x.BatchNo == stockDetail.BatchNo)
			.ToList();

			outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;

			if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
			if (matchingOrderDetails.Count == 0)
			{
			outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			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();
			///更新出库单
			_outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
			// 更新出库订单详情
			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

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

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

			// 添加状态变更记录
			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");
			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


			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);
			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

			if (outStockLockInfo.Count == 0) throw new Exception("未找到库存信息");
			//采购出库
			if (outboundOrder.OrderType == 1)
			// 区分单据数据来源更新货位状态
			if (outboundOrder.System == null)
			{
			var passBack = new HouseoutboundPassBack
			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()))
			{
			ApiType = "ShippingOrderController",
			Method = "AsrsOutboundSO",
			Parameters = new List<HouseoutboundPassBack.datas>
			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
			{
			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 = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
			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,98 +1686,104 @@
			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
			// 调拨出库
			if (outboundOrder.OrderType == 2)
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			var allocate = new InventoryAllocate
			{
			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 = 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()
			}
			}
			}
			}
			};

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

			// 调用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)
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
			}
			}
			else
			@@ -2202,7 +2293,7 @@
			}

			//成品回库单
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
			private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, List<Dt_NewOutboundOrderDetail> outboundOrderDetails)
			{
			List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id)
			@@ -2212,202 +2303,218 @@
			{
			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,
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
			x.MaterielCode == outDetail.MaterielCode);

			if (matchedStockDetail == null)
			{
			throw new Exception($"未找到匹配的库存明细信息，物料:{outDetail.MaterielCode}, 批次:{outDetail.BatchNo}");
			}
			}
			// 只减去单据明细中的数量
			matchedStockDetail.OutboundQuantity = 0;
			matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
			matchedStockDetail.OrderNo = returnOrder.OrderNo;
			// 更新匹配的明细
			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
			}


			// 更新库存状态
			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 groupeDetail in groupedDetails)
			{
			var outboundDetail = groupeDetail.First();
			decimal totalOrderQuantity = groupeDetail.Sum(x => x.OrderQuantity);
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
			if (matchedStockDetail == null)
			{
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
			x.MaterielCode == outboundDetail.MaterielCode);

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

			if (remainingQuantity > 0)
			{
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			{
			MaterielCode = matchedStockDetail.MaterielCode,
			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);

			// 更新当前批次明细：只保留出库数量，其余返库
			matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
			matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
			//matchedStockDetail.OrderNo = returnOrder.OrderNo;
			}
			else if (remainingQuantity == 0)
			{
			// 当前批次正好出完
			matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
			if (matchedStockDetail.StockQuantity == totalOrderQuantity)
			{
			_stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(
			matchedStockDetail, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			}
			else
			{
			matchedStockDetail.StockQuantity = 0;
			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
			}
			}
			else
			{
			throw new Exception($"出库数量 {outboundDetail.OrderQuantity} 大于库存数量 {matchedStockDetail.StockQuantity}");
			}
			processedStockDetails.Add(matchedStockDetail);
			}

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

			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 = matchedStockDetail.LinId,
			LinId = firstOtherDetail.LinId,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.余料回库单.ObjToInt(),
			System = "WMS"
			System = "WMS",
			Remark = $"多批次返库，共{otherBatchDetails.Count}个批次"
			};

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


			returnOrders.Add(otherReturnOrder);
			}

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

			// 添加返库单
			if (returnOrders.Any())
			{
			_returnOrderRepository.AddData(returnOrders);
			}

			// 更新库存主表状态
			decimal returnQuantity = totalStockQuantity - totalOutboundQuantity;
			if (returnQuantity == 0)
			{
			if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
			{
			returnOrder.LocationCode = stockInfo.LocationCode;
			Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
			dt_LocationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			_basicRepository.LocationInfoRepository.UpdateData(dt_LocationInfo);
			}

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

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

			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);

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

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

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

			_returnOrderRepository.AddData(otherReturnOrder);

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

			_stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
			}
			BaseDal.Db.Deleteable(item.StockDetails).ExecuteCommand();
			}

			// 更新库存主表状态
			}
			else if (returnQuantity > 0)
			{
			// 有余料返库
			stockInfo.LocationCode = "";
			stockInfo.StockStatus = StockStatusEmun.余料退库.ObjToInt();
			stockInfo.Remark = "余料退库";
			stockInfo.Remark = $"余料退库，共{returnOrders.Count}个返库单";
			_stockService.StockInfoService.Repository.UpdateData(stockInfo);
			}
			else 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;
			}
			_unitOfWorkManage.CommitTran();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}

			}

			/// <summary>
			/// 单据明细出库完成回调ERP(表单提交)
			/// </summary>
			@@ -2699,46 +2806,169 @@
			// 获取打印机名称
			string printerName = AppSettings.app("PrinterName");

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

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

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


			private void PrintUsingSpireSimple(string filePath, string printerName)
			{
			try
			{
			using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
			{
			// 加载文件
			pdf.LoadFromFile(filePath);

			// 获取实际的打印机名称
			string actualPrinterName = GetActualPrinterName(printerName);

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

			// 如果找不到实际打印机，使用默认打印机
			if (!string.IsNullOrEmpty(actualPrinterName) && IsPrinterInstalled(actualPrinterName))
			{
			pdf.PrintSettings.PrinterName = actualPrinterName;
			Console.WriteLine($"✓ 已设置打印机: {actualPrinterName}");
			}
			else
			{
			Console.WriteLine($"⚠️ 打印机 '{actualPrinterName}' 未找到，使用默认打印机");
			}

			// 直接打印
			pdf.Print();
			Console.WriteLine("✓ 打印任务已提交成功");
			}
			}
			catch (Exception ex)
			{
			Console.WriteLine($"✗ Spire.PDF打印失败: {ex.Message}");

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

			throw;
			}
			}

			/// <summary>
			/// 从配置的友好名称获取实际的打印机名称
			/// </summary>
			private string GetActualPrinterName(string displayName)
			{
			if (string.IsNullOrEmpty(displayName))
			return string.Empty;

			// 如果配置的是 "192.168.99.3 上的 Lenovo M7605D"
			if (displayName.Contains("192.168.99.3 上的 Lenovo M7605D"))
			{
			// 在系统中查找实际的打印机名称
			return FindActualPrinterForIP("192.168.99.3");
			}

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

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

			// 默认返回原名称
			return displayName;
			}

			/// <summary>
			/// 查找IP地址对应的实际打印机名称
			/// </summary>
			private string FindActualPrinterForIP(string ipAddress)
			{
			try
			{
			// 获取所有打印机
			var allPrinters = new List<string>();
			foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
			{
			allPrinters.Add(printer);
			}

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

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

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


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

			return string.Empty;
			}
			catch (Exception ex)
			{
			Console.WriteLine($"查找打印机失败: {ex.Message}");
			return string.Empty;
			}
			}

			/// <summary>
			/// 检查打印机是否已安装
			/// </summary>
			private bool IsPrinterInstalled(string printerName)
			{
			try
			{
			foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
			{
			if (printer.Equals(printerName, StringComparison.OrdinalIgnoreCase))
			{
			return true;
			}
			}
			return false;
			}
			catch
			{
			return false;
			}
			}
			/// <summary>
			/// 使用原始打印命令
			/// </summary>
			@@ -2746,55 +2976,28 @@
			{
			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();
			var processStartInfo = new System.Diagnostics.ProcessStartInfo
			{
			FileName = filePath,
			Verb = "print", // 使用"print"动词
			UseShellExecute = true, // 关键：启用Shell执行
			CreateNoWindow = true,
			WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
			};

			// 等待一段时间让打印任务提交
			if (!process.WaitForExit(5000))
			{
			Console.WriteLine("打印进程未及时退出，但任务可能已提交");
			}
			// 设置打印机（可选，系统通常会使用默认打印机）
			// processStartInfo.Arguments = $"/t \"{filePath}\" \"{printerName}\"";

			System.Diagnostics.Process.Start(processStartInfo);
			}
			catch
			catch (Exception ex)
			{
			// 如果上述方法失败，尝试使用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;
			}
			Console.WriteLine($"打印失败: {ex.Message}");
			// 可以尝试其他方法
			//TryAlternativePrintMethod(filePath, printerName);
			}
			}

			/// <summary>
			/// 使用Spire.PDF但简化设置
			/// </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>
			/// 检查文件是否可访问
			@@ -2896,6 +3099,93 @@
			}
			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}盘点明细状态不正确");
			}
			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.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);
			_takeStockOrderDetailCPRepository.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