ZhiHuiQiCe/JianShanLiKu.git

			@@ -53,14 +53,32 @@
			{
			Signalinteraction(commonStackerCrane); //åºåºä¿¡å·äº¤äº
			Siganlinteraction2(commonStackerCrane); //å¥åºä¿¡å·äº¤äº
			if (!commonStackerCrane.IsEventSubscribed)
			/*if (!commonStackerCrane.IsEventSubscribed)
			{
			commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//è®¢éä»»å¡å®æäºä»¶
			}*/
			if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.WorkCompleted)
			{
			wcs_PLCto07("ä»»å¡å®æ", $"ä»»å¡å·ï¼{commonStackerCrane.CurrentTaskNum}", $"è¯»åå°å åæºå®æä¿¡å·ï¼ä»»å¡å®æï¼å®ææ¶é´ï¼{DateTime.Now}");
			//Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			WebResponseContent webResponse=_taskService.StackCraneTaskCompleted(commonStackerCrane.CurrentTaskNum);
			if (webResponse.Status)
			{

			bool ddjfk= commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			wcs_PLCto07("ä»»å¡å®æ", $"ä»»å¡å·ï¼{commonStackerCrane.CurrentTaskNum}ï¼ä¿®æ¹ä»»å¡æå", $"ä¿®æ¹ä»»å¡å®æï¼å¹¶åé¦å åå®æä¿¡å·æ¯å¦æåï¼{ddjfk}");
			}
			else
			{
			wcs_PLCto07("ä»»å¡å®ææé", $"ä»»å¡å·ï¼{commonStackerCrane.CurrentTaskNum}ï¼ä¿®æ¹ä»»å¡å¤±è´¥", $"å¤±è´¥åå ï¼{webResponse.Message}");

			}
			}


			if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal)
			{
			commonStackerCrane.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡
			//commonStackerCrane.CheckStackerCraneTaskCompleted();//é²æ¢ä»»å¡å®æäºä»¶çæµè¶æ¶ï¼åæå¨è§¦åä¸æ¬¡

			if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby)
			{
			@@ -99,10 +117,10 @@
			CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane;
			if (commonStackerCrane != null)
			{
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5)
			if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5 && e.TaskNum !=0)
			{
			wcs_PLCto07("ä»»å¡å®æ", $"ä»»å¡å·ï¼{e.TaskNum}", $"è¯»åå°å åæºå®æä¿¡å·ï¼ä»»å¡å®æï¼å®ææ¶é´ï¼{DateTime.Now}");
			Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			//Console.Out.WriteLine("TaskCompleted" + e.TaskNum);
			_taskService.StackCraneTaskCompleted(e.TaskNum);
			commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5);
			}
			@@ -116,62 +134,89 @@
			/// <returns></returns>
			private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane)
			{
			Dt_Task task;
			task = _taskService.QueryStackerCraneTask(commonStackerCrane.DeviceCode);

			if (task != null && task.TaskType== (int)TaskOutboundTypeEnum.Outbound)
			try
			{
			string[] targetCodes = task.SourceAddress.Split("-");
			if (targetCodes[4] == "02")
			//
			if (_taskService.CutStackerCraneTask(commonStackerCrane.DeviceCode) != null) return null;
			//æ¥è¯¢å¨é¨ä»»å¡ï¼ææ¶é´æåºè¿è¡æ¥è¯¢
			List<Dt_Task> TasksList = _taskService.CraneTaskList(commonStackerCrane.DeviceCode);
			if (TasksList.Count == 0) return null;
			foreach (var item in TasksList)
			{

			Dt_Task taskst = OutTaskMovelibrary(task);
			if (taskst != null)
			if (item.TaskType == (int)TaskInboundTypeEnum.Inbound)
			{
			if(taskst.TaskType == (int)TaskRelocationTypeEnum.Relocation)
			string[] targetCodes = item.TargetAddress.Split("-");
			if (targetCodes[4] == "01") return item; //å¦ææ¯æµåºä½ï¼åç´æ¥è¿åè¯¥ä»»å¡

			//å¦æä¸ºæ·±åºä½ï¼åæ¥çæ¯å¦æéè¦æ§è¡çä»»å¡
			if (targetCodes[4] == "02")
			{
			return taskst;
			}
			else
			{
			if(taskst.TargetAddress== "R02-001-021-001-02" \|\| taskst.TargetAddress == "R02-001-022-001-02")

			Dt_Task taskst = InTaskMove(item);
			if (taskst != null)
			{
			return taskst;
			}
			else
			}
			}
			else if (item.TaskType == (int)TaskOutboundTypeEnum.Outbound)
			{
			string[] targetCodes = item.SourceAddress.Split("-");//è¿è¡è§£æè´§ä½
			if (targetCodes[4] == "02")
			{
			//ä¸ºæ·±åºä½
			Dt_Task taskst = OutTaskMovelibrary(item); //å¤ææ¯å¦éè¦è¿è¡ç§»åº
			if (taskst != null)
			{
			if (OutTaskStationIsOccupied(taskst) != null)
			if (taskst.TaskType == (int)TaskRelocationTypeEnum.Relocation)
			{
			return taskst;
			}
			else
			{
			if (taskst.TargetAddress == "R02-001-021-001-02" \|\| taskst.TargetAddress == "R02-001-022-001-02")
			{
			return taskst;
			}
			else
			{
			if (OutTaskStationIsOccupied(taskst) != null) //å¤æåºåºç«å°æ¯å¦å¯ä¸å
			{
			return taskst;
			}
			}

			}
			}

			}

			}
			task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
			}
			else
			{
			if (task.TargetAddress == "R02-001-021-001-02" \|\| task.TargetAddress == "R02-001-022-001-02")
			{
			return task;
			}
			else
			{
			if (OutTaskStationIsOccupied(task) != null)
			else
			{
			return task;
			if (item.TargetAddress == "R02-001-021-001-02" \|\| item.TargetAddress == "R02-001-022-001-02")
			{
			return item;
			}
			else
			{
			if (OutTaskStationIsOccupied(item) != null) //å¤æåºåºç«å°æ¯å¦å¯ä¸å
			{
			return item;
			}
			}

			}
			}

			task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
			}


			return null;
			}
			return task;
			catch (Exception ex)
			{
			WriteLog.Write_Log("å åæºä»»å¡ä¸åæé", "æé", "æé", new { ä¿¡æ¯ = ex.Message });
			return null;
			}
			}



			/// <summary>
			/// åºåºä»»å¡å¤æåºåºç«å°æ¯å¦è¢«å ç¨
			@@ -205,6 +250,7 @@
			return null;
			}


			/// <summary>
			/// åºåºä»»å¡å¤ææ¯å¦éè¦è¿è¡ç§»åºMove the library
			/// </summary>
			@@ -212,42 +258,62 @@
			/// <returns>å¦ææªè¢«å ç¨ï¼è¿åä¼ å¥çä»»å¡ä¿¡æ¯ï¼å¦åï¼è¿ånull</returns>
			private Dt_Task? OutTaskMovelibrary([NotNull] Dt_Task task)
			{
			try
			string[] targetCodes = task.SourceAddress.Split("-");
			if (targetCodes[1] == "001")
			{
			string[] targetCodes = task.SourceAddress.Split("-");
			if (targetCodes[1] == "001")
			{
			targetCodes[1] = "002";
			targetCodes[1] = "002";

			}
			else if (targetCodes[1] == "004")
			{
			targetCodes[1] = "003";
			}
			targetCodes[4] = "01";
			string SourceAddress = string.Join("-", targetCodes); //ç»è£æµåºä½å°å
			Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault(); //æ¾æµåºä½æ¯å¦æä»»å¡
			if (tasks != null)
			{
			return tasks;
			}
			else
			{
			//åwmsç³è¯·å¤ææµåºä½æ¯å¦æè´§ï¼æ¯å¦éè¦è¿è¡ç§»åº
			Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary(task);
			if (taskst != null)
			{
			return taskst;
			}
			}
			}
			catch (Exception ex)
			else if (targetCodes[1] == "004")
			{

			throw;
			targetCodes[1] = "003";
			}
			targetCodes[4] = "01";
			string SourceAddress = string.Join("-", targetCodes); //ç»è£æµåºä½å°å
			Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks(task.Roadway, SourceAddress).FirstOrDefault(); //æ¾æµåºä½æ¯å¦æä»»å¡
			if (tasks != null)
			{
			return tasks;
			}
			else
			{
			//åwmsç³è¯·å¤ææµåºä½æ¯å¦æè´§ï¼æ¯å¦éè¦è¿è¡ç§»åº
			Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary(task);
			if (taskst != null)
			{
			return taskst;
			}
			}
			return null;
			}

			private Dt_Task? InTaskMove([NotNull] Dt_Task task)
			{
			string[] targetCodes = task.TargetAddress.Split("-");
			if (targetCodes[1] == "001")
			{
			targetCodes[1] = "002";

			}
			else if (targetCodes[1] == "004")
			{
			targetCodes[1] = "003";
			}
			targetCodes[4] = "01";
			string TargetAddress = string.Join("-", targetCodes); //ç¨æ·±åºä½ç»è£æµåºä½ç¼å·
			Dt_Task? tasks = _taskService.QueryStationIsOccupiedOutTasks2(task.Roadway, TargetAddress).FirstOrDefault(); //æ¾æµåºä½æ¯å¦æåºåºä»»å¡æç§»åºä»»å¡
			if(tasks != null) { return tasks; } //å¦ææï¼ååä¸åè³å åæº

			//åwmsç³è¯·å¤ææµåºä½æ¯å¦æè´§ï¼æ¯å¦éè¦è¿è¡ç§»åº
			Dt_Task? taskst = _taskService.RequestWMSTaskMovelibrary2(task);
			if (taskst != null)
			{
			return taskst;
			}
			return null;
			}



			public void Signalinteraction(CommonStackerCrane commonStackerCrane)
			{
			@@ -1218,6 +1284,10 @@
			{
			WriteLog.Write_Log("ä»»å¡ä¿¡æ¯å®æè®°å½", SCLLinStack, Logtype, new { ä¿¡æ¯ = Magessadd });
			}
			public void wcs_PLCto07_1(string SCLLinStack, string Logtype, string Magessadd)
			{
			WriteLog.Write_Log("ä»»å¡ä¿¡æ¯å®æä¿®æ¹è®°å½", SCLLinStack, Logtype, new { ä¿¡æ¯ = Magessadd });
			}

			public void wcs_PLCto08(string SCLLinStack, string Logtype, string Magessadd)
			{