MeiRuiAn/JiAnLiKu.git

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

			namespace WIDESEA_TaskInfoService
			{
			@@ -108,13 +125,15 @@
			private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
			private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
			private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
			private readonly IStockInfoDetailCPRepository _stockInfoDetailCPRepository;
			private readonly IReturnOrderRepository _returnOrderRepository;
			private readonly IProductionRepository _productionRepository;
			private readonly IInboundRepository _inboundRepository;

			private readonly ITakeStockOrderCPRepository _takeStockOrderCPRepository;
			private readonly ITakeStockOrderDetailCPRepository _takeStockOrderDetailCPRepository;
			public ITaskRepository Repository => BaseDal;

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

			public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
			@@ -149,6 +171,7 @@
			public string ReceiveWMSTaskAllocatein = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskAllocatein"];
			public string ReceiveERPTaskout = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveERPTaskout"];
			public string InMaterialWarehousingCallback = WIDESEA_Core.Helper.AppSettings.Configuration["InMaterialWarehousingCallback"];
			public string LEDAPI = WIDESEA_Core.Helper.AppSettings.Configuration["LEDAPI"];


			/// <summary>
			@@ -556,9 +579,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>();
			@@ -595,7 +618,7 @@
			return WebResponseContent.Instance.Error($"未找到对应的入库单明细");
			}

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

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

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

			// 更新成品库存明细状态
			@@ -723,6 +738,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)
			@@ -875,7 +891,79 @@
			}
			}
			}
			else if (inboundOrder.OrderStatus == InboundStatusEnum.入库完成.ObjToInt() && inboundOrder.OrderType == 5 && inboundOrder.System.Equals("SMOM"))
			{

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

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

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

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

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

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


			})).ToList()

			}

			}
			}
			};

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

			};

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

			}

			}
			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			@@ -985,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)
			@@ -999,7 +1087,7 @@
			}
			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"))
			{
			@@ -1136,7 +1224,7 @@
			int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
			{
			// 更新入库单明细状态
			UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
			UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
			///更新库存状态
			stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
			// 更新库存明细状态
			@@ -1159,21 +1247,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();
			@@ -1344,7 +1432,7 @@

			_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(
			stockInfo, stockInfo.Details,
			stockInfo.Details.Sum(x => x.StockQuantity),
			0,
			stockInfo.Details.Sum(x => x.StockQuantity),
			StockChangeType.Inbound, task.TaskNum);
			}
			@@ -1650,7 +1738,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);
			}
			@@ -1685,129 +1777,135 @@
			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())
			continue;

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

			if (allocateQty > 0)
			if (matchingOrderDetails.Count == 0)
			{
			orderDetail.OverOutQuantity += allocateQty;
			remainingStock -= allocateQty;
			continue;
			}

			// 检查是否完成
			if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
			// 计算需要分配的数量
			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.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			overCount++;
			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)
			// 更新订单状态
			if (outboundOrder.Details.Count == overCount)
			{
			return WebResponseContent.Instance.Error("出库单数据源为空");
			outboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
			}
			_unitOfWorkManage.BeginTran();

			if (!outboundOrder.System.Equals("SMOM"))
			try
			{
			UpdateLocationStatus(locationInfo);
			}
			// 更新出库单
			_outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);

			// 处理任务完成
			CompleteTask(task);
			_outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails1);

			// 添加状态变更记录
			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");
			AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails1);

			// ERP系统反馈
			if (outboundOrder.System.Equals("ERP"))
			{
			// 为每个完成的明细反馈ERP
			foreach (var orderDetail in outboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
			// 区分单据数据来源更新货位状态
			if (outboundOrder.System == null)
			{
			FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
			return WebResponseContent.Instance.Error("出库单数据源为空");
			}

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

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

			if (outStockLockInfoList.Count == 0)
			throw new Exception($"订单 {outboundOrder.OrderNo} 托盘 {stockInfo.PalletCode} 未找到库存锁定信息");
			// 添加状态变更记录
			AddStatusChangeRecord(task, stockInfo, locationInfo);

			// 采购出库
			if (outboundOrder.OrderType == 1)
			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"))
			{
			var passBack = new HouseoutboundPassBack
			// 为每个完成的明细反馈ERP
			foreach (var orderDetail in outboundOrderDetails1.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
			{
			ApiType = "ShippingOrderController",
			Method = "AsrsOutboundSO",
			Parameters = new List<HouseoutboundPassBack.datas>
			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
			{
			@@ -1835,33 +1933,33 @@
			}
			}
			}
			};
			};

			//调用SMOM接口...
			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			passBack.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>(ReceiveWMSTaskout, passBack, "立库出库数量回传WMS");
			if (!response.Success)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			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 == 3)
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			var allocate = new InventoryAllocate
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			{
			new Allocate
			{
			@@ -1892,38 +1990,271 @@
			}
			}
			}
			};
			};

			// 调用SMOM接口...
			var authResult = AuthenticateWithWMS();
			if (authResult.IsSuccess)
			{
			allocate.Context = new Dictionary<string, string>
			// 调用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)
			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;
			}
			}
			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)
			{
			throw new Exception($"操作失败: {response.Message ?? "未提供错误信息"}");
			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
			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
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			Value = new List<HouseoutboundPassBack.datas.data1>
			{
			new HouseoutboundPassBack.datas.data1
			{
			No = outboundOrder.OrderNo,
			OutWareHouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
			{
			LinId = d.LinId?? "",
			LPN_No = d.PalletCode,
			MaterielCode = d.MaterielCode?? "",
			OrderQuantity = d.OrderQuantity,
			BatchNo = d.BatchNo,
			FinishQty = d.OrderQuantity,
			LocationName = d.LocationCode
			})
			.ToList()
			}
			}
			}
			}
			};

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

			// 调拨出库
			if (outboundOrder.OrderType == 3)
			{
			var allocate = new InventoryAllocate
			{
			ApiType = "InventoryAllocateController",
			Method = "AsrsFinishedStockCount",
			Parameters = new List<Allocate>
			{
			new Allocate
			{
			Value = new List<Allocate.data1>
			{
			new Allocate.data1
			{
			No = outboundOrder.OrderNo,
			InWarehouse = task.Roadway,
			TransactionCode = outboundOrder.TransactionCode,
			InoutType = outboundOrder.OrderType,
			OrderType = outboundOrder.InoutType,
			ActiveType = 2,
			DetailList = outStockLockInfoList.Select(item =>
			{
			return new Allocate.data1.Inventory
			{
			LinId = item.LinId,
			LPNNo = item.PalletCode,
			MaterielCode = item.MaterielCode,
			OrderQuantity = item.OrderQuantity,
			BatchNo = item.BatchNo,
			FinishQty = item.OrderQuantity,
			LocationName = task.SourceAddress
			};
			}).ToList()
			}
			}
			}
			}
			};

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

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

			_unitOfWorkManage.CommitTran();
			return WebResponseContent.Instance.OK();
			}
			catch
			{
			_unitOfWorkManage.RollbackTran();
			throw;
			}
			}
			}
			catch (Exception ex)
			@@ -1931,7 +2262,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)
			@@ -1940,31 +2271,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
			{
			@@ -2059,15 +2395,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)
			{
			@@ -2125,6 +2456,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(task, 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());
			@@ -2154,36 +2562,43 @@
			}

			//低温、药水
			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;
			int CompeletedNum = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).Count();
			foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
			{
			if (inboundOrderDetail == null) continue;

			if(inboundOrderDetail.BatchNo == item.BatchNo)
			string BatchNo = newOutboundOrderDetail.BatchNo;
			//inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
			foreach (var item in stockInfo.Details)
			{
			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();
			CompeletedNum++;
			}
			else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			{
			newOutboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.出库中.ObjToInt();

			inboundOrder.OrderStatus = OutboundStatusEnum.出库中.ObjToInt();
			}
			}
			}
			if (inboundOrder.Details.Count == CompeletedNum)
			{
			inboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
			}
			}
			if (inboundOrder.Details.Count == overCount)
			{
			inboundOrder.OrderStatus = OutboundStatusEnum.出库完成.ObjToInt();
			}

			}

			private void DeleteAndMoveIntoHtStockStatus(Dt_StockInfo stockInfo)
			@@ -2214,6 +2629,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,
			@@ -2513,13 +2934,13 @@
			}

			//低温、药水回库单
			private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
			private void AddDWANDYSRetrueOrder(Dt_Task task, Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
			{

			List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
			.Where(x => x.StockId == stockInfo.Id).ToList();

			Dt_ReturnOrder? lastReturnOrder = null;
			Dt_ReturnOrder? lastReturnOrder = null;
			foreach (var stockInfoDetail in stockInfoDetails)
			{
			if (stockInfoDetail == null)
			@@ -2542,6 +2963,22 @@
			}
			else
			{
			var postData = new
			{
			DeviceCode = task.NextAddress, // 屏幕编号
			MaterialCode = outboundOrder.Details.FirstOrDefault()?.MaterielCode,//物料类型
			BackNum = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity,//回库数
			SendNum = outboundOrder.Details.FirstOrDefault()?.OrderQuantity//发料数
			};
			string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
			using (var client = new HttpClient())
			{
			var content = new StringContent(json, Encoding.UTF8, "application/json");
			var response = client.PostAsync(LEDAPI, content).Result;
			string result = response.Content.ReadAsStringAsync().Result;
			}


			bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
			if (allowCompeted)
			{
			@@ -2568,7 +3005,7 @@
			System = "WMS",
			Remark = stockInfoDetail.BatchNo
			};
			if(lastReturnOrder != null)
			if (lastReturnOrder != null)
			{
			lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
			_returnOrderRepository.UpdateData(lastReturnOrder);
			@@ -2578,7 +3015,7 @@
			returnOrder.LocationCode = stockInfo.LocationCode;
			}
			_unitOfWorkManage.BeginTran();
			if(lastReturnOrder == null)
			if (lastReturnOrder == null)
			{
			_returnOrderRepository.AddData(returnOrder);
			lastReturnOrder = returnOrder;
			@@ -2639,9 +3076,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);
			}
			@@ -2656,163 +3093,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)
			{
			@@ -3099,127 +3538,204 @@
			}
			}

			public virtual void PrintTestDirect(string fullPath)
			public void PrintTestDirect(string fullPath)
			{
			const int maxRetryCount = 3;
			const int retryDelayMs = 1000;

			if (!File.Exists(fullPath))
			{
			Console.WriteLine($"打印失败：文件不存在 {fullPath}");
			Console.WriteLine($"✗ 打印失败：文件不存在 {fullPath}");
			return;
			}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

			/// <summary>
			/// Ubuntu 检查打印机可用性
			/// </summary>
			private bool IsPrinterAvailableUbuntu(string printerName)
			{
			try
			{
			ProcessStartInfo psi = new ProcessStartInfo
			{
			FileName = "lpstat",
			Arguments = $"-p {printerName}",
			UseShellExecute = false,
			CreateNoWindow = true,
			RedirectStandardOutput = true
			};

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

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

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


			/// <summary>
			/// 盘点出库完成
			/// </summary>
			@@ -3310,525 +3807,107 @@
			}
			return content;
			}

			/// <summary>
			/// SMOM盘点单完成
			/// </summary>
			/// <param name="task"></param>
			/// <param name="stockInfo"></param>
			/// <param name="locationInfo"></param>
			/// <returns></returns>
			public WebResponseContent SMOMOutInventoryCompleted(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			//获取对应盘点单
			Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
			if (takeStockOrder == null)
			{
			return content.Error($"盘点单{task.OrderNo}不存在");
			}
			if (takeStockOrder.TakeStockStatus != TakeStockStatusEnum.盘点中.ObjToInt())
			{
			return content.Error($"盘点单{task.OrderNo}盘点已完成或未开始");
			}
			if (stockInfo.StockStatus != StockStatusEmun.出库锁定.ObjToInt())
			{
			return content.Error($"{stockInfo.PalletCode}库存状态不正确");
			}
			if (locationInfo.LocationStatus != LocationStatusEnum.Lock.ObjToInt())
			{
			return content.Error($"{locationInfo.LocationCode}货位状态不正确");
			}
			//根据任务托盘查盘点明细
			Dt_TakeStockOrderDetailCP? takeStockOrderDetail = takeStockOrder.Details.FirstOrDefault(x => x.TakePalletCode == stockInfo.PalletCode);
			if (takeStockOrderDetail == null)
			{
			return content.Error($"{stockInfo.PalletCode}未找到对应盘点明细");
			}
			if (takeStockOrderDetail.TakeDetalStatus != TakeStockDetailStatusEnum.盘点出库中.ObjToInt())
			{
			return content.Error($"{stockInfo.PalletCode}盘点明细状态不正确");
			}
			takeStockOrder.Details.ForEach(x =>
			{
			x.TakeDetalStatus = TakeStockDetailStatusEnum.盘点出库完成.ObjToInt();
			});
			stockInfo.StockStatus = StockStatusEmun.盘点出库完成.ObjToInt();
			stockInfo.Details.ForEach(x =>
			{
			x.Status = StockStatusEmun.盘点出库完成.ObjToInt();
			});
			stockInfo.LocationCode = "";
			task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
			int beforeStatus = locationInfo.LocationStatus;
			locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
			Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
			{
			MaterielCode = stockInfo.Details.FirstOrDefault()?.MaterielCode,
			MaterielName = stockInfo.Details.FirstOrDefault()?.MaterielName,
			BatchNo = stockInfo.Details.FirstOrDefault()?.BatchNo,
			OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			ReceiptQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
			OrderStatus = InOrderStatusEnum.未开始.ObjToInt(),
			LinId = stockInfo.Details.FirstOrDefault()?.LinId,
			LocationCode = stockInfo.LocationCode,
			LPNNo = stockInfo.PalletCode,
			Creater = "LK",
			CreateDate = DateTime.Now,
			OrderType = OrderTypeEnum.盘点回库单.ObjToInt(),
			System = "WMS"
			};

			_unitOfWorkManage.BeginTran();
			//货位变动记录
			_basicService.LocationInfoService.UpdateData(locationInfo);
			_returnOrderRepository.AddData(returnOrder);
			_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
			_takeStockOrderCPRepository.UpdateData(takeStockOrder);
			_takeStockOrderDetailCPRepository.UpdateData(takeStockOrder.Details);
			_stockRepository.StockInfoRepository.UpdateData(stockInfo);
			_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
			BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			_unitOfWorkManage.CommitTran();
			content.OK();
			}
			catch (Exception ex)
			{
			_unitOfWorkManage.RollbackTran();
			content.Error(ex.Message);
			}
			return content;
			}
			}
			#endregion
			#endregion





			#region
			//public WebResponseContent InboundTaskCompleted(int taskNum)
			//{
			// try
			// {
			// Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			// if (task == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到该任务");
			// }
			// if (task.TaskType != TaskTypeEnum.Inbound.ObjToInt())
			// {
			// return WebResponseContent.Instance.Error($"任务类型错误");
			// }
			// Dt_StockInfo dt_StockInfo = _stockRepository.StockInfoRepository.Db.Queryable<Dt_StockInfo>().Where(x => x.PalletCode == task.PalletCode).Includes(x => x.Details).First();
			// if (dt_StockInfo == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到托盘对应的组盘信息");
			// }

			// if (!string.IsNullOrEmpty(dt_StockInfo.LocationCode))
			// {
			// return WebResponseContent.Instance.Error($"该托盘已绑定货位");
			// }

			// if (dt_StockInfo.Details == null \|\| dt_StockInfo.Details.Count == 0)
			// {
			// return WebResponseContent.Instance.Error($"未找到该托盘库存明细信息");
			// }
			// Dt_LocationInfo dt_LocationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
			// if (dt_LocationInfo == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到目标货位信息");
			// }

			// if (dt_LocationInfo.LocationStatus == LocationStatusEnum.InStock.ObjToInt())
			// {
			// return WebResponseContent.Instance.Error($"货位状态不正确");
			// }
			// int lastStatus = dt_LocationInfo.LocationStatus;
			// dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
			// Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseId == task.WarehouseId);

			// dt_StockInfo.LocationCode = dt_LocationInfo.LocationCode;


			// Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.InboundOrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
			// Dt_InboundOrderDetail? inboundOrderDetail = null;
			// //判断单据类型是入库还是调拨入库。。。入库
			// if (inboundOrder.OrderType == 0 && inboundOrder != null && dt_StockInfo.StockStatus == StockStatusEmun.入库确认.ObjToInt())
			// {
			// #region //判断入库单据明细只有最后一条完成时删除入库单
			// //查询原完成的入库明细数量
			// int overCount = inboundOrder.Details.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count;
			// //明细id查询
			// inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.LinId == dt_StockInfo.Details.FirstOrDefault()?.LinId);
			// foreach (var item in dt_StockInfo.Details)
			// {
			// if (inboundOrderDetail == null)
			// {
			// continue;
			// }
			// inboundOrderDetail.OverInQuantity += item.StockQuantity;
			// if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
			// {
			// inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			// overCount += 1;
			// }
			// else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
			// {
			// inboundOrderDetail.OrderDetailStatus = InboundStatusEnum.入库中.ObjToInt();
			// }
			// }
			// dt_StockInfo.Details.ForEach(x =>
			// {
			// x.Status = StockStatusEmun.入库完成.ObjToInt();
			// });

			// _unitOfWorkManage.BeginTran();
			// task.TaskStatus = InTaskStatusEnum.InFinish.ObjToInt();
			// BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? OperateType.人工完成 : OperateType.自动完成);

			// _basicService.LocationInfoService.Repository.UpdateData(dt_LocationInfo);
			// _stockRepository.StockInfoRepository.UpdateData(dt_StockInfo);
			// _stockRepository.StockInfoDetailRepository.UpdateData(dt_StockInfo.Details);
			// _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(dt_LocationInfo, lastStatus, StockChangeType.Inbound.ObjToInt(), "", task.TaskNum);
			// _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(dt_StockInfo, dt_StockInfo.Details, dt_StockInfo.Details.Sum(x => x.StockQuantity), dt_StockInfo.Details.Sum(x => x.StockQuantity), StockChangeType.Inbound, task.TaskNum);
			// if (inboundOrder != null)
			// {
			// _inboundService.InbounOrderService.UpdateData(inboundOrder);
			// _inboundService.InboundOrderDetailService.UpdateData(inboundOrderDetail);
			// }
			// _unitOfWorkManage.CommitTran();




			// if (inboundOrder.Details.Count == 1)
			// {
			// var stockInfoDetail = dt_StockInfo.Details.FirstOrDefault();

			// #region//入库信息返回上位WMS。。立库入库数量回传
			// HouseInboundPassBack houseInboundPassBack = new HouseInboundPassBack();
			// houseInboundPassBack.ApiType = "AsnController";
			// houseInboundPassBack.Method = "AsrsGroudingAsn";
			// data data = new data();
			// data.data1 data1 = new data.data1();
			// data1.AsnNo = task.OrderNo;
			// data1.InWarehouse = task.Roadway;
			// data1.TransactionCode = inboundOrder.TransactionCode;
			// data1.InoutType = inboundOrder.OrderType;
			// data1.OrderType = inboundOrder.InoutType;
			// data.data1.Inbound inbound = new data.data1.Inbound
			// {
			// LinId = stockInfoDetail.LinId,
			// MaterielCode = stockInfoDetail.MaterielCode,
			// OrderQuantity = stockInfoDetail.StockQuantity,
			// BatchNo = stockInfoDetail.BatchNo,
			// FinishQty = stockInfoDetail.StockQuantity,
			// LocationName = task.TargetAddress
			// };
			// data.Value.Add(data1);
			// data1.DetailList.Add(inbound);
			// houseInboundPassBack.Parameters.Add(data);
			// Authentication authentication = new Authentication()
			// {
			// ApiType = "AuthenticationController",
			// Parameters = new List<Parameter>
			// {
			// new Parameter { Value = "LKAdmin"},
			// new Parameter { Value = "LKAdmin"},
			// },
			// Method = "Login",
			// };
			// var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "登录WMS账号");
			// var Ticket = responses1.Context["Ticket"].ToString();
			// var InvOrgId = responses1.Context["InvOrgId"].ToString();
			// if (Ticket != null)
			// {
			// houseInboundPassBack.Context = new Dictionary<string, string>();
			// houseInboundPassBack.Context.Add("Ticket", Ticket);
			// houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
			// var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskin, houseInboundPassBack, "立库入库数量回传WMS");
			// }
			// #endregion
			// }
			// }
			// else
			// {
			// #region //判断调拨入库单据明细只有最后一条完成时删除入库单并一次返回入库明细信息
			// if (inboundOrder.Details.Count == 1)
			// {
			// List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == inboundOrderDetail.BatchNo);
			// Dt_InboundOrder_Hty inboundOrder_Hty = new Dt_InboundOrder_Hty
			// {
			// OrderStatus = inboundOrder.OrderStatus,
			// CreateType = inboundOrder.CreateType,
			// //SourceId = oldOutboundOrder.SourceId,
			// UpperOrderNo = inboundOrder.UpperOrderNo,
			// OrderNo = inboundOrder.OrderNo,
			// //OutWareHouse = inboundOrder.OutWareHouse,
			// TransactionCode = inboundOrder.TransactionCode,
			// InoutType = inboundOrder.InoutType,
			// OrderType = inboundOrder.OrderType,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _inboundOrder_HtyService.AddData(inboundOrder_Hty);
			// _inboundService.InbounOrderService.DeleteData(inboundOrder);
			// Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_HtyS = new Dt_InboundOrderDetail_Hty
			// {
			// OrderId = inboundOrderDetail.OrderId,
			// MaterielCode = inboundOrderDetail.MaterielCode,
			// MaterielName = inboundOrderDetail.MaterielName,
			// BatchNo = inboundOrderDetail.BatchNo,
			// OrderQuantity = inboundOrderDetail.OrderQuantity,
			// ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
			// OverInQuantity = inboundOrderDetail.OverInQuantity,
			// OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_HtyS);
			// _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
			// #endregion
			// #region//调拨任务数量回传WMS
			// InventoryAllocate inventoryAllocate = new InventoryAllocate();
			// inventoryAllocate.ApiType = "InventoryAllocateController";
			// inventoryAllocate.Method = "AsrsFinishedStockCount";

			// Allocate allocate = new Allocate();

			// Allocate.data1 data1 = new Allocate.data1();
			// data1.No = task.OrderNo;
			// data1.InWarehouse = task.Roadway;
			// data1.TransactionCode = inboundOrder.TransactionCode;
			// data1.InoutType = inboundOrder.OrderType;
			// data1.OrderType = inboundOrder.InoutType;
			// foreach (var item in StockInfo)
			// {
			// Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
			// Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
			// inbound.LinId = detail.LinId;
			// inbound.LPN_No = item.PalletCode;
			// inbound.MaterielCode = detail.MaterielCode;
			// inbound.OrderQuantity = detail.StockQuantity;
			// inbound.BatchNo = detail.BatchNo;
			// inbound.FinishQty = detail.StockQuantity;
			// inbound.LocationName = item.LocationCode;
			// data1.DetailList.Add(inbound);
			// }
			// allocate.Value.Add(data1);
			// inventoryAllocate.Parameters.Add(allocate);
			// Authentication authentication = new Authentication()
			// {
			// ApiType = "AuthenticationController",
			// Parameters = new List<Parameter>
			// {
			// new Parameter { Value = "LKAdmin"},
			// new Parameter { Value = "LKAdmin"},
			// },
			// Method = "Login",
			// };
			// var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "登录WMS账号");
			// var Ticket = responses1.Context["Ticket"].ToString();
			// var InvOrgId = responses1.Context["InvOrgId"].ToString();
			// if (Ticket != null)
			// {
			// inventoryAllocate.Context = new Dictionary<string, string>();
			// inventoryAllocate.Context.Add("Ticket", Ticket);
			// inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
			// var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨入库数量回传WMS");
			// }
			// }
			// #endregion
			// Dt_InboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_InboundOrderDetail_Hty
			// {
			// OrderId = inboundOrderDetail.OrderId,
			// MaterielCode = inboundOrderDetail.MaterielCode,
			// MaterielName = inboundOrderDetail.MaterielName,
			// BatchNo = inboundOrderDetail.BatchNo,
			// OrderQuantity = inboundOrderDetail.OrderQuantity,
			// ReceiptQuantity = inboundOrderDetail.ReceiptQuantity,
			// OverInQuantity = inboundOrderDetail.OverInQuantity,
			// OrderDetailStatus = inboundOrderDetail.OrderDetailStatus,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _inboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
			// _inboundService.InboundOrderDetailService.DeleteData(inboundOrderDetail);
			// }
			// return WebResponseContent.Instance.OK();
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}
			#endregion
			#region
			//public WebResponseContent OutboundTaskCompleted(int taskNum)
			//{
			// try
			// {
			// Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			// if (task == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到任务信息");
			// }

			// Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);

			// Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			// if (stockInfo == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到库存信息");
			// }
			// if (locationInfo == null)
			// {
			// return WebResponseContent.Instance.Error($"未找到货位信息");
			// }

			// List<Dt_OutStockLockInfo> outStockLockInfos = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.TaskNum == taskNum);
			// if (outStockLockInfos == null \|\| outStockLockInfos.Count == 0)
			// {
			// return WebResponseContent.Instance.Error($"未找到出库详情信息");
			// }

			// List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
			// for (int i = 0; i < outStockLockInfos.Count; i++)
			// {
			// Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderDetailService.Repository.QueryFirst(x => x.Id == outStockLockInfos[i].OrderDetailId);
			// if (outboundOrderDetail != null)
			// {
			// outboundOrderDetail.OverOutQuantity = outboundOrderDetail.LockQuantity;
			// if (outboundOrderDetail.LockQuantity == outboundOrderDetail.OrderQuantity)
			// {
			// outboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
			// }
			// outboundOrderDetails.Add(outboundOrderDetail);
			// }
			// }

			// _unitOfWorkManage.BeginTran();
			// _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);

			// stockInfo.LocationCode = locationInfo.LocationCode;
			// stockInfo.StockStatus = StockStatusEmun.出库完成.ObjToInt();
			// _stockService.StockInfoService.Repository.UpdateData(stockInfo);

			// int beforeStatus = locationInfo.LocationStatus;
			// locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
			// _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
			// BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);

			// _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
			// _unitOfWorkManage.CommitTran();
			// Dt_StockInfoDetail stockInfoDetail = _stockRepository.StockInfoDetailRepository.Db.Queryable<Dt_StockInfoDetail>().Where(x => x.StockId == stockInfo.Id).First();
			// Dt_OutboundOrderDetail outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>().Where(x => x.LPNNo == stockInfo.PalletCode).First();
			// Dt_OutboundOrder outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outDetail.OrderId).Includes(x => x.Details).First();
			// //判断单据类型是出库还是调拨出库。。。出库
			// if (outboundOrder.OrderType == 1)
			// {
			// #region //判断出库单据明细只有最后一条完成时删除出库单
			// if (outboundOrder.Details.Count == 1)
			// {
			// Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
			// {
			// OrderStatus = outboundOrder.OrderStatus,
			// CreateType = outboundOrder.CreateType,
			// //SourceId = oldOutboundOrder.SourceId,
			// UpperOrderNo = outboundOrder.UpperOrderNo,
			// OrderNo = outboundOrder.OrderNo,
			// OutWareHouse = outboundOrder.OutWareHouse,
			// TransactionCode = outboundOrder.TransactionCode,
			// InoutType = outboundOrder.InoutType,
			// OrderType = outboundOrder.OrderType,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _outboundOrder_HtyService.AddData(inboundOrder_Hty);
			// _outboundService.OutboundOrderService.DeleteData(outboundOrder);
			// }
			// Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
			// {
			// OrderId = outDetail.OrderId,
			// MaterielCode = outDetail.MaterielCode,
			// MaterielName = outDetail.MaterielName,
			// BatchNo = outDetail.BatchNo,
			// OrderQuantity = outDetail.OrderQuantity,
			// //ReceiptQuantity = outDetail.ReceiptQuantity,
			// //OverInQuantity = outDetail.OverInQuantity,
			// OrderDetailStatus = outDetail.OrderDetailStatus,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
			// _outboundService.OutboundOrderService.DeleteData(outDetail);
			// #endregion
			// #region//出库信息返回上位WMS。。。立库出库数量回传
			// HouseoutboundPassBack houseInboundPassBack = new HouseoutboundPassBack();
			// houseInboundPassBack.ApiType = "ShippingOrderController";
			// houseInboundPassBack.Method = "AsrsOutboundSO";
			// datas datas = new datas();
			// datas.data1 data1 = new datas.data1();
			// data1.No = outboundOrder.OrderNo;
			// data1.OutWareHouse = task.Roadway;
			// data1.TransactionCode = outboundOrder.TransactionCode;
			// data1.InoutType = outboundOrder.OrderType;
			// data1.OrderType = outboundOrder.InoutType;

			// datas.data1.Inbound inbound = new datas.data1.Inbound();
			// inbound.LinId = outDetail.LinId;
			// inbound.LPN_No = task.PalletCode;
			// inbound.MaterielCode = stockInfoDetail.MaterielCode;
			// inbound.OrderQuantity = stockInfoDetail.OutboundQuantity;
			// inbound.BatchNo = stockInfoDetail.BatchNo;
			// inbound.FinishQty = stockInfoDetail.OutboundQuantity;
			// inbound.LocationName = task.SourceAddress;
			// datas.Value.Add(data1);
			// data1.DetailList.Add(inbound);
			// houseInboundPassBack.Parameters.Add(datas);
			// Authentication authentication = new Authentication()
			// {
			// ApiType = "AuthenticationController",
			// Parameters = new List<Parameter>
			// {
			// new Parameter { Value = "LKAdmin"},
			// new Parameter { Value = "LKAdmin"},
			// },
			// Method = "Login",
			// };
			// var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "登录WMS账号");
			// var Ticket = responses1.Context["Ticket"].ToString();
			// var InvOrgId = responses1.Context["InvOrgId"].ToString();
			// if (Ticket != null)
			// {
			// houseInboundPassBack.Context = new Dictionary<string, string>();
			// houseInboundPassBack.Context.Add("Ticket", Ticket);
			// houseInboundPassBack.Context.Add("InvOrgId", InvOrgId);
			// var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskout, houseInboundPassBack, "立库出库数量回传WMS");
			// }
			// #endregion
			// //删除库存信息
			// _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			// _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			// }
			// else if (outboundOrder.OrderType == 240)
			// {
			// //盘点出库任务完成、、、、、、、、、不能删除库存等逻辑
			// }
			// else
			// {

			// List<Dt_StockInfo> StockInfo = _stockService.StockInfoService.Repository.QueryData(x => x.BatchNo == outDetail.BatchNo);
			// if (outboundOrder.Details.Count == 1)
			// {
			// Dt_OutboundOrder_Hty inboundOrder_Hty = new Dt_OutboundOrder_Hty
			// {
			// OrderStatus = outboundOrder.OrderStatus,
			// CreateType = outboundOrder.CreateType,
			// //SourceId = oldOutboundOrder.SourceId,
			// UpperOrderNo = outboundOrder.UpperOrderNo,
			// OrderNo = outboundOrder.OrderNo,
			// OutWareHouse = outboundOrder.OutWareHouse,
			// TransactionCode = outboundOrder.TransactionCode,
			// InoutType = outboundOrder.InoutType,
			// OrderType = outboundOrder.OrderType,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _outboundOrder_HtyService.AddData(inboundOrder_Hty);
			// _outboundService.OutboundOrderService.DeleteData(outboundOrder);
			// }
			// Dt_OutboundOrderDetail_Hty dt_InboundOrderDetail_Hty = new Dt_OutboundOrderDetail_Hty
			// {
			// OrderId = outDetail.OrderId,
			// MaterielCode = outDetail.MaterielCode,
			// MaterielName = outDetail.MaterielName,
			// BatchNo = outDetail.BatchNo,
			// OrderQuantity = outDetail.OrderQuantity,
			// //ReceiptQuantity = outDetail.ReceiptQuantity,
			// //OverInQuantity = outDetail.OverInQuantity,
			// OrderDetailStatus = outDetail.OrderDetailStatus,
			// Creater = "WMS",
			// CreateDate = DateTime.Now,
			// };
			// _outboundOrderDetail_HtyService.AddData(dt_InboundOrderDetail_Hty);
			// _outboundService.OutboundOrderService.DeleteData(outDetail);

			// InventoryAllocate inventoryAllocate = new InventoryAllocate();
			// inventoryAllocate.ApiType = "InventoryAllocateController";
			// inventoryAllocate.Method = "AsrsFinishedStockCount";

			// Allocate allocate = new Allocate();

			// Allocate.data1 data1 = new Allocate.data1();
			// data1.No = outboundOrder.OrderNo;
			// data1.InWarehouse = task.Roadway;
			// data1.TransactionCode = outboundOrder.TransactionCode;
			// data1.InoutType = outboundOrder.OrderType;
			// data1.OrderType = outboundOrder.InoutType;

			// foreach (var item in StockInfo)
			// {
			// Dt_StockInfoDetail detail = _stockService.StockInfoDetailService.Repository.QueryFirst(x => x.StockId == item.Id);
			// Allocate.data1.Inventory inbound = new Allocate.data1.Inventory();
			// inbound.LinId = outDetail.LinId;
			// inbound.LPN_No = item.PalletCode;
			// inbound.MaterielCode = detail.MaterielCode;
			// inbound.OrderQuantity = detail.OutboundQuantity;
			// inbound.BatchNo = detail.BatchNo;
			// inbound.FinishQty = detail.OutboundQuantity;
			// inbound.LocationName = task.SourceAddress;
			// data1.DetailList.Add(inbound);
			// }


			// allocate.Value.Add(data1);
			// inventoryAllocate.Parameters.Add(allocate);
			// Authentication authentication = new Authentication()
			// {
			// ApiType = "AuthenticationController",
			// Parameters = new List<Parameter>
			// {
			// new Parameter { Value = "LKAdmin"},
			// new Parameter { Value = "LKAdmin"},
			// },
			// Method = "Login",
			// };
			// var responses1 = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAUT, authentication, "登录WMS账号");
			// var Ticket = responses1.Context["Ticket"].ToString();
			// var InvOrgId = responses1.Context["InvOrgId"].ToString();
			// if (Ticket != null)
			// {
			// inventoryAllocate.Context = new Dictionary<string, string>();
			// inventoryAllocate.Context.Add("Ticket", Ticket);
			// inventoryAllocate.Context.Add("InvOrgId", InvOrgId);
			// var responses = HttpHelper.Post<WebResponseContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "调拨出库数量回传WMS");
			// }
			// _stockService.StockInfoService.Repository.DeleteAndMoveIntoHty(stockInfo, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			// _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(stockInfo.Details, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
			// }
			// return WebResponseContent.Instance.OK();
			// }
			// catch (Exception ex)
			// {
			// _unitOfWorkManage.RollbackTran();
			// return WebResponseContent.Instance.Error(ex.Message);
			// }
			//}
			#endregion
			public class LEDDTO
			{
			public string DeviceCode { get; set; }
			public string MaterialCode { get; set; }
			public int BackNum { get; set; }
			public int SendNum { get; set; }
			}
			}