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,6 +125,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 +133,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 +161,7 @@
			_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
			_takeStockOrderCPRepository = takeStockOrderCPRepository;
			_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
			_stockInfoDetailCPRepository = stockInfoDetailCPRepository;
			}

			public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
			@@ -559,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>();
			@@ -638,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>();
			@@ -707,7 +718,7 @@
			// 更新成品入库明细状态
			if (cpInboundDetails.Any())
			{
			BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
			BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
			}

			// 更新成品库存明细状态
			@@ -726,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)
			@@ -796,9 +808,10 @@
			// 判断Success的值
			if (!response.Success)
			{
			WriteLog.Write_Log("API", "SMOM立库回传给WMS", "请求失败", new { 请求报文 = houseInboundPassBack, 接收报文 = response });
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}

			WriteLog.Write_Log("API", "SMOM立库入库回传WMS", "请求成功", new { 请求报文 = houseInboundPassBack, 接收报文 = response });
			}

			}
			@@ -874,11 +887,83 @@
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			if (!response.Success)
			{
			WriteLog.Write_Log("API", "SMOM调拨入库数量回传WMS", "请求失败", new { 请求报文 = inventoryAllocate, 接收报文 = response });
			throw new Exception($"操作失败：{response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM调拨入库数量回传WMS", "请求成功", new { 请求报文 = inventoryAllocate, 接收报文 = response });

			}
			}
			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)
			{
			WriteLog.Write_Log("API", "SMOM立库入库数量回传WMS", "请求失败", new { 请求报文 = houseSyncretism, 接收报文 = response });
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM立库入库数量回传WMS", "请求成功", new { 请求报文 = houseSyncretism, 接收报文 = response });

			}

			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			@@ -988,7 +1073,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)
			@@ -1002,6 +1087,8 @@
			}
			if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
			{
			//SendInboundInfoToWMS(task, inboundOrder, stockInfo);
			SendInboundInfoToWMS(task, inboundOrder, dt_StockInfo);

			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
			@@ -1139,7 +1226,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 +1249,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();
			@@ -1347,7 +1434,7 @@

			_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(
			stockInfo, stockInfo.Details,
			stockInfo.Details.Sum(x => x.StockQuantity),
			0,
			stockInfo.Details.Sum(x => x.StockQuantity),
			StockChangeType.Inbound, task.TaskNum);
			}
			@@ -1422,11 +1509,13 @@
			// 判断Success的值
			if (response.Success)
			{
			WriteLog.Write_Log("API", "SMOM立库入库回传WMS", "请求成功", new { 请求报文 = houseInboundPassBack, 接收报文 = response });
			// 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
			return WebResponseContent.Instance.OK();
			}
			else
			{
			WriteLog.Write_Log("API", "SMOM立库入库回传WMS", "请求失败", new { 请求报文 = houseInboundPassBack, 接收报文 = response });
			// 如果Success为false，抛出异常并包含错误信息
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			@@ -1447,9 +1536,9 @@
			Parameters = new List<HouseBackboundPassBack.backdata>
			{
			new HouseBackboundPassBack.backdata
			{
			{
			Value= new List<backdata.backdata1>
			{
			{
			new backdata.backdata1
			{
			OrderType = returnOrder.OrderType,
			@@ -1465,7 +1554,7 @@
			WarehouseCode = returnOrder.WarehouseCode,
			System = returnOrder.System,
			}
			}
			}
			}
			}
			};
			@@ -1481,11 +1570,16 @@
			// 判断Success的值
			if (response.Success)
			{
			WriteLog.Write_Log("API", "取消发货后立库反拣入库回传WMS", "请求成功", new { 请求报文 = houseReturnOrders, 接收报文 = response });

			// 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
			return WebResponseContent.Instance.OK();

			}
			else
			{
			WriteLog.Write_Log("API", "取消发货后立库反拣入库回传WMS", "请求失败", new { 请求报文 = houseReturnOrders, 接收报文 = response });

			// 如果Success为false，抛出异常并包含错误信息
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			@@ -1550,33 +1644,33 @@
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<InventoryAllocate.Allocate>
			{
			new InventoryAllocate.Allocate
			{
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			{
			No = inboundOrder.OrderNo,
			//InWarehouse = task.Roadway,
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			// 遍历所有库存明细，添加到 DetailList
			DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
			new InventoryAllocate.Allocate
			{
			LinId = d.Details.FirstOrDefault()?.LinId?? "",
			MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
			OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
			BatchNo = d.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode
			}).ToList()
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			{
			No = inboundOrder.OrderNo,
			//InWarehouse = task.Roadway,
			TransactionCode = inboundOrder.TransactionCode,
			InoutType = inboundOrder.OrderType,
			OrderType = inboundOrder.InoutType,
			// 遍历所有库存明细，添加到 DetailList
			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.BatchNo,
			LPNNo = d.PalletCode,
			FinishQty = d.Details.FirstOrDefault().StockQuantity,
			LocationName = d.LocationCode
			}).ToList()
			}
			}
			}
			}
			}
			}
			}
			};

			var authResult = AuthenticateWithWMS();
			@@ -1589,6 +1683,8 @@
			};

			HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			WriteLog.Write_Log("API", "调拨入库数量回传WMS", "请求", new { 请求报文 = inventoryAllocate, 接收报文 = inventoryAllocate });

			}
			}

			@@ -1617,10 +1713,10 @@
			{
			ApiType = "AuthenticationController",
			Parameters = new List<Parameter>
			{
			new Parameter { Value = "LK-Admin" },
			new Parameter { Value = "LK-Admin" }
			},
			{
			new Parameter { Value = "LK-Admin" },
			new Parameter { Value = "LK-Admin" }
			},
			Method = "Login",
			};

			@@ -1692,245 +1788,500 @@
			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 stockDetail in stockInfoDetails)
			if (outboundOrderDetails == null \|\| outboundOrderDetails.Count == 0)
			{
			var matchingOrderDetails = outboundOrderDetails
			.Where(x => x.MaterielCode == stockDetail.MaterielCode &&
			x.BatchNo == stockDetail.BatchNo)
			.ToList();

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

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

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

			if (orderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
			if (matchingOrderDetails.Count == 0)
			{
			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()))
			// 计算需要分配的数量
			decimal remainingStock = stockDetail.OutboundQuantity;

			foreach (var orderDetail in matchingOrderDetails)
			{
			DownloadReport(path, savePath, outboundOrderDetails.First().Id);
			}
			}
			if (remainingStock <= 0) break;

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

			if (outStockLockInfoList.Count == 0)
			throw new Exception($"订单 {outboundOrder.OrderNo} 托盘 {stockInfo.PalletCode} 未找到库存锁定信息");
			// 计算本次可以分配的数量
			decimal availableOrderQty = orderDetail.OrderQuantity - orderDetail.OverOutQuantity;
			decimal allocateQty = Math.Min(remainingStock, availableOrderQty);

			// 采购出库
			if (outboundOrder.OrderType == 1)
			{
			var passBack = new HouseoutboundPassBack
			if (allocateQty > 0)
			{
			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,
			MaterielCode = d.MaterielCode?? "",
			OrderQuantity = d.OrderQuantity,
			BatchNo = d.BatchNo,
			FinishQty = d.OrderQuantity,
			LocationName = d.LocationCode
			})
			.ToList()
			}
			}
			}
			}
			};
			orderDetail.OverOutQuantity += allocateQty;
			remainingStock -= allocateQty;

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

			// 调拨出库
			if (outboundOrder.OrderType == 2)
			{
			var allocate = new InventoryAllocate
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			{
			new Allocate
			{
			Value = new List<Allocate.data1>
			}
			// 更新订单状态
			if (outboundOrder.Details.Count == overCount)
			{
			new Allocate.data1
			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)
			{
			No = outboundOrder.OrderNo,
			InWarehouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			ActiveType = 2,
			DetailList = outStockLockInfoList.Select(item =>
			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>
			{
			return new Allocate.data1.Inventory
			new HouseoutboundPassBack.datas.data1
			{
			LinId = item.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = item.MaterielCode,
			OrderQuantity = item.OrderQuantity,
			BatchNo = item.BatchNo,
			FinishQty = item.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			}
			}
			}
			}
			};
			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)
			{
			allocate.Context = new Dictionary<string, string>
			//调用SMOM接口...
			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			passBack.Context = new Dictionary<string, string>
			{
			{ "Ticket", authResult.Ticket },
			{ "InvOrgId", authResult.InvOrgId }
			};
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			if (!response.Success)
			var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
			if (!response.Success)
			{
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求失败", new { 请求报文 = passBack, 接收报文 = response });

			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求成功", new { 请求报文 = passBack, 接收报文 = response });
			}
			}

			// 调拨出库
			if (outboundOrder.OrderType == 4)
			{
			var allocate = new InventoryAllocate
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			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)
			{
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求失败", new { 请求报文 = allocate, 接收报文 = response });

			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求成功", new { 请求报文 = allocate, 接收报文 = response });

			}
			}
			}

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

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

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

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

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

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

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

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

			// 检查是否完成
			if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
			{
			orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			}
			}
			}
			}

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

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

			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);


			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);

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

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

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

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

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

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

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

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

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

			// 采购出库
			if (outboundOrder.OrderType == 1)
			{
			var passBack = new HouseoutboundPassBack
			{
			ApiType = "ShippingOrderController",
			Method = "AsrsOutboundSO",
			Parameters = new List<HouseoutboundPassBack.datas>
			{
			new HouseoutboundPassBack.datas
			{
			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)
			{
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求失败", new { 请求报文 = passBack, 接收报文 = response });

			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求成功", new { 请求报文 = passBack, 接收报文 = response });

			}
			}

			// 调拨出库
			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)
			{
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求失败", new { 请求报文 = allocate, 接收报文 = response });

			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			WriteLog.Write_Log("API", "SMOM立库库数量回传WMS", "请求成功", new { 请求报文 = allocate, 接收报文 = response });

			}
			}
			}

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

			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}
			}
			}
			catch (Exception ex)
			@@ -1938,7 +2289,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)
			@@ -1947,31 +2298,36 @@

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

			Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
			foreach(var detail in stockInfo.Details)
			List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
			foreach (var detail in stockInfo.Details)
			{
			outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo)
			.First();
			if(outboundOrderDetail != null) break;
			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);

			}
			}

			if (outboundOrderDetail.LocationName != null && outboundOrderDetail.LocationName != "")
			for (var i = 0; i < outboundOrderDetails.Count; i++)
			{
			foreach(var detail in stockInfo.Details)
			{
			outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
			.Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo && x.LocationName == stockInfo.LocationCode)
			.First();
			if (outboundOrderDetail != null) break;
			}
			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 (outboundOrderDetail == null) return WebResponseContent.Instance.Error("未找到出库单信息");
			DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetail);
			if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("未找到出库单信息");
			DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
			// 3. 执行核心出库逻辑
			return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetail, inboundOrder);
			return DWANDYSExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
			}
			else
			{
			@@ -2066,15 +2422,10 @@
			_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

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


			AddRetrueOrder(stockInfo, inboundOrder);


			// 区分单据数据来源更新货位状态
			if (inboundOrder.System == null)
			{
			@@ -2132,6 +2483,83 @@
			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());
			@@ -2161,36 +2589,41 @@
			}

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

			foreach (var item in stockInfo.Details)
			List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
			foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
			{
			if (inboundOrderDetail == null) continue;
			string BatchNo = newOutboundOrderDetail.BatchNo;
			//inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);

			if(inboundOrderDetail.BatchNo == item.BatchNo)
			foreach (var item in stockInfo.Details)
			{
			inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;
			if (newOutboundOrderDetail == null) continue;

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

			if (newOutboundOrderDetail.BatchNo == item.BatchNo)
			{
			inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			}
			else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			{
			inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.出库中.ObjToInt();
			inboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
			newOutboundOrderDetail.OverOutQuantity += item.OutboundQuantity;

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

			}

			private void DeleteAndMoveIntoHtStockStatus(Dt_StockInfo stockInfo)
			@@ -2221,6 +2654,12 @@
			StockChangeType.Outbound.ObjToInt(),
			stockInfo.Details.FirstOrDefault()?.OrderNo ?? "",
			task.TaskNum);

			_recordService.StockQuantityChangeRecordService.NEWAddStockChangeRecord(
			stockInfo, stockInfo.Details,
			stockInfo.Details.Sum(x => x.StockQuantity),
			stockInfo.Details.Sum(x => x.OutboundQuantity),
			StockChangeType.Outbound, task.TaskNum);
			}

			private void ProcessNormalOutbound(Dt_Task task, Dt_StockInfo stockInfo,
			@@ -2399,48 +2838,50 @@
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			{
			new Allocate
			{
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			new Allocate
			{
			No = outboundOrder.OrderNo,
			InWarehouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfos.Select(item =>
			Value = new List<Allocate.data1>
			{
			//var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.StockId);
			return new Allocate.data1.Inventory
			new Allocate.data1
			{
			LinId = outDetail.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = outDetail.MaterielCode,
			OrderQuantity = outDetail.OrderQuantity,
			BatchNo = outDetail.BatchNo,
			FinishQty = outDetail.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			No = outboundOrder.OrderNo,
			InWarehouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfos.Select(item =>
			{
			//var detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.StockId);
			return new Allocate.data1.Inventory
			{
			LinId = outDetail.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = outDetail.MaterielCode,
			OrderQuantity = outDetail.OrderQuantity,
			BatchNo = outDetail.BatchNo,
			FinishQty = outDetail.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			}
			}
			}
			}
			}
			}
			};

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

			HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			var response = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, allocate, "立库入库数量回传WMS");
			WriteLog.Write_Log("API", "SMOM立库入库数量回传WMS", "请求", new { 请求报文 = allocate, 接收报文 = response });

			}
			}

			@@ -2526,7 +2967,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)
			@@ -2575,7 +3016,7 @@
			System = "WMS",
			Remark = stockInfoDetail.BatchNo
			};
			if(lastReturnOrder != null)
			if (lastReturnOrder != null)
			{
			lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
			_returnOrderRepository.UpdateData(lastReturnOrder);
			@@ -2585,7 +3026,7 @@
			returnOrder.LocationCode = stockInfo.LocationCode;
			}
			_unitOfWorkManage.BeginTran();
			if(lastReturnOrder == null)
			if (lastReturnOrder == null)
			{
			_returnOrderRepository.AddData(returnOrder);
			lastReturnOrder = returnOrder;
			@@ -2637,8 +3078,7 @@
			var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
			if (matchedStockDetail == null)
			{
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
			x.MaterielCode == outDetail.MaterielCode);
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outDetail.MaterielCode);

			if (matchedStockDetail == null)
			{
			@@ -2646,9 +3086,9 @@
			}
			}
			// 只减去单据明细中的数量
			matchedStockDetail.OutboundQuantity = 0;
			matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
			matchedStockDetail.OrderNo = returnOrder.OrderNo;
			//matchedStockDetail.OutboundQuantity = 0;
			//matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
			//matchedStockDetail.OrderNo = returnOrder.OrderNo;
			// 更新匹配的明细
			_stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
			}
			@@ -2663,163 +3103,165 @@
			else
			{
			var groupedDetails = outboundOrderDetails
			.GroupBy(d => new { d.MaterielCode, d.BatchNo })
			.ToList();
			.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)
			foreach (var detail in stockInfo.Details)
			{
			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)
			foreach (var groupeDetail in groupedDetails)
			{
			matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outboundDetail.MaterielCode);

			if (matchedStockDetail == null)
			var outboundDetail = groupeDetail.First();
			if (outboundDetail.MaterielCode == detail.MaterielCode)
			{
			throw new Exception($"未找到匹配的库存明细信息，物料:{outboundDetail.MaterielCode}, 批次:{outboundDetail.BatchNo}");
			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);

			}
			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}个批次";
			}
			}

			// 批量更新已处理的库存明细
			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 \|\| 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);
			}
			}
			}
			// 计算当前批次的剩余数量
			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 = 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);
			}

			// 批量更新已处理的库存明细
			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)
			{
			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);
			}

			_unitOfWorkManage.CommitTran();
			}
			_unitOfWorkManage.CommitTran();
			}
			catch (Exception ex)
			{
			@@ -2860,6 +3302,8 @@

			result = response.Content.ReadAsStringAsync()
			.ConfigureAwait(false).GetAwaiter().GetResult();
			WriteLog.Write_Log("API", "单据明细出库完成回调ERP", "请求成功", new { 请求报文 = postContent, 接收报文 = response });

			}

			// 假设ERP返回成功时返回成功响应
			@@ -2867,11 +3311,15 @@
			}
			catch (HttpRequestException ex)
			{
			WriteLog.Write_Log("API", "单据明细出库完成回调ERP", "请求失败", new { 请求报文 = postContent, 接收报文 = ex.Message });

			// 处理HTTP请求相关异常
			return WebResponseContent.Instance.Error($"HTTP请求错误: {ex.Message}");
			}
			catch (Exception ex)
			{
			WriteLog.Write_Log("API", "单据明细出库完成回调ERP", "请求失败", new { 请求报文 = postContent, 接收报文 = ex.Message });

			// 处理其他异常
			return WebResponseContent.Instance.Error($"处理失败: {ex.Message}");
			}
			@@ -2899,11 +3347,15 @@
			// 判断Success的值
			if (response.Code == 0)
			{
			WriteLog.Write_Log("API", "任务回传给erp", "请求成功", new { 请求报文 = feedbackInboundOrder, 接收报文 = response });

			// 如果Success为true，返回需要的值（这里以返回整个响应对象为例）
			return WebResponseContent.Instance.OK();
			}
			else
			{
			WriteLog.Write_Log("API", "任务回传给erp", "请求失败", new { 请求报文 = feedbackInboundOrder, 接收报文 = response });

			// 如果Success为false，抛出异常并包含错误信息
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			}
			@@ -3106,223 +3558,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();

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


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


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

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

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

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

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

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

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

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

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

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

			// 如果配置的是 "192.168.99.3 上的 Lenovo M7605D"
			if (displayName.Contains("192.168.99.3 上的 Lenovo M7605D"))
			{
			// 在系统中查找实际的打印机名称
			return FindActualPrinterForIP("192.168.99.3");
			}
			// 使用 lp 命令，添加 -o raw 选项
			string command = $"lp -d {printerName} -o raw \"{filePath}\"";

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

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

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

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

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

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

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


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

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

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


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

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

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

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

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


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

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

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

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


			/// <summary>
			/// 盘点出库完成
			/// </summary>
			@@ -3427,12 +3841,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}不存在");
			@@ -3495,6 +3904,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.人工完成);