HuaYiZhongHeng/BaiBuLiKu.git

			@@ -1,7 +1,8 @@
			using Autofac.Core;
			using Mapster;
			using Mapster;
			using Masuit.Tools;
			using SqlSugar;
			using System.Text.RegularExpressions;
			using WIDESEA_Cache;
			using WIDESEA_Core.Const;
			using WIDESEA_DTO.MOM;
			using WIDESEA_DTO.WMS;
			@@ -9,7 +10,6 @@
			using WIDESEA_IStoragIntegrationServices;
			using WIDESEAWCS_BasicInfoRepository;
			using WIDESEAWCS_QuartzJob.Models;


			namespace WIDESEA_StorageTaskServices;

			@@ -31,6 +31,7 @@
			private readonly IAgingInOrOutInputService _agingInOrOutInputService; //静置\陈化
			private readonly IDt_StationManagerRepository _stationManagerRepository;
			private readonly ISys_ConfigService _configService;
			private readonly ISimpleCacheService _simpleCacheService;

			public Dt_TaskService(IDt_TaskRepository BaseDal,
			IUnitOfWorkManage unitOfWorkManage,
			@@ -48,7 +49,8 @@
			IAgingInOrOutInputService agingInOrOutInputService,
			IStockInfoDetailRepository stockInfoDetailRepository,
			IDt_StationManagerRepository stationManagerRepository,
			ISys_ConfigService configService) : base(BaseDal)
			ISys_ConfigService configService,
			ISimpleCacheService simpleCacheService) : base(BaseDal)
			{
			_unitOfWorkManage = unitOfWorkManage;
			_stockInfoRepository = stockInfoRepository;
			@@ -65,6 +67,7 @@
			_stockInfoDetailRepository = stockInfoDetailRepository;
			_stationManagerRepository = stationManagerRepository;
			_configService = configService;
			_simpleCacheService = simpleCacheService;
			}

			#region 外部接口方法
			@@ -194,6 +197,7 @@
			(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
			var taskHty = task.Adapt<Dt_Task_Hty>();
			taskHty.FinishTime = DateTime.Now;
			taskHty.OperateType = (int)OperateTypeEnum.自动完成;

			DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
			stockInfo_Hty.ModifyDate = DateTime.Now;
			@@ -211,6 +215,8 @@
			await DeleteTaskAsync(task.TaskId);
			await AddTaskHtyAsync(taskHty);
			});

			_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });

			return content.OK("任务完成成功", task.Remark);
			}
			@@ -445,6 +451,10 @@
			if (isResult)
			{
			_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);

			stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };
			_simpleCacheService.HashAdd(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, stock.PalletCode, stock);

			content.OK("入库任务完成成功");
			}
			else
			@@ -895,7 +905,7 @@
			List<string> strings = stationManagers.Roadway.Split(',').ToList();
			Console.WriteLine(strings.ToJsonString() + "b-----------------------");
			//// 调用CreateNewTask方法，创建新任务
			content = await CreateNewTask(input, result.ProductionLine,result.ProcessCode, strings);
			content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
			if (content.Status)
			{
			var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
			@@ -1000,7 +1010,6 @@
			return content.Error(result.MOMMessage);
			}


			if (result.SerialNos.Count <= 0)
			{
			var config = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.InboundIsEmpty);
			@@ -1026,6 +1035,7 @@
			var boxing = CreateBoxingInfo(result, input.PalletCode);
			if (boxing == null) return content.Error("组盘失败");

			input.ProductionLine = result.ProductionLine;
			return await ProcessBasedOnProcessCode(boxing, area, input, result);
			}
			}
			@@ -1116,7 +1126,6 @@
			return content.Error("当前托盘无产线,联系MOM添加产线");
			}


			var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
			if (stationManagers == null)
			{
			@@ -1126,7 +1135,7 @@
			}
			List<string> strings = stationManagers.Roadway.Split(',').ToList();

			return await CreateNewTask(input, result.ProductionLine, result.ProcessCode,strings, 1);
			return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
			}
			catch (Exception)
			{
			@@ -1204,7 +1213,6 @@

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


			// 新增重复任务校验
			var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
			if (hasTask != null)
			@@ -1249,20 +1257,37 @@
			private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
			{
			var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
			if (area == null)
			{
			ConsoleHelper.WriteErrorLine($"查询实盘库存信息时,未找到区域代码为{areaCode}的数据");
			return null;
			}

			var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
			.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 && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件
			.WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
			.OrderBy(x => x.OutboundTime) // 排序
			.FirstAsync(); // 获取第一个元素
			var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
			List<string>? materielCodes = outBoundMateriel.Count != 0
			? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
			.Select(x => x.MaterielCode)
			.ToList()
			: null;

			//var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 查找第一个匹配的元素
			//var firstOrDefault = result[0]; // 查找第一个匹配的元素
			//return firstOrDefault;
			IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
			List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
			var result = new DtStockInfo();

			//if (stockInfoList.IsNullOrEmpty())
			//{
			// stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
			// .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
			//}

			result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
			.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))
			.WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
			.OrderBy(x => x.OutboundTime)
			.FirstOrDefault();

			return result;
			}

			@@ -1278,25 +1303,37 @@
			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 outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
			//List<string> materielCodes = null;
			//if (outBoundMateriel.Count != 0)
			//{
			// materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).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) // 过滤条件
			var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
			List<string>? materielCodes = outBoundMateriel.Count != 0
			? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
			.Select(x => x.MaterielCode)
			.ToList()
			: null;

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

			IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
			List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();

			var result = stockInfoList.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))
			.WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
			.OrderBy(x => x.OutboundTime) // 排序
			.FirstAsync(); // 获取第一个元素
			.FirstOrDefault(); // 获取第一个元素

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

			@@ -1313,27 +1350,28 @@
			ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
			var stackers = station.Roadway.Split(',').ToList();


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

			var deviceCode = devices.Select(x => x.DeviceCode).ToList();
			IDictionary<string, DtStockInfo>? stockInfos = _simpleCacheService.HashGetAll<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo);
			List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();

			var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
			.Includes(x => x.LocationInfo) // 预加载LocationInfo
			.Includes(x => x.StockInfoDetails) // 预加载StockInfoDetails
			.Where(x => x.ProductionLine == station.productLine)
			var result = stockInfoList.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 && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 过滤条件
			.WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
			.OrderBy(x => x.CreateDate) // 排序
			.FirstAsync(); // 转换为列表
			.FirstOrDefault(); // 转换为列表

			//var firstOrDefault = result[0]; // 查找第一个匹配的元素
			//return firstOrDefault;
			//if (result != null)
			//{
			// stockInfoList = stockInfoList.Where(x => x != result).ToList();
			// _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
			//}

			return result;
			}

			@@ -1660,7 +1698,7 @@
			// content.Error(ex.Message);
			//}
			//return content;
			#endregion
			#endregion 静置异常口入库
			WebResponseContent content = new WebResponseContent();
			try
			{
			@@ -1731,7 +1769,8 @@
			TaskType = (int)TaskInboundTypeEnum.Inbound,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine
			ProductionLine = result.ProductionLine,
			ProcessCode = result.ProcessCode,
			};

			// 创建WMS任务
			@@ -1768,7 +1807,8 @@
			TaskType = (int)TaskInboundTypeEnum.InTray,
			TaskNum = await BaseDal.GetTaskNo(),
			Creater = "Systeam",
			ProductionLine = result.ProductionLine
			ProductionLine = result.ProductionLine,
			ProcessCode = result.ProcessCode,
			};
			// 创建WMS任务
			WMSTaskDTO taskDTO = CreateWMSTaskDTO(task);
			@@ -1799,7 +1839,6 @@
			}
			return content;
			}


			private WMSTaskDTO CreateWMSTaskDTO(object source)
			{
			@@ -1844,8 +1883,6 @@
			#endregion 静置异常口入库

			#endregion 外部接口方法



			#region 内部调用方法

			@@ -2030,7 +2067,7 @@
			private Dt_Task_Hty CreateHistoricalTask(Dt_Task task, bool isHand = false)
			{
			// 更新任务状态
			task.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
			task.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
			task.CurrentAddress = task.NextAddress;

			// 创建历史任务
			@@ -2043,7 +2080,7 @@
			{
			taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
			}
			taskHty.TaskState = TaskOutStatusEnum.OutFinish.ObjToInt();
			taskHty.TaskState = task.TaskType > 199 ? (int)TaskInStatusEnum.InFinish : (int)TaskOutStatusEnum.OutFinish;
			return taskHty;
			}

			@@ -2101,16 +2138,28 @@

			if (stock.IsFull)
			{
			// 查询符合条件的库存信息
			var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);

			// 查询任务信息
			var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();

			if (stocks != null && stocks.Count > 0)
			{
			foreach (var item in stocks)
			// 过滤出需要更新的库存信息
			var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
			foreach (var item in stocksToUpdate)
			{
			// 更新库存信息的特定参数
			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);
			if (stocksToUpdate.Count > 0)
			{
			// 异步更新库存信息
			var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
			}
			}
			}

			@@ -2146,7 +2195,6 @@
			}

			#region 任务请求方法


			private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
			// 更新任务货位
			@@ -2234,7 +2282,6 @@
			}
			catch (Exception)
			{

			throw;
			}
			finally { _semaphoreUpdate.Release(); }
			@@ -2348,8 +2395,8 @@
			return content;
			}


			private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);

			/// <summary>
			/// 查找货位
			/// </summary>