HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,33 +1,27 @@
			using log4net.Core;
			using Autofac.Core;
			using Mapster;
			using Masuit.Tools;
			using Masuit.Tools.Models;
			using System.Text.RegularExpressions;
			using WIDESEA_Core.Const;
			using WIDESEA_DTO.MOM;
			using WIDESEA_DTO.WMS;
			using WIDESEA_IStorageBasicRepository;
			using WIDESEA_IServices;
			using WIDESEA_IStoragIntegrationServices;
			using WIDESEA_Model.Models;
			using WIDESEA_StorageBasicRepository;
			using WIDESEA_StorageTaskRepository;
			using WIDESEA_StoragIntegrationServices;
			using WIDESEAWCS_BasicInfoRepository;
			using WIDESEAWCS_QuartzJob.Models;

			namespace WIDESEA_StorageOutTaskServices;

			namespace WIDESEA_StorageTaskServices;

			public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
			{
			private readonly LogFactory LogFactory = new LogFactory();
			private readonly IUnitOfWorkManage _unitOfWorkManage;
			private readonly IDt_OutOrderRepository _outOrderRepository;
			private readonly IStockInfoRepository _stockInfoRepository;
			private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
			private readonly IDt_Task_HtyRepository _task_HtyRepository;
			private readonly IDt_OutOrderAndStockRepository _outOrderAndStockRepository;
			private readonly IDt_OutOrderAndStock_HtyRepository _outOrderAndStock_HtyRepository;
			private readonly IMapper _mapper;
			private readonly IDt_MaterielInfoRepository _materielInfoRepository;
			private readonly ILocationInfoRepository _locationRepository;
			private readonly IDt_WareAreaInfoRepository _wareAreaInfoRepository;
			private readonly IPointStackerRelationRepository _pointStackerRelationRepository;
			private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
			private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
			private readonly IBoxingInfoRepository _boxingInfoRepository; //组盘
			@@ -35,20 +29,16 @@
			private readonly IProcessApplyService _processApplyService; //工艺路线
			private readonly IDt_AreaInfoRepository _areaInfoRepository; //区域
			private readonly IAgingInOrOutInputService _agingInOrOutInputService; //静置\陈化
			private readonly IProductionRepository _productionRepository; //生产
			private readonly IDt_StationManagerRepository _stationManagerRepository;
			private readonly ISys_ConfigService _configService;

			public Dt_TaskService(IDt_TaskRepository BaseDal,
			IUnitOfWorkManage unitOfWorkManage,
			IDt_OutOrderRepository outOrderRepository,
			IStockInfoRepository stockInfoRepository,
			IDt_OutOrderAndStockRepository dt_OutOrderAndStockRepository,
			IDt_OutOrderAndStock_HtyRepository dt_OutOrderAndStock_HtyRepository,
			IDt_Task_HtyRepository task_HtyRepository,
			IMapper mapper,
			IDt_MaterielInfoRepository materielInfoRepository,
			ILocationInfoRepository locationRepository,
			IDt_WareAreaInfoRepository wareAreaInfoRepository,
			IPointStackerRelationRepository pointStackerRelationRepository,
			ITaskExecuteDetailRepository taskExecuteDetailRepository,
			ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
			IBoxingInfoRepository boxingInfoRepository,
			@@ -57,19 +47,14 @@
			IDt_AreaInfoRepository areaInfoRepository,
			IAgingInOrOutInputService agingInOrOutInputService,
			IStockInfoDetailRepository stockInfoDetailRepository,
			IProductionRepository productionRepository) : base(BaseDal)
			IDt_StationManagerRepository stationManagerRepository,
			ISys_ConfigService configService) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_outOrderRepository = outOrderRepository;
			_stockInfoRepository = stockInfoRepository;
			_outOrderAndStockRepository = dt_OutOrderAndStockRepository;
			_outOrderAndStock_HtyRepository = dt_OutOrderAndStock_HtyRepository;
			_task_HtyRepository = task_HtyRepository;
			_mapper = mapper;
			_materielInfoRepository = materielInfoRepository;
			_locationRepository = locationRepository;
			_wareAreaInfoRepository = wareAreaInfoRepository;
			_pointStackerRelationRepository = pointStackerRelationRepository;
			_taskExecuteDetailRepository = taskExecuteDetailRepository;
			_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
			_boxingInfoRepository = boxingInfoRepository;
			@@ -78,13 +63,13 @@
			_areaInfoRepository = areaInfoRepository;
			_agingInOrOutInputService = agingInOrOutInputService;
			_stockInfoDetailRepository = stockInfoDetailRepository;
			_productionRepository = productionRepository;
			_stationManagerRepository = stationManagerRepository;
			_configService = configService;
			}

			#region 外部接口方法

			#region 出库任务完成


			public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
			{
			@@ -93,28 +78,141 @@
			{
			if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			#region 老版本
			//var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
			// .FirstAsync(x => x.EquipmentName == task.Roadway);
			//var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
			//if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB") //非分容库区与当前工序是OCVB均上报MOM出入站
			//{
			// var agingOutputDto = MapToAgingOutputDto(stock);
			// content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
			// //ValidateResponse(content);
			// var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
			// if (!result.Success \|\| !agingOutputDto.SerialNos[0].SerialNoResult)
			// {
			// if (result.MessageCode == "E10001")
			// {
			// var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
			// if (area == null)
			// {
			// throw new Exception("未找到对应的库区信息");
			// }
			// var trayCells = new TrayCellsStatusDto()
			// {
			// Software = area.Spare3,
			// TrayBarcode = task.PalletCode,
			// EquipmentCode = area.Spare2,
			// SceneType = area.Spare4
			// };
			// content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
			// if (!content.Status) return content;

			var agingOutputDto = MapToAgingOutputDto(stock);
			content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
			ValidateResponse(content);
			// var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			// if (ResultTray.SerialNos.Count > 0)
			// {
			// var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("时间"));
			// if (parameterInfo == null) throw new Exception("");

			// var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;

			// var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();

			// var defectCode = string.Empty;
			// if (!isNG) defectCode = "TQCK";
			// var outputDto = new AgingOutputDto
			// {
			// OpFlag = 1,
			// Software = area.Spare3,
			// EquipmentCode = area.Spare2,
			// TrayBarcode = stock.PalletCode,
			// SerialNos = ResultTray.SerialNos.Select(x => new SerialNoOutDto
			// {
			// SlotNo = x.PositionNo,
			// SerialNo = x.SerialNo,
			// SerialNoResult = true, //isNG,
			// ParameterInfo = new List<ParameterInfoOutput> {
			// new ParameterInfoOutput() {
			// Value = outHours.ToString(),
			// ParameterCode =parameterInfo.ParameterCode,
			// ParameterDesc = parameterInfo.Description,
			// ParameterResult = "OK", //isNG.ToString(),
			// TargetValue = parameterInfo.TargetValue,
			// LowerLomit = parameterInfo.LowerSpecificationsLimit,
			// UpperLimit = parameterInfo.UpperSpecificationsLimit,
			// DefectCode = defectCode,
			// UOMCode = parameterInfo.UOMCode,
			// }
			// }
			// }).ToList()
			// };

			// content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
			// result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
			// if (!result.Success)
			// task.Remark = "NG";
			// }
			// }
			// else
			// task.Remark = "NG";
			// }
			//}
			#endregion 老版本

			if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
			{
			var agingOutputDto = MapToAgingOutputDto(stock);
			content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);

			if (content.Status)
			{
			var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());

			if (!result.Success && result.MessageCode == "E10001")
			{
			await HandleOutBoundError(stock, task);
			}
			}
			else
			{
			task.Remark = "NG";
			ConsoleHelper.WriteErrorLine("MOM通报点芯NG");
			return content.Error("MOM通报点芯NG");
			}
			}
			}
			}

			if (task.Remark == "NG")
			{
			ConsoleHelper.WriteErrorLine("MOM通报点芯NG");
			return content.Error("MOM通报点芯NG");
			}

			// 更新库存状态和任务状态
			(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
			var taskHty = task.Adapt<Dt_Task_Hty>();
			taskHty.FinishTime = DateTime.Now;

			DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
			stockInfo_Hty.ModifyDate = DateTime.Now;

			// 事务处理
			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			await UpdateLocationAsync(loc);
			await DeleteStockInfoAsync(stock.Id);
			await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
			//await DeleteTaskAsync(task.TaskId);
			if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
			{
			await DeleteStockInfoAsync(stock.Id);
			await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
			await AddStockInfoHtyAsync(stockInfo_Hty);
			await UpdateLocationAsync(loc); //质检任务需要持续锁定库位
			}
			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			});

			return content.OK("任务完成成功");
			return content.OK("任务完成成功", task.Remark);
			}
			catch (Exception err)
			{
			@@ -131,6 +229,25 @@
			{
			throw new Exception("未找到对应的库区信息");
			}

			var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("时间"));
			if (parameterInfo == null) throw new Exception("");

			var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;

			//if (stock.LinedProcessFeedbackTime == null)
			//{
			// outHours = (DateTime.Now - stock.CreateDate).TotalHours;
			//}
			//else
			//{
			// outHours = (DateTime.Now - stock.LinedProcessFeedbackTime.ToDateTime()).TotalHours;
			//}

			var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();

			var defectCode = string.Empty;
			if (!isNG) defectCode = "TQCK";
			return new AgingOutputDto
			{
			OpFlag = 1,
			@@ -141,41 +258,35 @@
			{
			SlotNo = x.OrderNo.ToInt32(),
			SerialNo = x.SerialNumber,
			SerialNoResult = true,
			ParameterInfo = new List<ParameterInfo> { new ParameterInfo() { Value = (DateTime.Now - stock.CreateDate).TotalMinutes.ToString() } }
			//ParameterInfo = info.ParameterInfo.Select(y => new ParameterInfo()
			//{
			// LowerLomit = y.LowerControlLimit,
			// UpperLimit = y.UpperControlLimit,
			// ParameterResult = y.EquipmentAvailabilityFlag,
			// ParameterCode = y.ParameterCode,
			// ParameterDesc = y.Description,
			// TargetValue = y.TargetValue,
			// Value = (DateTime.Parse(stock.LinedProcessFeedbackTime, null, System.Globalization.DateTimeStyles.RoundtripKind).ToLocalTime() - stock.CreateDate).TotalMinutes.ToString(),
			// DefectCode = y.UOMCode
			//}).ToList()
			SerialNoResult = true, //isNG,
			ParameterInfo = new List<ParameterInfoOutput> {
			new ParameterInfoOutput() {
			Value = outHours.ToString(),
			ParameterCode =parameterInfo.ParameterCode,
			ParameterDesc = parameterInfo.Description,
			ParameterResult = "OK", //isNG.ToString(),
			TargetValue = parameterInfo.TargetValue,
			LowerLimit = parameterInfo.LowerSpecificationsLimit,
			UpperLimit = parameterInfo.UpperSpecificationsLimit,
			DefectCode = defectCode,
			UOMCode = parameterInfo.UOMCode,
			}
			}
			}).ToList()
			};
			}

			private void ValidateResponse(WebResponseContent content)
			{
			var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
			if (!result.Success)
			{
			throw new Exception(result.MOMMessage);
			}
			}

			private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus(DtStockInfo stock, Dt_Task task)
			{
			var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress);
			var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);

			var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
			//var details = _stockInfoDetailRepository.QueryData(x => x.StockId == stock.Id);
			int lastStatus = location.LocationStatus;
			location.LocationStatus = (int)LocationEnum.Free;
			task.TaskState = (int)TaskOutStatusEnum.OutFinish;
			//task.CurrentAddress = task.NextAddress;
			//task.NextAddress = task.TargetAddress;

			_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);

			LogFactory.GetLog("任务完成").Info(true, "更新库存状态与任务状态");
			return (location, task);
			@@ -187,6 +298,15 @@
			if (!isStockUpdated)
			{
			throw new Exception("库存信息更新失败");
			}
			}

			private async Task AddStockInfoHtyAsync(DtStockInfo_Hty dtStock)
			{
			var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(dtStock).IncludesAllFirstLayer().ExecuteCommandAsync();
			if (!isStockAdd)
			{
			throw new Exception("库存历史信息添加失败");
			}
			}

			@@ -218,6 +338,15 @@
			}
			}

			private async Task AddTaskHtyAsync(Dt_Task_Hty taskHty)
			{
			var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
			if (!isTaskAdd)
			{
			throw new Exception("历史任务信息添加失败");
			}
			}

			#endregion 出库任务完成

			#region 移库任务完成
			@@ -233,12 +362,12 @@
			try
			{
			// 更新货位和库存信息
			(DtStockInfo updateStock, DtLocationInfo locationInf) = UpdateStockLocation(stock, task.NextAddress);
			(DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
			var taskHty = CreateHistoricalTask(task);
			LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"货位地址：{task.TargetAddress},修改后库存数据：{JsonConvert.SerializeObject(updateStock)}，原先货位数据：{locationInf}");
			LogFactory.GetLog("任务完成").InfoFormat(true, "移库任务完成", $"货位地址：{task.TargetAddress},修改后库存数据：{JsonConvert.SerializeObject(updateStock)}，原先货位数据：{locationInForm}");

			// 执行数据库事务
			bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInf, task.TaskId);
			bool isResult = await ExecuteTransaction(updateStock, taskHty, locationInForm, locationInfoTo, task.TaskId);
			if (isResult)
			content.OK("移库任务完成成功");
			else
			@@ -266,23 +395,56 @@
			WebResponseContent content = new WebResponseContent();
			try
			{
			if (task.TaskType == (int)TaskInboundTypeEnum.InNG \|\| task.TaskType == (int)TaskInboundTypeEnum.InQuality)
			{
			task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
			// 创建历史任务实例模型
			var taskHtyNG = CreateHistoricalTask(task);

			// 执行数据库事务
			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			// 添加历史任务
			var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHtyNG) > 0;

			// 删除任务数据
			var isTaskDelete = await Delete(task.TaskId);
			if (!isTaskHtyAdd \|\| !isTaskDelete)
			throw new Exception("添加失败");
			});
			return content.OK("入库任务完成成功");
			}

			// 获取装箱信息和目标位置信息
			var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
			var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
			var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);

			int lastStatus = locationInf.LocationStatus;
			// 更新目标位置状态为库存中
			locationInf.LocationStatus = (int)LocationEnum.InStock;

			// 创建历史任务实例模型
			var taskHty = CreateHistoricalTask(task);

			if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
			{
			await _locationRepository.UpdateDataAsync(locationInf);
			await _task_HtyRepository.AddDataAsync(taskHty);
			await BaseDal.DeleteDataAsync(task);

			//记录货位变动信息
			_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);

			return content.OK("入库任务完成成功");
			}
			// 根据是否有组盘信息创建库存实例模型
			DtStockInfo stock = boxing == null ? CreateEmptyPalletStock(task, locationInf) : CreateFullPalletStock(task, locationInf, boxing);

			// 执行数据库事务
			bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId);
			bool isResult = await ExecuteTransaction(stock, taskHty, locationInf, task.TaskId, boxing);
			if (isResult)
			{
			_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
			content.OK("入库任务完成成功");
			}
			else
			@@ -314,13 +476,42 @@
			CreateDate = DateTime.Now,
			Creater = "system",
			IsFull = false,
			AreaCode = area.AreaCode,
			AreaCode = area.AreaCode ?? "",
			LocationId = loation.Id,
			ProductionLine = task.ProductionLine,
			StockInfoDetails = new List<DtStockInfoDetail>()
			{
			new DtStockInfoDetail()
			{
			MaterielCode = "空托盘",
			Id = 0,
			Status = (int)StockStateEmun.已入库
			}
			}
			};
			}

			/// <summary>
			/// 创建分容的实托盘的库存实例模型
			/// </summary>
			private DtStockInfo CreateFullPalletStockByFR(Dt_Task task, DtLocationInfo locationInf)
			{
			var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
			var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
			return new DtStockInfo()
			{
			PalletCode = task.PalletCode,
			LocationCode = task.TargetAddress,
			CreateDate = DateTime.Now,
			Creater = "system",
			IsFull = false,
			AreaCode = area.AreaCode ?? "",
			LocationId = loation.Id,
			StockInfoDetails = new List<DtStockInfoDetail>()
			{
			new DtStockInfoDetail()
			{
			MaterielCode = "实托盘",
			Id = 0,
			Status = (int)StockStateEmun.已入库
			}
			@@ -336,9 +527,33 @@
			var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
			if (loation == null)
			throw new Exception("未找到对应位置信息");
			var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
			if (area == null)
			throw new Exception("未找到对应区域信息");

			var area = new Dt_AreaInfo();
			if (task.Roadway.Contains("FR"))
			{
			area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
			}
			else
			{
			//var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
			//if (station.stationPLC == "1017")
			// area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
			//else
			// area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
			//if (area == null)
			// throw new Exception("未找到对应区域信息");

			if (boxing.ProcessCode == "OCV1")
			area = _areaInfoRepository.QueryFirst(x => x.AreaID == 6);
			else if (boxing.ProcessCode == "OCVB")
			area = _areaInfoRepository.QueryFirst(x => x.AreaID == 7);
			else
			area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);

			if (area == null)
			throw new Exception("未找到对应区域信息");
			}

			var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
			boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });
			var stock = new DtStockInfo()
			@@ -351,26 +566,51 @@
			AreaCode = area.AreaCode,
			LocationId = loation.Id,
			StockInfoDetails = boxDetail,
			ProcessCode = boxing.ProcessCode,
			NextProcessCode = boxing.NextProcessCode,
			Remark = boxing.BoxingInfoDetails.Count().ToString(),
			};

			// 处理请求参数
			AgingInputDto agingInputDto = new AgingInputDto()
			if (boxing.ProcessCode != "OCVB" && !task.Roadway.Contains("FR"))
			{
			SerialNos = boxing.BoxingInfoDetails
			.Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
			.ToList(),
			TrayBarcode = task.PalletCode,
			OpFlag = 1,
			EquipmentCode = area.Spare2,
			Software = area.Spare3
			};
			var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
			var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
			stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
			stock.SpecialParameterDuration = respone.SpecialParameterDuration;
			//2024年11月16日：新增字段计算应出库时间
			stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
			stock.ProductionLine = respone.ProductionLine;
			// 处理请求参数
			AgingInputDto agingInputDto = new AgingInputDto()
			{
			SerialNos = boxing.BoxingInfoDetails
			.Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
			.ToList(),
			TrayBarcode = task.PalletCode,
			OpFlag = 1,
			EquipmentCode = area.Spare2,
			Software = area.Spare3
			};

			var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
			var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());

			bool isFull = false;
			if (!task.Roadway.Contains("FR"))
			{
			isFull = respone.SpecialParameterDuration.IsNullOrEmpty();
			}
			if (respone.ProductionLine == null \|\| respone.ParameterInfos == null)
			{
			throw new Exception("MOM数据返回错误");
			}
			stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
			stock.SpecialParameterDuration = respone.SpecialParameterDuration;
			//2024年11月16日：新增字段计算应出库时间
			stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime == null ? DateTime.Now : respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
			stock.ProductionLine = respone.ProductionLine;
			stock.ParameterInfos = respone.ParameterInfos.ToJsonString();
			stock.StockStatus = 1;
			}
			else
			{
			stock.OutboundTime = DateTime.Now;
			stock.StockStatus = 1;
			stock.ProductionLine = boxing.ProductionLine;
			}

			// 记录日志
			LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");
			@@ -403,6 +643,10 @@
			}
			LogFactory.GetLog("任务完成").InfoFormat(true, "验证任务是否存在", JsonConvert.SerializeObject(task));

			if (task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
			{
			return await CompleteInToOutTaskAsync(task);
			}
			// 验证库存是否存在
			var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);

			@@ -411,13 +655,19 @@
			{
			case (int)TaskInboundTypeEnum.Inbound:
			case (int)TaskInboundTypeEnum.InTray:
			case (int)TaskInboundTypeEnum.InNG:
			case (int)TaskInboundTypeEnum.InQuality:
			LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务", "");
			return await CompleteInboundTaskAsync(task);

			case (int)TaskOutboundTypeEnum.OutTray:
			case (int)TaskOutboundTypeEnum.Outbound:
			case (int)TaskOutboundTypeEnum.OutNG:
			LogFactory.GetLog("任务完成").InfoFormat(true, "出库任务", "");
			return await CompleteStackTaskAsync(task, stock);

			case (int)TaskRelocationTypeEnum.Relocation:
			return await CompleteTransferTaskAsync(task, stock);

			default:
			return content.Error("任务类型不存在");
			@@ -428,12 +678,14 @@

			#region 请求任务入库

			#region

			/// <summary>
			/// 请求任务巷道
			/// </summary>
			/// <param name="input">请求模型</param>
			/// <returns>包含任务信息的响应内容</returns>
			public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
			public async Task<WebResponseContent> RequestTaskAsync2(RequestTaskDto input)
			{
			// 创建一个WebResponseContent对象
			WebResponseContent content = new WebResponseContent();
			@@ -463,6 +715,12 @@
			}
			}

			var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
			if (stock != null)
			{
			// TODO质检回库
			}

			var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
			if (area == null)
			return content.Error("改点位不在区域列表中存在");
			@@ -472,8 +730,8 @@
			{
			Software = area.Spare3,
			TrayBarcode = input.PalletCode,
			//EquipmentCode = "EQ_CWJZ01"
			EquipmentCode = area.Spare2
			EquipmentCode = area.Spare2,
			SceneType = area.Spare4,
			};

			// 调用GetTrayCellStatusAsync方法，获取整盘电芯
			@@ -484,46 +742,165 @@
			// 添加组盘信息
			// 将content.Data转换为ResultTrayCellsStatus对象
			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			if (result.SerialNos.Count <= 0)
			if (!result.Success)
			return content.Error(result.MOMMessage);

			// TODO 获取本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
			//var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
			//if (productions.Count <= 0)
			// return content.Error("料框属性不存在");
			// 获取异常电芯
			List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
			if (serialNosError.Count > 0)
			{
			// TODO 创建任务送至NG排出口
			var efg = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
			//List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
			if (efg.Count <= 0)
			{
			throw new Exception("未找到NG入库站台配置");
			}
			List<string> NGStation = efg.Select(x => x.stationNGLocation).ToList();
			if (NGStation.Count <= 0)
			{
			NGStation = efg.Select(x => x.stationNGChildCode).ToList();
			}
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
			return content.Error("存在异常电芯");
			}

			// 调用CreateBoxingInfo方法，创建组盘信息
			if (result.SerialNos.Count <= 0)
			{
			// Todo 空托盘入库逻辑
			content = await RequestTrayInTaskAsync(input);
			return content;
			}

			var boxing = await CreateBoxingInfo(result, input.PalletCode);
			var boxing = CreateBoxingInfo(result, input.PalletCode);
			//Console.WriteLine(boxing.ToJsonString());
			if (boxing == null) return content.Error("组盘失败");

			// 调用GetProcessApplyAsync方法，获取工艺路线
			ProcessApplyDto process = await GetProcessApplyAsync(result);

			// 如果process为null，则返回content
			if (process == null) return content;

			// 并赋值上位软件名称和设备编码
			process.Software = area.Spare3;
			process.EquipmentCode = area.Spare2;

			// 调用GetProcessApplyAsync方法，获取工艺申请

			// 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请
			content = await _processApplyService.GetProcessApplyAsync(process);

			// 如果状态为false，则返回null
			if (!content.Status) return content.Error("工艺申请失败");

			//// 调用GetProcessResponseAsync方法，获取工艺响应
			//var processResponse = await GetProcessResponseAsync(process, input.Position);

			List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
			// 调用CreateNewTask方法，创建新任务
			content = await CreateNewTask(input, strings);
			if (content.Status)
			if (result.ProcessCode == "OCVB")
			{
			var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
			//TODO 判断需不需要去包装，不需要就去常温三
			var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache");
			var station = stationManagers.Select(x => x.stationChildCode).ToList();

			// 获取WCSip地址
			var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wcsBasez = configz.Where(x => x.ConfigKey == SysConfigConst.WCSIPAddress).FirstOrDefault()?.ConfigValue;
			var address = configz.Where(x => x.ConfigKey == SysConfigConst.GetStation).FirstOrDefault()?.ConfigValue;
			if (wcsBasez == null \|\| address == null)
			{
			throw new InvalidOperationException("WCS IP 未配置");
			}
			var wcsIpAddrss = wcsBasez + address;

			var abc = HttpHelper.PostAsync(wcsIpAddrss, station.ToJsonString()).Result;
			content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
			if (content.Data.ObjToInt() > 0)
			{
			// TODO 送至包装
			List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
			return content;
			}
			else
			{
			var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
			var strings = config.ConfigValue.Split(',').ToList();
			// TODO 入库
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
			if (content.Status)
			await _boxingInfoRepository.AddDataNavAsync(boxing);
			}
			}
			else
			{
			// TODO 获取本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
			//var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
			//if (productions.Count <= 0)
			// return content.Error("料框属性不存在");

			// 调用CreateBoxingInfo方法，创建组盘信息

			//var boxing = CreateBoxingInfo(result, input.PalletCode);
			////Console.WriteLine(boxing.ToJsonString());
			//if (boxing == null) return content.Error("组盘失败");

			// 调用GetProcessApplyAsync方法，获取工艺路线
			ProcessApplyDto process = await GetProcessApplyAsync(result);

			// 如果process为null，则返回content
			if (process == null) return content;

			// 并赋值上位软件名称和设备编码
			process.Software = area.Spare3;
			process.EquipmentCode = area.Spare2;

			// 调用GetProcessApplyAsync方法，获取工艺申请

			// 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请
			content = await _processApplyService.GetProcessApplyAsync(process);

			// 如果状态为false，则返回null
			if (!content.Status) return content.Error("工艺申请失败");

			var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
			if (!resultProcessApply.Success) return content.Error("工艺申请失败");

			var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32();
			foreach (var item in resultProcessApply.ProcessInfo)
			{
			if (item.Number.ToInt32() == number + 1)
			{
			boxing.NextProcessCode = item.ProcessCode;
			}
			}
			Console.WriteLine();
			Console.WriteLine($"当前工序：{boxing.ProcessCode}");
			Console.WriteLine($"下一工序：{boxing.NextProcessCode}");

			Console.WriteLine(area.AreaCode + "-----------------------");
			Console.WriteLine(input.Position + "-----------------------");

			var areaIn = string.Empty;
			switch (boxing.NextProcessCode)
			{
			case "CH01":
			areaIn = "CH001";
			break;

			case "JZ01":
			areaIn = "JZ001";
			break;

			case "GW01":
			areaIn = "GWSC1";
			break;

			case "CW01":
			areaIn = "CWSC1";
			break;

			case "CW02":
			areaIn = "CWSC2";
			break;

			default:
			break;
			}

			var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea.Contains(areaIn)).FirstOrDefault();
			if (stationManagers == null)
			{
			throw new Exception("未找到入库站台配置");
			}
			List<string> strings = stationManagers.Roadway.Split(',').ToList();
			Console.WriteLine(strings.ToJsonString() + "b-----------------------");
			//// 调用CreateNewTask方法，创建新任务
			content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
			if (content.Status)
			{
			var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
			}
			//}
			}
			}
			catch (Exception err)
			@@ -534,6 +911,131 @@
			}

			// 返回content
			return content;
			}

			#endregion 请求任务入库

			public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
			{
			WebResponseContent content = new WebResponseContent();

			try
			{
			// 查询任务
			var task = await QueryTaskByPalletCode(input.PalletCode);
			if (task != null)
			{
			return CreateAndReturnWMSTaskDTO(task);
			}

			// 查询库存信息（这里后续要完善质检回库逻辑）
			var stock = await QueryStockInfo(input.PalletCode);
			if (stock != null)
			{
			Dt_Task taskNew = new Dt_Task
			{
			Grade = 1,
			Roadway = stock.LocationInfo.RoadwayNo,
			TargetAddress = stock.LocationInfo.RoadwayNo,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = stock.LocationInfo.RoadwayNo,
			OrderNo = null,
			PalletCode = stock.PalletCode,
			SourceAddress = input.Position,
			CurrentAddress = input.Position,
			TaskState = stock.LocationInfo.RoadwayNo.Contains("CH") ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.Line_InFinish,
			TaskType = (int)TaskInboundTypeEnum.InQuality,
			TaskNum = BaseDal.GetTaskNo().Result,
			Creater = "System", // 修正拼写错误
			CreateDate = DateTime.Now,
			TaskId = 0,
			ProductionLine = stock.ProductionLine,
			ProcessCode = stock.ProcessCode,
			};

			var taskDTO = CreateTaskDTO(taskNew);
			BaseDal.AddData(taskNew);
			return content.OK(data: taskDTO);
			// TODO质检回库
			}

			// 根据位置查询区域信息
			var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
			var area = await QueryAreaInfoByPosition(areaCode);
			if (area == null)
			{
			return content.Error("该点位不在区域列表中存在");
			}

			// 创建并获取整盘电芯状态
			TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
			content = await GetTrayCellStatusAsync(trayCells);
			if (!content.Status)
			{
			ConsoleHelper.WriteErrorLine($"获取电芯状态失败:{content.Message}");
			return content;
			}

			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());

			if (!result.Success)
			{
			ConsoleHelper.WriteErrorLine($"获取电芯状态失败:{result.MOMMessage}");
			if (result.SerialNos.Count <= 0)
			{
			// 空托盘入库逻辑
			var staion = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position && x.stationType == 1 && x.remark == "IN");
			if (staion != null)
			{
			return await HandleErrorCells(input, area);
			}
			else
			{
			return await RequestTrayInTaskAsync(input);
			}
			}
			else
			return content.Error(result.MOMMessage);
			}


			if (result.SerialNos.Count <= 0)
			{
			var config = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.InboundIsEmpty);
			var strings = config.ConfigValue.Split(',').ToList();
			if (strings.Contains(input.Position))
			{
			// todo送至NG口
			ConsoleHelper.WriteErrorLine($"当前位置不能入空托盘");
			return content.Error("当前位置不能入空托盘");
			}
			else
			return await RequestTrayInTaskAsync(input);
			}
			else
			{
			// 处理异常电芯情况
			var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
			if (serialNosError.Count > 0)
			{
			return await HandleErrorCells(input, area, serialNosError);
			}

			var boxing = CreateBoxingInfo(result, input.PalletCode);
			if (boxing == null) return content.Error("组盘失败");

			return await ProcessBasedOnProcessCode(boxing, area, input, result);
			}
			}
			catch (Exception err)
			{
			// 更详细的异常处理，可以根据异常类型记录不同的错误日志等
			content.Error(err.Message);
			Console.WriteLine(err.Message);
			}

			return content;
			}

			@@ -552,12 +1054,10 @@
			return content.Error($"暂未找到【{input.PalletCode}】的任务");

			return content = await UpdateExistingTask(input, task);

			}
			catch (Exception err)
			{

			throw;
			return content.Error(err.Message);
			}
			}

			@@ -571,36 +1071,65 @@
			WebResponseContent content = new WebResponseContent();
			try
			{

			// 调用BaseDal.QueryFirstAsync方法，查询任务
			var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
			if (task != null && task.TaskState == (int)TaskInStatusEnum.InNew)
			{
			// 创建WMS任务
			WMSTaskDTO taskDTO = new WMSTaskDTO()
			{
			TaskNum = task.TaskNum.Value,
			Grade = 1,
			PalletCode = task.PalletCode,
			RoadWay = task.Roadway,
			SourceAddress = task.SourceAddress,
			TargetAddress = task.Roadway,
			TaskState = task.TaskState.Value,
			Id = 0,
			TaskType = task.TaskType,
			};
			WMSTaskDTO taskDTO = CreateTaskDTO(task);
			//WMSTaskDTO taskDTO = new WMSTaskDTO()
			//{
			// TaskNum = task.TaskNum.Value,
			// Grade = 1,
			// PalletCode = task.PalletCode,
			// RoadWay = task.Roadway,
			// SourceAddress = task.SourceAddress,
			// TargetAddress = task.Roadway,
			// TaskState = task.TaskState.Value,
			// Id = 0,
			// TaskType = task.TaskType,
			//};
			return content.OK(data: task);
			}

			// 获取目标地址
			List<string> strings = input.Position == "1016" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
			// 根据位置查询区域信息
			var areaCode = Regex.Replace(input.Position, @"-(\d+)", "");
			var area = await QueryAreaInfoByPosition(areaCode);
			if (area == null)
			{
			return content.Error("该点位不在区域列表中存在");
			}

			return await CreateNewTask(input, strings, 1);
			//return await CreateNewTask(input, null, 1);
			// 获取整盘电芯属性状态
			TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
			content = await GetTrayCellStatusAsync(trayCells);
			if (!content.Status)
			{
			ConsoleHelper.WriteErrorLine($"获取电芯状态失败:{content.Message}");
			return content;
			}

			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			if (result.ProductionLine.IsNullOrEmpty())
			{
			ConsoleHelper.WriteErrorLine($"当前托盘无产线,联系MOM添加产线");
			return content.Error("当前托盘无产线,联系MOM添加产线");
			}


			var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
			if (stationManagers == null)
			{
			stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position).FirstOrDefault();
			if (stationManagers == null)
			throw new Exception("未找到空托盘入库站台和入库站台配置");
			}
			List<string> strings = stationManagers.Roadway.Split(',').ToList();

			return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
			}
			catch (Exception)
			{

			throw;
			}
			}
			@@ -613,12 +1142,14 @@
			}

			// 获取组盘信息
			private async Task<DtBoxingInfo> CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
			private DtBoxingInfo CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
			{
			return new DtBoxingInfo
			{
			PalletCode = palletCode,
			IsFull = true,
			ProcessCode = result.ProcessCode,
			ProductionLine = result.ProductionLine,
			BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
			{
			SerialNumber = serialNoObj.SerialNo,
			@@ -644,39 +1175,7 @@
			};
			}

			// 获取工艺响应
			private async Task<List<Dt_EquipmentProcess>> GetProcessResponseAsync(ProcessApplyDto process, string position)
			{
			// 如果process为null，则返回null
			if (process == null) return null;

			// 调用_processApplyService.GetProcessApplyAsync方法，获取工艺申请
			WebResponseContent content = await _processApplyService.GetProcessApplyAsync(process);
			// 如果状态为false，则返回null
			if (!content.Status) return null;

			// 将content.Data转换为ResultProcessApply对象
			var apply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
			// 根据position的值，返回不同的Dt_EquipmentProcess列表
			switch (position)
			{
			case "1088":
			return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
			.Where(x => x.EquipmentType == "陈化" && x.WipOrderNo == apply.WipOrderNo \|\| x.ProductDesc == apply.ProductNo)
			.ToList();

			case "1339":
			case "1406":
			return SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
			.Where(x => x.EquipmentType == "静置" && x.WipOrderNo == apply.WipOrderNo \|\| x.ProductDesc == apply.ProductNo)
			.ToList();

			default:
			return new List<Dt_EquipmentProcess>();
			}
			}

			#endregion 请求任务入库
			#endregion 外部接口方法

			#region 请求出库（实盘&空盘）

			@@ -688,27 +1187,30 @@
			/// <param name="areaCode">区域编码</param>
			/// <param name="roadways">巷道编码集合</param>
			/// <returns>返回结果集</returns>
			public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> roadways)
			public async Task<WebResponseContent> RequestTrayOutTaskAsync(string position, int tag, string areaCode, List<string> areaCodes, string productionLine)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			// 根据托盘类型查询库存信息
			DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
			? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
			: QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
			? areaCode != "CWSC1" ? await QueryStockInfoForRealTrayAsync(areaCode, areaCodes, productionLine) : await QueryStockInfoForRealTrayCWAsync(areaCodes, productionLine)
			: await QueryStockInfoForEmptyTrayAsync(areaCode, position);

			if (stockInfo == null)
			{
			return content.Error("库存信息不存在");
			}

			//ConsoleHelper.WriteColorLine(JsonConvert.SerializeObject(stockInfo), ConsoleColor.DarkMagenta);


			// 新增重复任务校验
			var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
			if (hasTask != null)
			{
			WMSTaskDTO taskDTO1 = CreateTaskDTO(hasTask);
			return content.OK("已存在空盘出库任务", data: taskDTO1);
			return content.OK("已存在出库任务", data: taskDTO1);
			}

			// 创建新任务实例
			@@ -736,6 +1238,7 @@
			{
			// 记录异常信息并抛出
			LogFactory.GetLog("请求托盘任务").Error(true, ex);
			ConsoleHelper.WriteErrorLine("请求空/实托盘任务" + ex.Message);
			return content.Error(ex.Message);
			}
			}
			@@ -743,7 +1246,7 @@
			/// <summary>
			/// 查询实盘库存信息
			/// </summary>
			private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
			private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
			{
			var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);

			@@ -751,7 +1254,43 @@
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件
			.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件
			.WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
			.OrderBy(x => x.OutboundTime) // 排序
			.FirstAsync(); // 获取第一个元素

			//var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 查找第一个匹配的元素
			//var firstOrDefault = result[0]; // 查找第一个匹配的元素
			//return firstOrDefault;
			return result;
			}

			/// <summary>
			/// 查询常温实盘库存信息
			/// </summary>
			private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
			{
			var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
			if (areaId.Count == 0)
			{
			ConsoleHelper.WriteErrorLine($"查询常温实盘库存信息时,未找到区域代码为{JsonConvert.SerializeObject(areaCodes)}的数据");
			return null;
			}

			var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
			.Where(x => x.DeviceStatus == "1")
			.Where(x => x.DeviceRemark == "1")
			.ToList();
			var deviceCode = devices.Select(x => x.DeviceCode).ToList();

			var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件
			.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件
			.WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
			.OrderBy(x => x.OutboundTime) // 排序
			.FirstAsync(); // 获取第一个元素

			@@ -764,16 +1303,32 @@
			/// <summary>
			/// 查询空盘库存信息
			/// </summary>
			private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
			private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, string position)
			{
			var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);

			ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
			var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);

			ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
			var stackers = station.Roadway.Split(',').ToList();


			var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
			.Where(x => x.DeviceStatus == "1")
			.Where(x => stackers.Contains(x.DeviceCode))
			.ToList();

			var deviceCode = devices.Select(x => x.DeviceCode).ToList();

			var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => x.ProductionLine == station.productLine)
			.Where(x => x.AreaCode == areaCode && x.IsFull == false)
			.Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "空托盘"))
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件
			.WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
			.OrderBy(x => x.CreateDate) // 排序
			.FirstAsync(); // 转换为列表

			@@ -789,7 +1344,7 @@
			{
			return new Dt_Task
			{
			Grade = 1,
			Grade = tag == 104 ? (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 1 : 2) : (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 2 : 1),
			Roadway = stockInfo.LocationInfo.RoadwayNo,
			TargetAddress = position,
			Dispatchertime = DateTime.Now,
			@@ -800,9 +1355,13 @@
			SourceAddress = stockInfo.LocationCode,
			CurrentAddress = stockInfo.LocationCode,
			TaskState = (int)TaskOutStatusEnum.OutNew,
			TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
			TaskType = tag,
			TaskNum = BaseDal.GetTaskNo().Result,
			Creater = "System" // 修正拼写错误
			Creater = "System", // 修正拼写错误
			CreateDate = DateTime.Now,
			TaskId = 0,
			ProductionLine = stockInfo.ProductionLine,
			ProcessCode = stockInfo.ProcessCode,
			};
			}

			@@ -814,7 +1373,7 @@
			return new WMSTaskDTO
			{
			TaskNum = task.TaskNum.Value,
			Grade = 1,
			Grade = task.Grade.Value,
			PalletCode = task.PalletCode,
			RoadWay = task.Roadway,
			SourceAddress = task.SourceAddress,
			@@ -822,10 +1381,11 @@
			TaskState = task.TaskState.Value,
			Id = 0,
			TaskType = task.TaskType,
			ProductionLine = task.ProductionLine,
			};
			}

			#endregion 请求出库
			#endregion 请求出库（实盘&空盘）

			#region 任务状态更改

			@@ -844,7 +1404,7 @@
			if (task == null)
			return content.Error("未找到任务");

			if (taskState == (int)TaskOutStatusEnum.Line_OutFinish \|\| taskState == (int)TaskOutStatusEnum.SC_OutFinish)
			if (taskState == (int)TaskOutStatusEnum.Line_OutFinish \|\| taskState == (int)TaskInStatusEnum.SC_InFinish)
			{
			var taskHty = CreateHistoricalTask(task);
			await _unitOfWorkManage.UseTranAsync(async () =>
			@@ -875,36 +1435,419 @@
			return content;
			}

			#endregion
			#endregion 任务状态更改

			#region 出库解盘
			#region 指定任务出库

			/// <summary>
			/// 出库解盘接口
			/// </summary>
			/// <param name="taskNum"></param>
			/// <returns></returns>
			public async Task<WebResponseContent> OutUnblockInterface(int taskNum)
			public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
			if (task == null)
			return content.Error("未找到任务");
			task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
			var taskHty = CreateHistoricalTask(task);
			// 查询库存信息
			var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.LocationCode == locationCode && x.PalletCode == palletCode);
			if (stockInfo == null)
			{
			return content.Error("未查询到对应的库存信息");
			}
			if (stockInfo.LocationInfo.LocationStatus != (int)LocationEnum.InStock)
			{
			return content.Error("该货位状态不等于【有货】请查看是否已经有任务！");
			}

			var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
			if (task != null)
			{
			return content.Error($"【{palletCode}】已存在任务");
			}

			int taskType = 0;
			if (stockInfo.IsFull)
			taskType = (int)TaskOutboundTypeEnum.OutQuality;
			else
			taskType = (int)TaskOutboundTypeEnum.OutTray;

			if (stockInfo.AreaCode.Contains("CH"))
			{
			// 创建并添加任务到数据库
			task = CreateTask(stockInfo, "1020-1", taskType);
			}
			else
			{
			if (stockInfo.LocationInfo.RoadwayNo.Contains("JZSC"))
			{
			var targetAddress = "002-021-001";
			if (stockInfo.LocationInfo.RoadwayNo == "JZSC4")
			targetAddress = "001-021-001";
			task = CreateTask(stockInfo, targetAddress, taskType);
			}
			}
			//var taskId = await BaseDal.AddDataAsync(task);
			//if (taskId <= 0)
			//{
			// return content.Error("任务创建失败");
			//}

			// 创建任务传输用的DTO对象
			var taskDTO = CreateTaskDTO(task);

			// 获取WMS IP地址用于发送任务请求
			var wmsIpAddress = GetWCSIpReceiveTask();
			if (wmsIpAddress == null)
			{
			throw new InvalidOperationException("WMS IP 未配置");
			}

			var tasks = new List<WMSTaskDTO>() { taskDTO };
			// 发送任务请求到WMS
			var result = await HttpHelper.PostAsync(wmsIpAddress, tasks.ToJsonString());
			content = JsonConvert.DeserializeObject<WebResponseContent>(result);
			if (content.Status)
			{
			// 添加任务到数据库
			await BaseDal.AddDataAsync(task);
			// 更新库存位置状态为不可用
			stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
			await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
			}
			}
			catch (Exception ex)
			{
			Console.WriteLine($"发生异常: {ex.Message}");
			content.Error(ex.Message);
			}

			return content;
			}

			private string GetWCSIpReceiveTask()
			{
			var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
			var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
			if (wmsBase == null \|\| ipAddress == null)
			{
			return null;
			}
			return wmsBase + ipAddress;
			}

			#endregion 指定任务出库

			#region 静置异常口入库

			public async Task<WebResponseContent> CreateAndSendInboundTask(string palletCode, string position)
			{
			#region
			//WebResponseContent content = new WebResponseContent();
			//try
			//{
			// // 查询库存信息
			// var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
			// if (stockInfo == null)
			// {
			// var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
			// if (!taskOld.IsNullOrEmpty())
			// {// 创建WMS任务
			// WMSTaskDTO taskDTO = new WMSTaskDTO()
			// {
			// TaskNum = taskOld.TaskNum.Value,
			// Grade = 1,
			// PalletCode = taskOld.PalletCode,
			// RoadWay = taskOld.Roadway,
			// SourceAddress = taskOld.CurrentAddress,
			// TargetAddress = taskOld.TargetAddress,
			// TaskState = taskOld.TaskState.Value,
			// Id = 0,
			// TaskType = taskOld.TaskType,
			// };
			// return content.OK(data: taskDTO);
			// }
			// var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
			// var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
			// TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
			// content = await GetTrayCellStatusAsync(trayCells);
			// if (!content.Status) return content;

			// ConsoleHelper.WriteErrorLine(content.ToJsonString());
			// var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			// if (!result.Success) return content.Error(result.MOMMessage);

			// if (result.SerialNos.Count > 0)
			// {
			// var boxing = CreateBoxingInfo(result, palletCode);
			// if (boxing == null) return content.Error("组盘失败");

			// // 获取工艺路线
			// ProcessApplyDto process = await GetProcessApplyAsync(result);
			// // 赋值上位软件名称和设备编码
			// process.Software = area.Spare3;
			// process.EquipmentCode = area.Spare2;
			// content = await _processApplyService.GetProcessApplyAsync(process);
			// if (!content.Status) return content.Error("工艺申请失败");

			// var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
			// if (!resultProcessApply.Success) return content.Error("工艺申请失败");

			// var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault().Number.ToInt32();
			// foreach (var item in resultProcessApply.ProcessInfo)
			// {
			// if (item.Number.ToInt32() == number + 1)
			// {
			// boxing.NextProcessCode = item.ProcessCode;
			// }
			// }
			// var location = await GetLocationDistributeAsync(station.Roadway);

			// ConsoleHelper.WriteErrorLine(location.ToJsonString());

			// // 创建新任务实例
			// var task = new Dt_Task
			// {
			// CurrentAddress = station.stationLocation,
			// Grade = 1,
			// Roadway = station.Roadway,
			// TargetAddress = location.LocationCode,
			// Dispatchertime = DateTime.Now,
			// MaterialNo = "",
			// NextAddress = location.LocationCode,
			// OrderNo = null,
			// PalletCode = palletCode,
			// SourceAddress = position,
			// TaskState = (int)TaskInStatusEnum.Line_InFinish,
			// TaskType = (int)TaskInboundTypeEnum.Inbound,
			// TaskNum = await BaseDal.GetTaskNo(),
			// Creater = "Systeam"
			// };

			// // 创建WMS任务
			// WMSTaskDTO taskDTO = new WMSTaskDTO()
			// {
			// TaskNum = task.TaskNum.Value,
			// Grade = 1,
			// PalletCode = task.PalletCode,
			// RoadWay = task.Roadway,
			// SourceAddress = task.SourceAddress,
			// TargetAddress = task.TargetAddress,
			// TaskState = task.TaskState.Value,
			// Id = 0,
			// TaskType = task.TaskType,
			// };

			// await _unitOfWorkManage.UseTranAsync(async () =>
			// {
			// // 添加任务到数据库
			// await BaseDal.AddDataAsync(task);
			// // 更新库存位置状态为不可用
			// location.LocationStatus = (int)LocationEnum.InStockDisable;
			// await _locationRepository.UpdateDataAsync(location);
			// await _boxingInfoRepository.AddDataNavAsync(boxing);
			// });

			// content.OK(data: taskDTO);
			// }
			// else
			// content.Error(result.MOMMessage);
			// }
			// else
			// {
			// // TODO质检回库
			// var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
			// }
			//}
			//catch (Exception ex)
			//{
			// content.Error(ex.Message);
			//}
			//return content;
			#endregion
			WebResponseContent content = new WebResponseContent();
			try
			{
			// 查询库存信息
			var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == palletCode);
			if (stockInfo == null)
			{
			var taskOld = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
			if (taskOld != null)
			{
			// 创建WMS任务
			WMSTaskDTO taskDTO = CreateWMSTaskDTO(taskOld);
			return content.OK(data: taskDTO);
			}
			var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
			var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == position);
			TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, palletCode);
			content = await GetTrayCellStatusAsync(trayCells);
			if (!content.Status) return content;

			ConsoleHelper.WriteErrorLine(content.ToJsonString());
			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			if (result == null \|\| !result.Success) return content.Error(result?.MOMMessage ?? "Deserialization error");

			if (result.SerialNos.Count > 0)
			{
			var boxing = CreateBoxingInfo(result, palletCode);
			if (boxing == null) return content.Error("组盘失败");

			// 获取工艺路线
			ProcessApplyDto process = await GetProcessApplyAsync(result);
			// 赋值上位软件名称和设备编码
			process.Software = area.Spare3;
			process.EquipmentCode = area.Spare2;

			content = await _processApplyService.GetProcessApplyAsync(process);
			if (!content.Status) return content.Error("工艺申请失败");

			var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString()) as ResultProcessApply;
			if (resultProcessApply == null \|\| !resultProcessApply.Success) return content.Error("工艺申请失败");

			var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault()?.Number.ToInt32() ?? 0;
			foreach (var item in resultProcessApply.ProcessInfo)
			{
			if (item.Number.ToInt32() == number + 1)
			{
			boxing.NextProcessCode = item.ProcessCode;
			}
			}
			var location = await GetLocationDistributeAsync(station.Roadway);

			ConsoleHelper.WriteErrorLine(location.ToJsonString());

			// 创建新任务实例
			var task = new Dt_Task
			{
			CurrentAddress = station.stationLocation,
			Grade = 1,
			Roadway = station.Roadway,
			TargetAddress = location.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = location.LocationCode,
			OrderNo = null,
			PalletCode = palletCode,
			SourceAddress = position,
			TaskState = (int)TaskInStatusEnum.Line_InFinish,
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine,
			ProcessCode=result.ProcessCode,
			};

			// 创建WMS任务
			WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);

			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			// 添加任务到数据库
			await BaseDal.AddDataAsync(task);
			// 更新库存位置状态为不可用
			location.LocationStatus = (int)LocationEnum.Lock;
			await _locationRepository.UpdateDataAsync(location);
			await _boxingInfoRepository.AddDataNavAsync(boxing);
			});

			content.OK(data: taskDTO);
			}
			else
			{
			var location = await GetLocationDistributeAsync(station.Roadway);
			var task = new Dt_Task
			{
			CurrentAddress = station.stationLocation,
			Grade = 1,
			Roadway = station.Roadway,
			TargetAddress = location.LocationCode,
			Dispatchertime = DateTime.Now,
			MaterialNo = "",
			NextAddress = location.LocationCode,
			OrderNo = null,
			PalletCode = palletCode,
			SourceAddress = position,
			TaskState = (int)TaskInStatusEnum.Line_InFinish,
			TaskType = (int)TaskInboundTypeEnum.InTray,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine,
			ProcessCode = result.ProcessCode,
			};
			// 创建WMS任务
			WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);

			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			// 添加任务到数据库
			await BaseDal.AddDataAsync(task);
			// 更新库存位置状态为不可用
			location.LocationStatus = (int)LocationEnum.Lock;
			await _locationRepository.UpdateDataAsync(location);
			});

			content.OK(data: taskDTO);
			}
			}
			else
			{
			// TODO质检回库
			var area = _areaInfoRepository.QueryFirst(x => x.AreaID == 2);
			}
			}
			catch (Exception ex)
			{
			// 更详细的日志记录，可使用日志框架替换 Console.WriteLine
			Console.WriteLine($"Error in CreateAndSendInboundTask: {ex.Message}");
			content.Error(ex.Message);
			}
			return content;
			}

			#endregion

			private WMSTaskDTO CreateWMSTaskDTO(object source)
			{
			if (source is Dt_Task taskOld)
			{
			return new WMSTaskDTO()
			{
			TaskNum = taskOld.TaskNum.Value,
			Grade = 1,
			PalletCode = taskOld.PalletCode,
			RoadWay = taskOld.Roadway,
			SourceAddress = taskOld.SourceAddress,
			TargetAddress = taskOld.TargetAddress,
			TaskState = taskOld.TaskState.Value,
			Id = 0,
			TaskType = taskOld.TaskType,
			ProductionLine = taskOld.ProductionLine
			};
			}
			else if (source is Dt_Task task)
			{
			return new WMSTaskDTO()
			{
			TaskNum = task.TaskNum.Value,
			Grade = 1,
			PalletCode = task.PalletCode,
			RoadWay = task.Roadway,
			SourceAddress = task.SourceAddress,
			TargetAddress = task.TargetAddress,
			TaskState = task.TaskState.Value,
			Id = 0,
			TaskType = task.TaskType,
			ProductionLine = task.ProductionLine
			};
			}
			else
			{
			throw new ArgumentException("Invalid source object type for WMSTaskDTO creation.");
			}
			}

			#endregion 静置异常口入库

			#endregion 外部接口方法



			#region 内部调用方法

			@@ -946,6 +1889,35 @@
			public async Task<bool> Delete(List<int> ids)
			{
			return await BaseDal.Delete(ids);
			}

			public override WebResponseContent DeleteData(object[] key)
			{
			WebResponseContent content = new WebResponseContent();
			// 创建历史任务实例模型
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key[0]));
			if (task == null)
			{
			return content.Error("未找到任务信息!");
			}
			var taskHtyNG = CreateHistoricalTask(task, true);

			// 执行数据库事务

			// 添加历史任务
			var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0;

			// 删除任务数据
			var isTaskDelete = BaseDal.Delete(task.TaskId);

			return content.OK("删除成功!");
			}
			catch (Exception ex)
			{
			return content.Error("删除任务异常：" + ex.Message);
			}
			}

			/// <summary>
			@@ -1053,44 +2025,11 @@
			#region private 内部方法

			/// <summary>
			/// 更新出库订单和库存信息
			/// </summary>
			/// <param name="stock">库存实例</param>
			/// <param name="barCode">条码</param>
			/// <returns>更新后的订单和库存信息</returns>
			private async Task<Dt_OutOrderAndStock> UpdateOrderAndStockAsync(DtStockInfo stock, string barCode)
			{
			//根据PalletCode获取订单和库存信息
			var orderStock = await _outOrderAndStockRepository.GetOrderAndStock(palletCode: barCode);

			//完成数量增加
			orderStock.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);

			//订单详情完成数量增加
			orderStock.OrderList.OrderDetailList.CompletedQuantity += stock.StockInfoDetails.Sum(x => x.StockQuantity);

			//返回更新后的订单和库存信息
			return orderStock;
			}

			/// <summary>
			/// 判断订单是否完成
			/// </summary>
			/// <param name="orderStock">订单和库存信息</param>
			/// <returns>是否完成</returns>
			// 判断订单是否完成
			private bool IsOrderComplete(Dt_OutOrderAndStock orderStock)
			{
			// 如果出库数量等于完成出库数量，则订单完成
			return orderStock.CompletedQuantity == orderStock.OutboundQuantity;
			}

			/// <summary>
			/// 创建历史任务记录
			/// </summary>
			/// <param name="task"></param>
			/// <returns></returns>
			private Dt_Task_Hty CreateHistoricalTask(Dt_Task task)
			private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false)
			{
			// 更新任务状态
			task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
			@@ -1100,8 +2039,12 @@
			var taskHty = _mapper.Map<Dt_Task_Hty>(task);
			taskHty.FinishTime = DateTime.Now;
			taskHty.TaskId = 0;
			taskHty.OperateType = (int)OperateTypeEnum.自动完成;
			taskHty.OperateType = isHand ? (int)OperateTypeEnum.人工删除 : (int)OperateTypeEnum.自动完成;
			taskHty.SourceId = task.TaskId;
			if (isHand)
			{
			taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
			}
			taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
			return taskHty;
			}
			@@ -1112,20 +2055,19 @@
			/// <param name="stock">库存对象</param>
			/// <param name="toLocation">目标位置</param>
			// 更新库存和位置信息
			private (DtStockInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, string toLocation)
			private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
			{
			// 获取库存信息
			var locationInfo = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
			// 将库存状态设置为在库
			locationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
			//修改来源库位和目标库位状态
			var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
			fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
			var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
			toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();

			// 将库存位置设置为目标位置
			stock.LocationCode = toLocation;
			// 将库存状态设置为在库
			stock.LocationInfo.LocationStatus = LocationEnum.InStock.ObjToInt();
			stock.LocationCode = task.TargetAddress;

			// 返回更新后的库存和位置信息
			return (stock, locationInfo);
			return (stock, fromLocation, toLocation);
			}

			/// <summary>
			@@ -1135,12 +2077,13 @@
			/// <param name="taskHty">历史任务对象</param>
			/// <param name="taskId">任务ID</param>
			/// <returns></returns>
			private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
			private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, DtBoxingInfo boxingInfo = null)
			{
			_unitOfWorkManage.BeginTran();
			try
			{
			var isUpdateStock = true;
			var isDeleteBoxing = true;
			if (taskHty.TaskType == (int)TaskTypeEnum.Outbound)
			{
			// 更新库存
			@@ -1150,9 +2093,28 @@
			{
			// 添加库存
			isUpdateStock = await _stockInfoRepository.AddDataNavAsync(stock);
			if (boxingInfo != null)
			{
			isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxingInfo.Id)
			.Include(x => x.BoxingInfoDetails)
			.ExecuteCommandAsync();
			}
			}


			if (stock.IsFull)
			{
			var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
			if (stocks != null && stocks.Count > 0)
			{
			foreach (var item in stocks)
			{
			item.SpecialParameterDuration = stock.SpecialParameterDuration;
			item.ParameterInfos = stock.ParameterInfos;
			item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
			}
			var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
			}
			}

			// 添加历史任务
			var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
			@@ -1164,7 +2126,7 @@
			var isTaskDelete = await Delete(taskId);

			// 提交或回滚事务
			if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
			if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteBoxing)
			{
			LogFactory.GetLog("任务完成").InfoFormat(true, "任务完成", $"事务处理完成,提交事务。添加历史任务：{isTaskHtyAdd},删除任务数据：{isTaskDelete},更新或添加库存：{isUpdateStock},修改移库前货位状态：{isUpdateLoc}");
			_unitOfWorkManage.CommitTran();
			@@ -1179,7 +2141,7 @@
			}
			catch (Exception err)
			{
			LogFactory.GetLog("任务完成").InfoFormat(true, $"移库任务完成,系统异常，异常信息：{err.Message}", "无参数");
			LogFactory.GetLog("任务完成").InfoFormat(true, $"任务完成,系统异常，异常信息：{err.Message}", "无参数");
			_unitOfWorkManage.RollbackTran();
			throw; // 抛出异常以便外部捕获
			}
			@@ -1187,54 +2149,115 @@

			#region 任务请求方法

			/// <summary>
			/// 更新现有任务
			/// </summary>
			/// <param name="input">请求模型</param>
			/// <param name="areaId">区域ID</param>
			/// <param name="task">任务实例</param>
			/// <param name="content">响应内容</param>
			/// <returns></returns>

			private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
			// 更新任务货位

			private async Task<WebResponseContent> UpdateExistingTask(RequestTaskDto input, Dt_Task task)
			{
			// 创建WebResponseContent对象
			WebResponseContent content = new WebResponseContent();
			// 定义变量
			string toAddress;
			int taskState;
			string original = task.CurrentAddress;
			DtLocationInfo location = new DtLocationInfo();
			int beforeStatus = 0;
			await _semaphoreUpdate.WaitAsync();
			try
			{
			if (task == null)
			{
			return new WebResponseContent().Error("任务对象为空");
			}

			// 处理入库任务
			location = await GetLocationDistributeAsync(task.Roadway);
			toAddress = location.LocationCode;
			taskState = (int)TaskInStatusEnum.Line_InFinish;
			beforeStatus = location.LocationStatus;
			try
			{
			// 创建WebResponseContent对象
			var content = new WebResponseContent();

			// 更新货位信息
			location.LocationStatus = (int)LocationEnum.Lock;
			// 获取目标地址和更新任务状态

			// 更新任务信息
			input.Position = Regex.Replace(input.Position, @"-(\d+)", "");
			if (Convert.ToInt32(input.Position) > 1999)
			{
			input.Position = (Convert.ToInt32(input.Position) - 1000).ToString();
			}

			if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
			{
			// TODO 根据巷道查找对应NG口，现在默认去静置堆垛机的异常口货位号
			task.CurrentAddress = input.Position;
			task.TargetAddress = "002-021-000";
			task.NextAddress = "002-021-000";
			task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
			bool isResult = await BaseDal.UpdateDataAsync(task);
			return content.OK(data: task);
			}
			else if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
			{
			var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode);
			task.CurrentAddress = input.Position;
			task.TargetAddress = stockInfo.LocationInfo.LocationCode;
			task.NextAddress = stockInfo.LocationInfo.LocationCode;
			task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
			bool isResult = await BaseDal.UpdateDataAsync(task);
			return content.OK(data: task);
			}
			else
			{
			var location = await GetLocationDistributeAsync(task.Roadway);
			if (location == null)
			{
			return content.Error("无法获取货位信息");
			}

			string toAddress = location.LocationCode;
			int taskState = (int)TaskInStatusEnum.Line_InFinish;
			int beforeStatus = location.LocationStatus;
			// 更新货位信息
			location.LocationStatus = (int)LocationEnum.Lock;

			// 更新任务信息
			MapTaskProperties(task, input, toAddress, taskState);

			// 开始事务
			var isResult = await UpdateTaskAsync(task, location, beforeStatus);
			if (!isResult)
			{
			_unitOfWorkManage.RollbackTran();
			return content.Error("更新任务失败");
			}

			// 提交事务
			_unitOfWorkManage.CommitTran();
			return content.OK(data: task);
			}
			}
			catch (Exception ex)
			{
			// 回滚事务
			_unitOfWorkManage.RollbackTran();
			// 这里可以添加日志记录
			return new WebResponseContent().Error($"更新任务时发生错误: {ex.Message}");
			}
			}
			catch (Exception)
			{

			throw;
			}
			finally { _semaphoreUpdate.Release(); }
			}

			private void MapTaskProperties(Dt_Task task, RequestTaskDto input, string toAddress, int taskState)
			{
			task.CurrentAddress = input.Position;
			task.TargetAddress = toAddress;
			task.NextAddress = toAddress;
			task.TaskState = taskState;
			}

			// 开始事务
			_unitOfWorkManage.BeginTran();
			// 定义变量
			bool isUpdateLo = true;
			bool isUpdateChange = true;

			// 尝试更新任务
			// 修改任务
			private async Task<bool> UpdateTaskAsync(Dt_Task task, DtLocationInfo location, int beforeStatus)
			{
			bool isResult = await BaseDal.UpdateDataAsync(task);
			bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, original, input.Position, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));
			bool isTaskDetail = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(task.PalletCode, task.CurrentAddress, task.TargetAddress, TaskInStatusEnum.Line_InFinish.GetIntegralRuleTypeEnumDesc()));

			// 创建LocationChangeRecordDto对象
			LocationChangeRecordDto changeRecordDto = new LocationChangeRecordDto()
			{
			// 设置变量
			AfterStatus = location.LocationStatus,
			BeforeStatus = beforeStatus,
			TaskNum = task.TaskNum.Value,
			@@ -1242,39 +2265,31 @@
			LocationCode = location.LocationCode,
			ChangeType = (int)StatusChangeTypeEnum.AutomaticStorage,
			};
			// 更新位置状态
			isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
			isUpdateLo = await _locationRepository.UpdateDataAsync(location);

			if (isResult && isUpdateLo && isTaskDetail)
			{
			// 提交事务
			_unitOfWorkManage.CommitTran();
			content.OK(data: task);
			}
			else
			{
			// 回滚事务
			_unitOfWorkManage.RollbackTran();
			content.Error("更新任务失败");
			}
			return content;
			bool isUpdateChange = _locationStatusChangeRecordRepository.AddStatusChangeRecord(changeRecordDto);
			bool isUpdateLo = await _locationRepository.UpdateDataAsync(location);

			return isResult && isUpdateLo && isTaskDetail;
			}

			/// <summary>
			/// 创建新任务
			/// </summary>
			/// <param name="input">请求模型</param>
			/// <param name="areaId">区域ID</param>
			/// <param name="content">响应内容</param>
			/// <param name="process">巷道</param>
			/// <param name="flag">标识（0-入库，1-空托盘入库，2-NG入库，3-出库）</param>
			/// <returns></returns>
			private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
			private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, string productionLine, string processCode, List<string> process = null, int flag = 0)
			{
			WebResponseContent content = new WebResponseContent();

			// 获取目标地址
			//string ToAddress = await GetRoadWayAsync(process);
			string ToAddress = await GetRoadWayAsync(input, process);
			string ToAddress = string.Empty;
			if (flag < 2)
			ToAddress = await GetRoadWayAsync(process);
			else
			ToAddress = process[0];

			// 创建新任务实例
			var task = new Dt_Task
			@@ -1289,10 +2304,12 @@
			OrderNo = null,
			PalletCode = input.PalletCode,
			SourceAddress = input.Position,
			TaskState = (int)TaskInStatusEnum.InNew,
			TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
			TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
			TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam"
			Creater = "Systeam",
			ProductionLine = productionLine,
			ProcessCode = processCode
			};

			// 尝试添加新任务
			@@ -1302,6 +2319,11 @@
			{
			task.TaskId = taskId;
			isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));

			//var location = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
			//location.LocationStatus = (int)LocationEnum.Lock;
			//var isLocation = _locationRepository.UpdateData(location);

			if (isResult)
			{
			// 创建WMS任务
			@@ -1312,10 +2334,11 @@
			PalletCode = task.PalletCode,
			RoadWay = task.Roadway,
			SourceAddress = task.SourceAddress,
			TargetAddress = task.Roadway,
			TargetAddress = task.TargetAddress,
			TaskState = task.TaskState.Value,
			Id = 0,
			TaskType = task.TaskType,
			ProductionLine = task.ProductionLine
			};
			content.OK(data: taskDTO);
			}
			@@ -1327,6 +2350,8 @@
			return content;
			}


			private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
			/// <summary>
			/// 查找货位
			/// </summary>
			@@ -1337,16 +2362,17 @@
			{
			#region 获取货位

			await _semaphore.WaitAsync();
			try
			{
			List<DtLocationInfo> locations;
			if (IsFull)
			{
			locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay);
			locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
			}
			else
			{
			locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay /&& x.LocationType ==/);
			locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == roadWay && x.EnalbeStatus == (int)EnableEnum.Enable);
			}

			if (locations == null)
			@@ -1361,32 +2387,43 @@
			Console.WriteLine(err.Message.ToString());
			return null;
			}
			finally
			{
			_semaphore.Release();
			}

			#endregion 获取货位
			}

			/// <summary>
			/// 获取巷道或站台
			/// 根据巷道获取巷道或站台
			/// </summary>
			/// <param name="areaId">货位区域ID</param>
			/// <param name="position">站台</param>
			/// <param name="Direction">方向</param>
			/// <param name="area">关系区域</param>
			/// <returns></returns>
			public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
			public async Task<string> GetRoadWayAsync(List<string> process)
			{
			var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
			var deviceCode = await SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
			.Where(x => x.DeviceStatus == 1.ToString() && process.Contains(x.DeviceCode))
			.Select(x => x.DeviceCode).ToListAsync();

			var minGroup = _locationRepository.QueryData(x => deviceCode.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
			.GroupBy(x => x.RoadwayNo)
			.OrderByDescending(g => g.Count()) // 根据每个组的元素数量排序
			.First(); // 取出数量最多的组
			.ToList(); // 取出数量最多的组

			string minRoadwayNo = minGroup.Key; // 数量最多的组的Key
			Dictionary<string, int> result = new Dictionary<string, int>();
			foreach (var item in minGroup)
			{
			var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
			result.Add(item.Key, item.Count() - number);
			}

			string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 数量最多的组的Key

			return minRoadwayNo;
			}

			/// <summary>
			/// 获取巷道或站台
			/// 根据区域获取巷道或站台
			/// </summary>
			/// <returns></returns>
			public async Task<string> GetRoadWayAsync(int areaCode)
			@@ -1394,13 +2431,103 @@
			var minGroup = _locationRepository.QueryData(x => x.AreaId == areaCode && x.LocationStatus == (int)LocationEnum.Free)
			.GroupBy(x => x.RoadwayNo)
			.OrderBy(g => g.Count()) // 根据每个组的元素数量排序
			.First(); // 取出数量最少的组
			.ToList(); // 取出数量最少的组

			string minRoadwayNo = minGroup.Key; // 数量最少的组的Key
			Dictionary<string, int> result = new Dictionary<string, int>();
			foreach (var item in minGroup)
			{
			var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
			result.Add(item.Key, item.Count() - number);
			}

			string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 数量最多的组的Key

			return minRoadwayNo;
			}

			// 新的出库错误处理逻辑
			private async Task HandleOutBoundError(DtStockInfo stock, Dt_Task task)
			{
			WebResponseContent content = new WebResponseContent();
			var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
			if (area == null)
			{
			throw new Exception("未找到对应的库区信息");
			}

			var trayCells = new TrayCellsStatusDto
			{
			Software = area.Spare3,
			TrayBarcode = task.PalletCode,
			EquipmentCode = area.Spare2,
			SceneType = area.Spare4
			};

			content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
			if (!content.Status) return;

			var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			if (ResultTray.SerialNos.Count > 0)
			{
			var parameterInfo = GetParameterInfo(stock);

			var outHours = CalculateOutHours(stock);
			var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble()
			&& outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();

			var defectCode = !isNG ? "TQCK" : string.Empty;

			var outputDto = CreateAgingOutputDto(area, stock, ResultTray, parameterInfo, outHours, defectCode);
			content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);

			var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
			if (!result.Success)
			task.Remark = "NG";
			}
			}

			// 计算出库小时的方法
			private double CalculateOutHours(DtStockInfo stock) =>
			(DateTime.Now - Convert.ToDateTime(stock.LinedProcessFeedbackTime ?? stock.CreateDate.ToString())).TotalHours;

			// 生成 AgingOutputDto 的封装方法
			private AgingOutputDto CreateAgingOutputDto(Dt_AreaInfo area, DtStockInfo stock, ResultTrayCellsStatus resultTray,
			ParameterInfo parameterInfo, double outHours, string defectCode)
			{
			return new AgingOutputDto
			{
			OpFlag = 1,
			Software = area.Spare3,
			EquipmentCode = area.Spare2,
			TrayBarcode = stock.PalletCode,
			SerialNos = resultTray.SerialNos.Select(x => new SerialNoOutDto
			{
			SlotNo = x.PositionNo,
			SerialNo = x.SerialNo,
			SerialNoResult = true,
			ParameterInfo = new List<ParameterInfoOutput>
			{
			new ParameterInfoOutput
			{
			Value = outHours.ToString(),
			ParameterCode = parameterInfo.ParameterCode,
			ParameterDesc = parameterInfo.Description,
			ParameterResult = "OK",
			TargetValue = parameterInfo.TargetValue,
			LowerLimit = parameterInfo.LowerSpecificationsLimit,
			UpperLimit = parameterInfo.UpperSpecificationsLimit,
			DefectCode = defectCode,
			}
			}
			}).ToList()
			};
			}

			// 获取参数信息的辅助方法
			private ParameterInfo GetParameterInfo(DtStockInfo stock) =>
			JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos)
			.FirstOrDefault(y => y.Description.Contains("时间"));

			#endregion 任务请求方法

			#endregion private 内部方法