~dengjunjie/TaiYuanTaiZhong.git

			@@ -18,6 +18,7 @@
			using WIDESEA_Entity.DomainModels;
			using WIDESEA_WCS.IRepositories;
			using WIDESEA_WCS.Jobs;
			using WIDESEA_WCS.JobsPart.Common;
			using WIDESEA_WCS.Repositories;
			using WIDESEA_WCS.WCSClient;
			using WIDESEA_WMS.IRepositories;
			@@ -77,7 +78,7 @@


			///æ¥æ¾ä¸æåºçè´§ä½
			var Stations = stationinfoRepository.Find(x => x.area == area_code(number));
			var Stations = stationinfoRepository.Find(x => x.area == area_code(number)).OrderBy(x => x.lastUpdateTime);//æ ¹æ®æ¶é´ååæåº
			//ç¼åæ¶æªå¯ç¨ç¦æ¢æ¡æ¶è¿å¥
			//foreach (var station in Stations)
			//{
			@@ -111,20 +112,25 @@
			var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == Station.stationCode).ToList();
			var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//è¯»åæçä¿¡å·:1:æ,2æ
			var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//è¯»åè´§ç©ä¿¡å·:1:æ,2æ

			var AreaNr = Gantry_client.ReadByOrder<Int16>("W_AreaNr", number);//è¯»åè´§ä½å·ä¿¡æ¯
			if (PalletSignal == 1 && MaterialSignal == 1)
			{
			var area = Convert.ToInt16(Station.stationCode.Substring(Station.stationCode.Length - 1, 1));
			Gantry_client.WriteByOrder("W_AreaNr", (Int16)area, number);//åºåè´§ä½å·
			Gantry_client.WriteByOrder("W_IndexNr", (Int16)SNS.Length, number);//æçä¸çç¬¬å ä¸ªè½¦è½®
			Gantry_client.WriteByOrder("W_Storage_Type", (Int16)1, number); //æçç±»å1-æ¨ªæ¾;2-ç«æ¾
			Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)Convert.ToInt16(QueryMateriel(Station.stationType) == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId), number);//è½¦è½®ç±»å
			Gantry_client.WriteByOrder("W_Wheel_id", SNS[SNS.Length - 1], number);//è½¦è½®SNå·
			Gantry_client.WriteByOrder("W_RequestUnload", true, number);
			#region æ¥å¿è®°å½
			WriteDBLog.Success("ä¸æåºç³è¯·", $"è¯»åæçåçµä¿¡å·ï¼{PalletSignal}\nè¯»åç¬¬ä¸ä¸ªè½¦è½®åçµä¿¡å·ï¼{MaterialSignal}\n\n" +
			$"åå¥æ¡æ¶ä¿¡æ¯ï¼\nåºåè´§ä½å·ï¼{area}\næçä¸çç¬¬å ä¸ªè½¦è½®ï¼{SNS.Length}\næçç±»åï¼{1}\nè½¦è½®ç±»åï¼{(QueryMateriel(Station.stationType).TypeId == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId)}" +
			$"\nè½¦è½®SNå·ï¼{SNS[SNS.Length - 1]}\nW_RequestUnloadï¼true", "PCS");
			#endregion
			if (AreaNr == 0)
			{
			var area = Convert.ToInt16(Station.stationCode.Substring(Station.stationCode.Length - 1, 1));
			Gantry_client.WriteByOrder("W_AreaNr", (Int16)area, number);//åºåè´§ä½å·
			Gantry_client.WriteByOrder("W_IndexNr", (Int16)SNS.Length, number);//æçä¸çç¬¬å ä¸ªè½¦è½®
			Gantry_client.WriteByOrder("W_Storage_Type", (Int16)1, number); //æçç±»å1-æ¨ªæ¾;2-ç«æ¾
			Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)Convert.ToInt16(QueryMateriel(Station.stationType) == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId), number);//è½¦è½®ç±»å
			Gantry_client.WriteByOrder("W_Wheel_id", SNS[SNS.Length - 1], number);//è½¦è½®SNå·
			Gantry_client.WriteByOrder("W_RequestUnload", true, number);
			#region æ¥å¿è®°å½
			WriteDBLog.Success("ä¸æåºç³è¯·", $"è¯»åæçåçµä¿¡å·ï¼{PalletSignal}\nè¯»åç¬¬ä¸ä¸ªè½¦è½®åçµä¿¡å·ï¼{MaterialSignal}\n\n" +
			$"åå¥æ¡æ¶ä¿¡æ¯ï¼\nåºåè´§ä½å·ï¼{area}\næçä¸çç¬¬å ä¸ªè½¦è½®ï¼{SNS.Length}\næçç±»åï¼{1}\nè½¦è½®ç±»åï¼{(QueryMateriel(Station.stationType).TypeId == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId)}" +
			$"\nè½¦è½®SNå·ï¼{SNS[SNS.Length - 1]}\nW_RequestUnloadï¼true", "PCS");
			#endregion
			}
			}
			else
			{
			@@ -174,10 +180,20 @@
			//throw new Exception($"ä¸æä½ä¿¡æ¯æ´æ°å¤±è´¥ï¼ä¸æä½ç¼å·ï¼{Station.stationCode}");
			return;
			}

			#region æ¸ç©ºä¿¡æ¯
			Gantry_client.WriteByOrder("W_AreaNr", (Int16)0, number);//åºåè´§ä½å·
			Gantry_client.WriteByOrder("W_IndexNr", (Int16)0, number);//æçä¸çç¬¬å ä¸ªè½¦è½®
			Gantry_client.WriteByOrder("W_Storage_Type", (Int16)0, number); //æçç±»å1-æ¨ªæ¾;2-ç«æ¾
			Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)0, number);//è½¦è½®ç±»å
			//Gantry_client.WriteByOrder("W_Wheel_id", SNS[SNS.Length - 1], number);//è½¦è½®SNå·
			#endregion

			Gantry_client.WriteByOrder("W_Storage_update", true, number);//è´§ä½ç¶ææ´æ°
			#region æ¥å¿è®°å½
			WriteDBLog.Success("åæå®æ", $"åå¥æ¡æ¶ä¿¡æ¯ï¼\nè´§ä½ç¶ææ´æ°ï¼{true}\nW_RequestUnloadï¼{false}", "PCS");
			#endregion

			PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//è¯»åæçä¿¡å·:1:æ,2æ
			MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//è¯»åè´§ç©ä¿¡å·:1:æ,2æ
			if (Station.quantity > 0 && (PalletSignal != 1 \|\| MaterialSignal != 1))
			@@ -186,6 +202,7 @@
			Station.remark = "è½¦è½®æ°éå¤§äº0ï¼åçµæ£æµæ æçææ è½¦è½®";
			stationinfoRepository.Update(Station, true);
			client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//æ¥è¦
			WriteDBLog.Error(number + "æ¥è¦", $"è´§ä½ç¼å·ï¼{Station.stationCode}ï¼éè¯¯ä¿¡æ¯ï¼{Station.remark}", "PCS");
			}
			else if (Station.quantity < 1 && MaterialSignal == 1)
			{
			@@ -193,6 +210,7 @@
			Station.remark = "è½¦è½®æ°éå°äº0ï¼åçµæ£æµæè½¦è½®";
			stationinfoRepository.Update(Station, true);
			client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//æ¥è¦
			WriteDBLog.Error(number + "æ¥è¦", $"è´§ä½ç¼å·ï¼{Station.stationCode}ï¼éè¯¯ä¿¡æ¯ï¼{Station.remark}", "PCS");
			}
			}
			}
			@@ -227,7 +245,8 @@
			var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == stationCode).ToList();
			var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//è¯»åæçä¿¡å·:1:æ,2æ
			var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//è¯»åè´§ç©ä¿¡å·:1:æ,2æ
			var station = stationinfoRepository.Find(x => x.stationCode == stationCode).FirstOrDefault();
			var station = stationinfoRepository.Find(x => x.stationCode == stationCode && x.enable).FirstOrDefault();
			if (station == null) continue;
			if (PalletSignal == 1 && MaterialSignal == 2 && (station.stationCode.Contains("S0100100") ? station.tray_status == "EmptyTray" : true))
			{
			var area = station.tray_type == "SmallTray" ? "11" : "10";
			@@ -245,31 +264,34 @@
			continue;

			}
			var EmptyStation = GetStation.EmptyPalletStation(area);

			#region æ¥æ¾åºåºä¸ç©ºæçç©ºè´§ä½
			var EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") && x.location_state != LocationStateEnum.Busy.ToString() && x.enable)
			.OrderBy(x => x.column).ThenByDescending(x => x.line).FirstOrDefault();//æ¥æ¾æ²¡æä»»å¡çç©ºæçè´§ä½
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") && x.location_state != LocationStateEnum.Busy.ToString() && x.enable)
			//.OrderBy(x => x.column).ThenByDescending(x => x.line).FirstOrDefault();//æ¥æ¾æ²¡æä»»å¡çç©ºæçè´§ä½

			if (EmptyStation != null)
			{
			if (stationinfoRepository.Find(x => x.area == EmptyStation.area && x.stationCode.Contains("A") && x.column == EmptyStation.column && x.location_state.Contains("Busy")).Any())
			{
			EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") && x.column != EmptyStation.column && x.location_state != LocationStateEnum.Busy.ToString() && x.enable).OrderBy(x => x.column).ThenByDescending(x => x.line).FirstOrDefault();//æé¤å½ååå¨ä»»å¡çè´§ä½
			}
			if (EmptyStation != null && EmptyStation.line == 2)//å¦æä»»å¡åå¨ç¬¬äºè¡,ææ¥ç¬¬ä¸è¡æ¯å¦æè´§
			{
			if (stationinfoRepository.Find(x => x.area == EmptyStation.area && x.stationCode.Contains("A") && x.column == EmptyStation.column && x.line == 1 && x.location_state != LocationStateEnum.Empty.ToString()).Any()) EmptyStation = null;
			}
			}
			// if (EmptyStation != null)
			// {
			// if (stationinfoRepository.Find(x => x.area == EmptyStation.area && x.stationCode.Contains("A") && x.column == EmptyStation.column && x.location_state.Contains("Busy")).Any())
			// {
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains("A") && x.column != EmptyStation.column && x.location_state != LocationStateEnum.Busy.ToString() && x.enable).OrderBy(x => x.column).ThenByDescending(x => x.line).FirstOrDefault();//æé¤å½ååå¨ä»»å¡çè´§ä½
			// }
			// if (EmptyStation != null && EmptyStation.line == 2)//å¦æä»»å¡åå¨ç¬¬äºè¡,ææ¥ç¬¬ä¸è¡æ¯å¦æè´§
			// {
			// if (stationinfoRepository.Find(x => x.area == EmptyStation.area && x.stationCode.Contains("A") && x.column == EmptyStation.column && x.line == 1 && x.location_state != LocationStateEnum.Empty.ToString()).Any()) EmptyStation = null;
			// }
			// }

			// if (EmptyStation == null)
			// {
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Busy.ToString() && x.enable).OrderByDescending(x => x.column).FirstOrDefault();//æåä¸ä¸ªè´§ä½æä»»å¡åä¸è½çæå¥åºä»»å¡
			// if (EmptyStation != null) continue;
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Stroge.ToString() && x.enable).OrderByDescending(x => x.column).FirstOrDefault();//æ¾æå¤é¢æ²¡å æ»¡5ä¸ªçè´§ä½
			// if (EmptyStation == null)
			// EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.column).FirstOrDefault();
			// }

			#endregion

			if (EmptyStation == null)
			{
			EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Busy.ToString() && x.enable).OrderByDescending(x => x.column).FirstOrDefault();//æåä¸ä¸ªè´§ä½æä»»å¡åä¸è½çæå¥åºä»»å¡
			if (EmptyStation != null) continue;
			EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Stroge.ToString() && x.enable).OrderByDescending(x => x.column).FirstOrDefault();//æ¾æå¤é¢æ²¡å æ»¡5ä¸ªçè´§ä½
			if (EmptyStation == null)
			EmptyStation = stationinfoRepository.Find(x => x.area == area && x.quantity < 5 && x.stationCode.Contains(area == "10" ? "D" : "C") && x.location_state == LocationStateEnum.Empty.ToString() && x.enable).OrderBy(x => x.column).FirstOrDefault();
			}

			if (EmptyStation != null)
			{
			@@ -336,6 +358,7 @@
			Station.remark = "è½¦è½®æ°éå¤§äº0ï¼åçµæ£æµæ æçææ è½¦è½®";
			stationinfoRepository.Update(Station, true);
			client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//æ¥è¦
			WriteDBLog.Error(name + "æ¥è¦", $"è´§ä½ç¼å·ï¼{Station.stationCode}ï¼éè¯¯ä¿¡æ¯ï¼{Station.remark}", "PCS");
			continue;
			}
			if (Station.location_state == LocationStateEnum.Stroge.ToString() && PalletSignal != 1)
			@@ -344,6 +367,7 @@
			Station.remark = "è´§ä½æè´§ï¼åçµæ£æµæ æç";
			stationinfoRepository.Update(Station, true);
			client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//æ¥è¦
			WriteDBLog.Error(name + "æ¥è¦", $"è´§ä½ç¼å·ï¼{Station.stationCode}ï¼éè¯¯ä¿¡æ¯ï¼{Station.remark}", "PCS");
			continue;
			}
			if (Station.location_state == LocationStateEnum.Empty.ToString() && (PalletSignal == 1 \|\| MaterialSignal == 1))//ç³»ç»è´§ä½ä¸ºç©ºï¼åçµæ£æµææ
			@@ -352,6 +376,7 @@
			Station.remark = "è´§ä½æ è´§ï¼åçµæ£æµææ";
			stationinfoRepository.Update(Station, true);
			client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//æ¥è¦
			WriteDBLog.Error(name + "æ¥è¦", $"è´§ä½ç¼å·ï¼{Station.stationCode}ï¼éè¯¯ä¿¡æ¯ï¼{Station.remark}", "PCS");
			continue;
			}
			//if (Station.quantity < 1 && MaterialSignal == 1)//ç³»ç»è´§ä½æ è½¦è½®ï¼åçµæ£æµæè½¦è½®