MeiRuiAn/JiAnLiKu.git

			@@ -108,6 +108,7 @@
			private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
			private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
			private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
			private readonly IStockInfoDetailCPRepository _stockInfoDetailCPRepository;
			private readonly IReturnOrderRepository _returnOrderRepository;
			private readonly IProductionRepository _productionRepository;
			private readonly IInboundRepository _inboundRepository;
			@@ -115,7 +116,7 @@
			private readonly ITakeStockOrderDetailCPRepository _takeStockOrderDetailCPRepository;
			public ITaskRepository Repository => BaseDal;

			public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository) : base(BaseDal)
			public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository, IStockInfoDetailCPRepository stockInfoDetailCPRepository) : base(BaseDal)
			{
			_mapper = mapper;
			_stockRepository = stockRepository;
			@@ -143,6 +144,7 @@
			_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
			_takeStockOrderCPRepository = takeStockOrderCPRepository;
			_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
			_stockInfoDetailCPRepository = stockInfoDetailCPRepository;
			}

			public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
			@@ -559,9 +561,9 @@
			return WebResponseContent.Instance.Error("未找到入库单信息");
			}
			var allBoxCodesForDetail = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
			.Where(x => x.StockDetailId == dt_StockInfo.Details.FirstOrDefault().Id)
			.Select(x => x.BoxCode)
			.ToList();
			.Where(x => dt_StockInfo.Details.Select(d => d.Id).Contains(x.StockDetailId))
			.Select(x => x.BoxCode)
			.ToList();

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

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

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

			// 更新成品库存明细状态
			@@ -988,7 +982,7 @@
			// 单据数量全部上架完成，处理WMS回传
			if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
			{
			if(inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt())
			if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt())
			{
			bool allCompleted = inboundOrder.Details.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
			if (allCompleted)
			@@ -1139,7 +1133,7 @@
			int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
			{
			// 更新入库单明细状态
			UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
			UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
			///更新库存状态
			stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
			// 更新库存明细状态
			@@ -1162,21 +1156,21 @@
			AddRecords(task, stockInfo, locationInfo, lastStatus);

			// 更新入库单
			UpdateInboundOrder(inboundOrder, inboundOrderDetail);
			UpdateInboundOrder(inboundOrder, inboundOrderDetail);

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

			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			@@ -1938,7 +1932,7 @@
			return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
			}
			}
			else if(warehouse.WarehouseCode.Contains("DW") \|\| warehouse.WarehouseCode.Contains("YS"))
			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)
			@@ -2605,7 +2599,7 @@
			List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id).ToList();

			Dt_ReturnOrder? lastReturnOrder = null;
			Dt_ReturnOrder? lastReturnOrder = null;
			foreach (var stockInfoDetail in stockInfoDetails)
			{
			if (stockInfoDetail == null)
			@@ -2654,7 +2648,7 @@
			System = "WMS",
			Remark = stockInfoDetail.BatchNo
			};
			if(lastReturnOrder != null)
			if (lastReturnOrder != null)
			{
			lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
			_returnOrderRepository.UpdateData(lastReturnOrder);
			@@ -2664,7 +2658,7 @@
			returnOrder.LocationCode = stockInfo.LocationCode;
			}
			_unitOfWorkManage.BeginTran();
			if(lastReturnOrder == null)
			if (lastReturnOrder == null)
			{
			_returnOrderRepository.AddData(returnOrder);
			lastReturnOrder = returnOrder;
			@@ -2757,7 +2751,7 @@
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
			if (matchedStockDetail == null)
			{
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outboundDetail.MaterielCode);
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode);

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

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

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

			PrintUsingSpireSimple(fullPath, printerName);
			if (string.IsNullOrEmpty(printerName))
			{
			Console.WriteLine("✗ 打印失败：未配置打印机名称");
			return;
			}


			Console.WriteLine("所有打印方法都失败");
			// 直接使用配置的打印机名称，不进行任何转换
			PrintUsingConfiguredPrinter(fullPath, printerName.Trim());
			}


			private void PrintUsingSpireSimple(string filePath, string printerName)
			/// <summary>
			/// 只使用配置的打印机进行打印
			/// </summary>
			private void PrintUsingConfiguredPrinter(string filePath, string printerName)
			{
			try
			{
			// 1. 首先验证打印机是否存在
			if (!IsPrinterInstalled(printerName))
			{
			Console.WriteLine($"✗ 打印机 '{printerName}' 未安装或不存在");
			Console.WriteLine("\n系统已安装的打印机列表:");
			foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
			{
			Console.WriteLine($" - {printer}");
			}
			throw new InvalidOperationException($"打印机 '{printerName}' 未安装");
			}

			// 3. 使用 Spire.PDF 打印
			using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
			{
			// 加载文件
			pdf.LoadFromFile(filePath);

			// 获取实际的打印机名称
			string actualPrinterName = GetActualPrinterName(printerName);
			// 设置打印机名称（只使用配置的名称）
			pdf.PrintSettings.PrinterName = printerName;

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

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

			// 直接打印
			pdf.Print();
			Console.WriteLine("✓ 打印任务已提交成功");
			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}");
			}

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