~dengjunjie/TaiYuanTaiZhong.git

			@@ -37,6 +37,8 @@
			var tasks = agvtaskService.Find(x => x.agv_taskstate == "Queue").OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).ToList();
			foreach (var task in tasks)
			{
			try
			{
			if (task.agv_tasktype == "TaskType_EmptyPallet")//ç©ºæä»»å¡
			{
			if (task.agv_fromaddress == "" && DateTime.Now - task.agv_createtime >= TimeSpan.FromMinutes(2))
			@@ -49,58 +51,9 @@
			}
			else
			GetStation.EmptyPalletStation(task);
			#region
			//var Pipeline_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "é¾æ¡æº");
			//if (Pipeline_client == null) throw new Exception("é¾æ¡æºè°åº¦æå¡æªå¼å¯ï¼");
			//if (!Pipeline_client.IsConnected) throw new Exception("ä¸é¾æ¡æºè¿æ¥è¶æ¶ï¼");
			//var area = task.agv_Traytype == "SmallTray" ? "11" : "10";
			////æ¾1åºåºçç©ºæä½
			//var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains("A") /&& x.location_state == "Stroge"//LocationStateEnum.Stroge.ToString()/ && x.enable).OrderBy(x => x.column).ThenBy(x => x.line).FirstOrDefault();
			//if (EmptyStation != null)
			// if (EmptyStation.location_state == LocationStateEnum.Busy.ToString()) EmptyStation = null;
			//#region ä¸ä¸ªåºååªè½æä¸ä¸ªç©ºæä»»å¡
			////bool ok = false;
			////if (EmptyStation != null)
			//// ok = agvtaskService.Find(x => x.agv_fromaddress == EmptyStation.stationCode \|\| x.agv_toaddress == EmptyStation.stationCode).Any();
			////if (EmptyStation == null \|\| ok)
			//// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == "Stroge" /LocationStateEnum.Stroge.ToString()/ && x.enable)
			//// .OrderBy(x => x.line).OrderByDescending(x => x.column).FirstOrDefault();
			//#endregion
			//if (EmptyStation == null)
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.enable).OrderByDescending(x => x.column).FirstOrDefault();
			//if (EmptyStation == null) continue;
			//#region åºååå¨ä»»å¡å ç¨
			//if (EmptyStation.location_state == LocationStateEnum.Busy.ToString())
			// continue;
			//#endregion

			//if (EmptyStation == null)
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity > 0 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == "Stroge" && x.enable).OrderByDescending(x => x.column).FirstOrDefault();
			//if (EmptyStation != null)
			//{
			// #region åºååå¨ä»»å¡å ç¨
			// //if (EmptyStation.location_state == LocationStateEnum.Busy.ToString())
			// // continue;
			// #endregion

			// //if (agvtaskService.Find(x => x.agv_fromaddress == EmptyStation.stationCode \|\| x.agv_toaddress == EmptyStation.stationCode).Any())
			// // return;
			// #region è¡¥åºåç©ºæçï¼ä¸éè¦åçµå¤æ
			// var PalletSignal = Pipeline_client.ReadByOrder<Int16>("R_PalletSignal", task.agv_toaddress);//è¯»åæçä¿¡å·:1:æ,2æ
			// var MaterialSignal = Pipeline_client.ReadByOrder<Int16>("R_MaterialSignal", task.agv_toaddress);//è¯»åè´§ç©ä¿¡å·:1:æ,2æ
			// if (PalletSignal == 2 && MaterialSignal == 2)
			// {
			// task.agv_fromaddress = EmptyStation.stationCode;
			// task.StarQuantity = EmptyStation.quantity - 1;
			// task.agv_taskstate = "Create";
			// agvtaskService.Update(task, true);
			// EmptyStation.location_state = LocationStateEnum.Busy.ToString();
			// stationinfoRepository.Update(EmptyStation, true);
			// WriteDBLog.Success("æ´æ°ç©ºçéåä»»å¡", $"ä»»å¡ç¼å·ï¼{task.agv_tasknum}", "PCS");
			// }
			// #endregion
			//}
			#endregion
			WriteDBLog.Success("æ´æ°ç©ºæéåä»»å¡", $"ä»»å¡ç¼å·ï¼{task.agv_tasknum}", "PCS");
			continue;
			}
			}
			else if (task.agv_tasktype == "TaskType_OutsourceInbound" \|\| task.agv_tasktype == "TaskType_Inbound")//å¤ååºå¥åº/ABåºå¥åº
			@@ -109,7 +62,7 @@
			{
			var stationinfo = stationinfoRepository.Find(x => x.stationCode == task.agv_fromaddress).FirstOrDefault();
			var work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.drawingNo == stationinfo.stationType && x.heatID == stationinfo.heatNumber && x.processCode == "17").FirstOrDefault();
			var TargetLocation = task.agv_tasktype == "TaskType_Inbound" ? GetLocation.GetEmptyLocation(stationinfoRepository, work, stationinfo) : StationTask.GetEmptyLocation(stationinfoRepository);
			var TargetLocation = task.agv_tasktype == "TaskType_Inbound" ? GetLocation.GetEmptyLocation(stationinfoRepository, work, task) : StationTask.GetEmptyLocation(stationinfoRepository);
			if (TargetLocation != null)
			{
			if (agvtaskService.Find(x => x.agv_toaddress == TargetLocation.stationCode).Any()) continue;
			@@ -122,6 +75,8 @@
			TargetLocation.Number = task.jobID;
			stationinfoRepository.Update(TargetLocation, true);
			agvtaskService.Update(task, true);
			WriteDBLog.Success("æ´æ°å¥åºéåä»»å¡", $"ä»»å¡ç¼å·ï¼{task.agv_tasknum}", "PCS");
			continue;
			}
			}
			}
			@@ -129,7 +84,7 @@
			{
			if (task.agv_toaddress == "")
			{
			var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && x.tray_status == "EmptyTray" /x.location_state == "Empty"/ && x.enable).ToList();
			var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("S01001") && (x.tray_status == "EmptyTray" \|\| x.location_state == "Empty") && x.enable).ToList();
			foreach (var EmptyStation in EmptyStations)
			{
			if (agvtaskService.Find(x => x.agv_toaddress == EmptyStation.stationCode).Any()) continue;
			@@ -158,12 +113,18 @@
			TargetLocation.stationType = task.agv_materielid;
			stationinfoRepository.Update(TargetLocation, true);
			agvtaskService.Update(task, true);
			WriteDBLog.Success("æ´æ°åºåºéåä»»å¡", $"ä»»å¡ç¼å·ï¼{task.agv_tasknum}", "PCS");
			return;
			WriteDBLog.Success("æ´æ°ç§»åºå¤åéåä»»å¡", $"ä»»å¡ç¼å·ï¼{task.agv_tasknum}", "PCS");
			continue;
			}
			}
			}
			}
			catch (Exception ex)
			{
			//WriteDBLog.Error("æ´æ°éåä»»å¡", $"éè¯¯ä¿¡æ¯ï¼{ex.Message}", "PCS");
			WriteLog.Write_Log("æ´æ°éåä»»å¡","æ´æ°å¤±è´¥", "", $"éè¯¯ä¿¡æ¯ï¼{ex.Message}");
			}
			}
			}
			catch (Exception ex)
			{