HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,11 +1,16 @@

			using AngleSharp.Io;
			using log4net.Core;
			using Mapster;
			using Masuit.Tools;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			using SixLabors.Fonts.Tables.AdvancedTypographic;
			using WIDESEA_Core.Const;
			using WIDESEA_DTO.MOM;
			using WIDESEA_DTO.WMS;
			using WIDESEA_IServices;
			using WIDESEA_IStoragIntegrationServices;
			using WIDESEA_Model.Models;
			using WIDESEA_Services;
			using WIDESEA_StorageBasicRepository;
			using WIDESEAWCS_BasicInfoRepository;
			@@ -88,7 +93,7 @@
			content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
			//ValidateResponse(content);
			var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
			if (!result.Success)
			if (!result.Success \|\| !agingOutputDto.SerialNos[0].SerialNoResult)
			{
			task.Remark = "NG";
			}
			@@ -97,15 +102,20 @@

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

			// 事务处理
			await _unitOfWorkManage.UseTranAsync(async () =>
			{
			if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
			{
			await DeleteStockInfoAsync(stock.Id);
			await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
			}
			await UpdateLocationAsync(loc);
			await DeleteStockInfoAsync(stock.Id);
			await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
			if (task.Roadway.Contains("FR") \|\| task.Roadway.Contains("GW")) //如果是分容或高温出库将任务删除
			await DeleteTaskAsync(task.TaskId);
			//if (task.Roadway.Contains("FR") \|\| task.Roadway.Contains("GW") \|\| task.TaskType == (int)TaskOutboundTypeEnum.OutTray) //如果是分容或高温出库将任务删除
			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			});

			return content.OK("任务完成成功", task.Remark);
			@@ -154,7 +164,7 @@
			{
			SlotNo = x.OrderNo.ToInt32(),
			SerialNo = x.SerialNumber,
			SerialNoResult = true,
			SerialNoResult = isNG,
			ParameterInfo = new List<ParameterInfoOutput> {
			new ParameterInfoOutput() {
			Value = outHours.ToString(),
			@@ -164,7 +174,8 @@
			TargetValue = parameterInfo.TargetValue,
			LowerLomit = parameterInfo.LowerSpecificationsLimit,
			UpperLimit = parameterInfo.UpperSpecificationsLimit,
			DefectCode = defectCode
			DefectCode = defectCode,
			UOMCode = parameterInfo.UOMCode,
			}
			}
			}).ToList()
			@@ -227,6 +238,15 @@
			}
			}

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

			#endregion 出库任务完成

			#region 移库任务完成
			@@ -242,12 +262,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
			@@ -397,13 +417,22 @@
			throw new Exception("未找到对应位置信息");

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


			var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
			boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.已入库; });
			var stock = new DtStockInfo()
			@@ -429,6 +458,7 @@
			EquipmentCode = area.Spare2,
			Software = area.Spare3
			};

			var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
			var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
			stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
			@@ -482,14 +512,18 @@
			{
			case (int)TaskInboundTypeEnum.Inbound:
			case (int)TaskInboundTypeEnum.InTray:
			case (int)TaskInboundTypeEnum.InNG:
			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("任务类型不存在");
			}
			@@ -749,11 +783,32 @@
			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 = (int)TaskInStatusEnum.InNew,
			TaskType = (int)TaskInboundTypeEnum.InQuality,
			TaskNum = BaseDal.GetTaskNo().Result,
			Creater = "System", // 修正拼写错误
			CreateDate = DateTime.Now,
			TaskId = 0,
			};

			var taskDTO = CreateTaskDTO(task);
			// TODO质检回库
			}

			// 根据位置查询区域信息
			var area = await QueryAreaInfoByPosition(input.Position);
			var area = await QueryAreaInfoByPosition(input.Position.Replace("-1", ""));
			if (area == null)
			{
			return content.Error("该点位不在区域列表中存在");
			@@ -767,7 +822,13 @@
			var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
			if (!result.Success)
			{
			return content.Error(result.MOMMessage);
			if (result.SerialNos.Count <= 0)
			{
			// 空托盘入库逻辑
			return await RequestTrayInTaskAsync(input);
			}
			else
			return content.Error(result.MOMMessage);
			}

			// 处理异常电芯情况
			@@ -777,11 +838,6 @@
			return await HandleErrorCells(input, area, serialNosError);
			}

			if (result.SerialNos.Count <= 0)
			{
			// 空托盘入库逻辑
			return await RequestTrayInTaskAsync(input);
			}

			var boxing = CreateBoxingInfo(result, input.PalletCode);
			if (boxing == null) return content.Error("组盘失败");
			@@ -924,15 +980,15 @@
			/// <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, string productionLine)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			// 根据托盘类型查询库存信息
			DtStockInfo stockInfo = tag == (int)TaskOutboundTypeEnum.Outbound
			? QueryStockInfoForRealTrayAsync(areaCode, roadways).Result
			: QueryStockInfoForEmptyTrayAsync(areaCode, roadways).Result;
			? QueryStockInfoForRealTrayAsync(areaCode, productionLine).Result
			: QueryStockInfoForEmptyTrayAsync(areaCode).Result;

			if (stockInfo == null)
			{
			@@ -979,7 +1035,7 @@
			/// <summary>
			/// 查询实盘库存信息
			/// </summary>
			private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> roadways)
			private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, string productionLine)
			{
			var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);

			@@ -987,6 +1043,7 @@
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 过滤条件
			.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
			.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 过滤条件
			.OrderBy(x => x.OutboundTime) // 排序
			.FirstAsync(); // 获取第一个元素
			@@ -1000,7 +1057,7 @@
			/// <summary>
			/// 查询空盘库存信息
			/// </summary>
			private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, List<string> roadways)
			private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode)
			{
			var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);

			@@ -1036,7 +1093,7 @@
			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", // 修正拼写错误
			CreateDate = DateTime.Now,
			@@ -1138,6 +1195,84 @@
			content.Error(ex.Message);
			}
			return content;
			}

			#endregion

			#region 指定任务出库

			public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
			{
			WebResponseContent content = new WebResponseContent();
			try
			{
			// 查询库存信息
			var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.LocationCode == locationCode && x.PalletCode == palletCode);
			if (stockInfo == null)
			{
			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;
			// 创建并添加任务到数据库
			task = CreateTask(stockInfo, "1020-1", 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
			@@ -1317,20 +1452,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>
			@@ -1363,6 +1497,18 @@
			.ExecuteCommandAsync();
			}

			}

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

			// 添加历史任务
			@@ -1419,6 +1565,16 @@
			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 = _stockInfoRepository.QueryFirst(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);
			@@ -1538,6 +1694,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任务
			@@ -1612,7 +1773,7 @@
			.OrderByDescending(g => g.Count()) // 根据每个组的元素数量排序
			.ToList(); // 取出数量最多的组

			Dictionary<string,int> result = new Dictionary<string,int>();
			Dictionary<string, int> result = new Dictionary<string, int>();
			foreach (var item in minGroup)
			{
			var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();