ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -102,6 +102,7 @@
			}
			}
			}
			private readonly static object lockerCompleted = new object();
			/// <summary>
			/// ä»»å¡å®æ
			/// </summary>
			@@ -109,22 +110,25 @@
			{
			try
			{
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task != null)
			lock (lockerCompleted)
			{
			task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
			if (task != null)
			{
			task.TaskState = TaskStatusEnum.Finish.ObjToInt();
			BaseDal.DeleteAndMoveIntoHty(task, App.User?.UserId == 0 ? OperateTypeEnum.èªå¨å®æ : OperateTypeEnum.äººå·¥å®æ);
			}
			string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
			if (string.IsNullOrEmpty(url))
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			return WebResponseContent.Instance.Error($"{taskNum},æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			}
			string responseStr = HttpHelper.Get(url + "?taskNum=" + taskNum);
			WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(responseStr) ?? WebResponseContent.Instance.Error($"{taskNum},æªæ¥æ¶å°ä»»å¡å®æè¿åå¼");
			return content;
			}
			string? url = apiInfos.FirstOrDefault(x => x.ApiCode == APIEnum.FeedBackWMSTaskCompleted.ToString())?.ApiAddress;
			if (string.IsNullOrEmpty(url))
			{
			_taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			return WebResponseContent.Instance.Error($"{taskNum},æªæ¾å°WMSä»»å¡å®ææ¥å£,è¯·æ£æ¥æ¥å£éç½®");
			}
			string responseStr = HttpHelper.Get(url + "?taskNum=" + taskNum);
			WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(responseStr) ?? WebResponseContent.Instance.Error($"{taskNum},æªæ¥æ¶å°ä»»å¡å®æè¿åå¼");
			return content;
			}
			catch (Exception ex)
			{
			@@ -227,7 +231,7 @@
			return WebResponseContent.Instance.Error($"æªæ¾å°ç«å°éç½®ä¿¡æ¯");
			}
			//è·åè·¯ç±ä¿¡æ¯
			List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == item.TaskType && (item.SourceAddress == x.StartPosi \|\| item.RoadWay == x.StartPosi) && x.Depth==1);
			List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == item.TaskType && (item.SourceAddress == x.StartPosi \|\| item.RoadWay == x.StartPosi \|\| stationManger.StationDeviceCode==x.StartPosi) && x.Depth==1);
			router = routers.FirstOrDefault();
			if (router == null)
			{
			@@ -239,7 +243,7 @@
			//å¥åº
			if (taskTypeGroup == TaskTypeGroup.InboundGroup)
			{
			if (router.NextPosi == "AGV" && router.StartPosi=="AGV")
			if (router.NextPosi == "AGV" && router.StartPosi=="AGV") //åè½¦AGVæ¬è¿å¥åº
			{
			task.CurrentAddress = item.SourceAddress;
			task.NextAddress = item.TargetAddress;
			@@ -247,7 +251,7 @@
			}
			else
			{
			task.CurrentAddress = router.StartPosi;
			task.CurrentAddress = router.StartPosi == "AGV" ? item.SourceAddress : router.StartPosi;
			task.NextAddress = router.NextPosi;
			task.DeviceCode = router.ChildPosiDeviceCode;
			}
			@@ -261,8 +265,7 @@
			}
			else
			{
			//æåç åä»»å¡çæ
			if (taskTypeGroup == TaskTypeGroup.InboundGroup && !task.Roadway.Contains("YL"))
			if (taskTypeGroup == TaskTypeGroup.InboundGroup && !task.Roadway.Contains("YL")) //æåç åä»»å¡çæ
			{
			task.CurrentAddress = router.StartPosi;
			task.NextAddress = "";
			@@ -295,7 +298,10 @@
			if (routers.Count == 1)
			{
			task.NextAddress = router.NextPosi;
			task.DeviceCode = router.ChildPosi;
			if (task.Roadway.Contains("StackPlate"))
			task.DeviceCode = router.ChildPosiDeviceCode;
			else
			task.DeviceCode = router.ChildPosi;
			}
			}

			@@ -695,6 +701,89 @@
			else
			return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && x.CurrentAddress == currentAddress && x.TaskState == (int)TaskStatusEnum.SC_Execute, TaskOrderBy);
			}
			private static Dictionary<string, int> dict = new Dictionary<string, int>
			{
			{ "SC01_YL", 0 },
			{ "SC02_YL", 0 },
			{ "SC03_YLDual", 0 },
			{ "SC04_YLDual", 0 },
			{ "SC05_YLDual", 0 }
			};
			private readonly static object lockerOldorNew = new object();
			/// <summary>
			/// åæåºä»»å¡æ¥è¯¢
			/// </summary>
			/// <param name="deviceNo">è®¾å¤ç¼å·</param>
			/// <param name="currentAddress">å½åå°å</param>
			/// <returns>è¿åä»»å¡å®ä½å¯¹è±¡ï¼å¯è½ä¸ºnull</returns>
			public Dt_Task QueryStackerYLTask(string deviceNo,TaskTypeGroup? taskTypeGroup= null)
			{
			lock (lockerOldorNew)
			{
			int OldorNew = dict[deviceNo];
			if (taskTypeGroup == null)
			{
			Dt_Task taskSend = BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && x.TaskState == (int)TaskStatusEnum.SC_Execute && x.TaskType != TaskTypeEnum.OldYLOutbound.ObjToInt(), TaskOrderBy);
			if (taskSend == null \|\| OldorNew == 0)
			{
			dict[deviceNo] = 1;
			List<Dt_Task> specificTasks = BaseDal.QueryData(t => t.DeviceCode == deviceNo && t.TaskState == (int)TaskStatusEnum.SC_Execute && t.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt()).OrderBy(t => t.CreateDate.Date)
			.ThenBy(t => t.Grade)
			.ThenBy(t => t.TaskNum)
			.ToList();
			if (specificTasks.Any())
			{
			//æ ¹æ®æ¶é´çæ¥ä¸¥æ ¼æåº
			Dt_Task taskCheck = BaseDal.QueryData(t => t.TaskState == (int)TaskStatusEnum.SC_Execute && t.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt()).OrderBy(t => t.CreateDate.Date)
			.ThenBy(t => t.Grade)
			.ThenBy(t => t.TaskNum)
			.FirstOrDefault();
			Dt_Task taskCheckSend = specificTasks.FirstOrDefault();
			if (taskCheck.CreateDate.Date == taskCheckSend.CreateDate.Date && taskCheckSend.Grade <= taskCheck.Grade)
			{
			taskSend = taskCheckSend;
			}
			}
			}
			else
			{
			dict[deviceNo] = 0;
			}
			return taskSend;
			}
			else
			{
			Dt_Task taskSend = null;
			if (OldorNew == 0)
			{
			dict[deviceNo] = 1;
			List<Dt_Task> specificTasks = BaseDal.QueryData(t => t.DeviceCode == deviceNo && t.TaskState == (int)TaskStatusEnum.SC_Execute && t.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt()).OrderBy(t => t.CreateDate.Date)
			.ThenBy(t => t.Grade)
			.ThenBy(t => t.TaskNum)
			.ToList();
			if (specificTasks.Any())
			{
			//æ ¹æ®æ¶é´çæ¥ä¸¥æ ¼æåº
			Dt_Task taskCheck = BaseDal.QueryData(t => t.TaskState == (int)TaskStatusEnum.SC_Execute && t.TaskType == TaskTypeEnum.OldYLOutbound.ObjToInt()).OrderBy(t => t.CreateDate.Date)
			.ThenBy(t => t.Grade)
			.ThenBy(t => t.TaskNum)
			.FirstOrDefault();
			Dt_Task taskCheckSend = specificTasks.FirstOrDefault();
			if (taskCheck.CreateDate.Date == taskCheckSend.CreateDate.Date && taskCheckSend.Grade <= taskCheck.Grade)
			{
			taskSend = taskCheckSend;
			}
			}
			}
			else
			{
			dict[deviceNo] = 0;
			taskSend = BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskType != TaskTypeEnum.OldYLOutbound.ObjToInt() && x.TaskState == (int)TaskStatusEnum.SC_Execute, TaskOrderBy);
			}
			return taskSend;
			}
			}
			}

			/// <summary>
			/// æ ¹æ®è®¾å¤ç¼å·ãå½åå°åæç§ä¼åçº§ä»¥ååå»ºæ¶é´æåºæ¥è¯¢ä»»å¡æ± å¥åºç±»åçæ°å¢çä»»å¡